Merge branch 'master' into develop

.github/workflows/build-test-base.yml

@@ -19,7 +19,7 @@ jobs:
           ref: ${{ github.ref_name }}
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
@@ -36,8 +36,9 @@ jobs:
           coverage xml
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           files: coverage.xml
           fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true

.github/workflows/tests_develop.yml

@@ -8,3 +8,4 @@ on:
 jobs:
   test:
     uses: whitews/flowutils/.github/workflows/build-test-base.yml@develop
+    secrets: inherit

.github/workflows/tests_master.yml

@@ -8,3 +8,4 @@ on:
 jobs:
   test:
     uses: whitews/flowutils/.github/workflows/build-test-base.yml@master
+    secrets: inherit

.github/workflows/wheels.yml

@@ -17,7 +17,7 @@ jobs:
           ref: 'master'
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.11
 
@@ -32,9 +32,9 @@ jobs:
         run: python -m cibuildwheel --output-dir wheelhouse
 
       - name: Store artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: python-package-distributions
+          name: python-package-distributions-${{ matrix.os }}
           path: wheelhouse/*.whl
 
   package_source:
@@ -48,7 +48,7 @@ jobs:
           ref: 'master'
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.11
 
@@ -59,26 +59,22 @@ jobs:
         run: python -m build --sdist
 
       - name: Store artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: python-package-distributions
+          name: python-package-distributions-src
           path: ./dist/*.tar.gz
 
-  retrieve_build_files:
-    name: Retrieve build files
+  merge_build_files:
+    name: Merge build files
     needs:
       - build_wheels
       - package_source
     runs-on: ubuntu-22.04
 
     steps:
-      - name: Download build files
-        uses: actions/download-artifact@v3
+      - name: Merge build files
+        uses: actions/upload-artifact/merge@v4
         with:
-          name: python-package-distributions
-          path: dist/
-
-      - name: List files
-        run: |
-          pwd
-          ls -hog dist
+          name: python-package-distributions-all
+          pattern: python-package-distributions-*
+          delete-merged: true

examples/logicle_example.py

@@ -8,5 +8,3 @@
 fluoro_indices = [0, 1]
 
 xform_events = flowutils.transforms.logicle(events, fluoro_indices)
-
-print('asdf')

setup.py

@@ -49,7 +49,7 @@
     license='BSD',
     url="https://github.com/whitews/flowutils",
     ext_modules=[logicle_extension, gating_extension],
-    install_requires=['numpy>=1.20'],
+    install_requires=['numpy>=1.20,<2'],
     classifiers=[
         'Programming Language :: Python :: 3.12',
         'Programming Language :: Python :: 3.11',

src/flowutils/_version.py

@@ -1,4 +1,4 @@
 """
 FlowUtils version
 """
-__version__ = "1.1.0b0"
+__version__ = "1.1.0"