Merge pull request #115 from samuelstjean/actions

split release action

Author: samuelstjean

.github/workflows/cibuildwheel.yml

@@ -62,26 +62,6 @@ jobs:
         with:
           path: dist/*.tar.gz
 
-  upload_pypi:
-    needs: [build_wheels, build_sdist]
-    runs-on: ubuntu-latest
-    # upload to PyPI on every tag starting with 'v'
-    # if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
-    # alternatively, to publish when a GitHub Release is created, use the following rule:
-    if: github.event_name == 'release' && github.event.action == 'published'
-    steps:
-      - uses: actions/download-artifact@v3
-        with:
-          name: artifact
-          path: dist
-
-      - uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: ${{ secrets.PYPI_USERNAME }}
-          password: ${{ secrets.PYPI_PASSWORD }}
-          # password: ${{ secrets.testpypi_password }}
-          # repository_url: https://test.pypi.org/legacy/
-
   build_pyinstaller:
     name: Build pyinstaller on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -109,11 +89,6 @@ jobs:
             pyinstaller ./scripts/nlsam_denoising -F --clean --add-data ${path}:./distributed/ --noupx
           fi
 
-      - uses: actions/upload-artifact@v3
-        with:
-          name: nlsam_${{ env.version }}_${{ runner.os }}
-          path: ./dist/nlsam_denoising*
-
       - uses: actions/upload-artifact@v3
         with:
           name: nlsam_${{ env.version }}_${{ runner.os }}
@@ -122,3 +97,4 @@ jobs:
                 README.md
                 LICENSE
                 example/*
+                ./dist/nlsam_denoising*

.github/workflows/release.yml

@@ -0,0 +1,28 @@
+name: Upload Python Package
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  upload_pypi:
+    needs: [build_wheels, build_sdist]
+    runs-on: ubuntu-latest
+    # upload to PyPI on every tag starting with 'v'
+    # if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
+    # alternatively, to publish when a GitHub Release is created, use the following rule:
+    if: github.event_name == 'release' && github.event.action == 'published'
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: artifact
+          path: dist
+
+      - uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          verbose: true
+          print-hash: true
+          user: ${{ secrets.PYPI_USERNAME }}
+          password: ${{ secrets.PYPI_PASSWORD }}
+          # password: ${{ secrets.testpypi_password }}
+          # repository_url: https://test.pypi.org/legacy/

nlsam/tests/test_angular_tools.py

@@ -1,7 +1,5 @@
-#! /usr/bin/env python
-
 import numpy as np
-from numpy.testing import assert_almost_equal, assert_equal, run_module_suite
+from numpy.testing import assert_almost_equal, assert_equal
 
 from nlsam.angular_tools import angular_neighbors, _angle, greedy_set_finder, split_per_shell
 
@@ -89,6 +87,3 @@ def test_split_per_shell():
 
     for n, ii in enumerate(idx):
         assert_equal(np.unique(greedy_set_finder(ii)), true_idx[n])
-
-if __name__ == "__main__":
-    run_module_suite()

nlsam/tests/test_bias_correction.py

@@ -1,7 +1,5 @@
-#! /usr/bin/env python
-
 import numpy as np
-from numpy.testing import assert_allclose, assert_array_less, run_module_suite
+from numpy.testing import assert_allclose, assert_array_less
 
 from nlsam.bias_correction import root_finder_sigma, multiprocess_stabilization
 
@@ -138,7 +136,3 @@ def test_stabilization():
     # The answer is a bit off for the last values of the final output, might be due to different numerical schemes
     assert_allclose(output[:80], answer[:80], atol=1e-2, rtol=1e-5)
     assert_allclose(eta, eta_koay, atol=1e-2, rtol=1e-6)
-
-
-if __name__ == "__main__":
-    run_module_suite()

nlsam/tests/test_reshaping.py

@@ -1,7 +1,5 @@
-#! /usr/bin/env python
-
 import numpy as np
-from numpy.testing import assert_allclose, run_module_suite
+from numpy.testing import assert_allclose
 
 from nlsam.utils import col2im_nd, im2col_nd
 from autodmri.blocks import extract_patches
@@ -52,7 +50,3 @@ def test_reshaping():
     out = extract_patches(a, (2, 2, 2, 10), (1, 1, 1, 10)).reshape(-1, 2**3 * 10).T
     redo = col2im_nd(out, (2, 2, 2, 10), (10, 10, 10, 10), (0, 0, 0, 0))
     assert_allclose(a, redo)
-
-
-if __name__ == "__main__":
-    run_module_suite()

nlsam/tests/test_smoothing.py

@@ -1,7 +1,5 @@
-#! /usr/bin/env python
-
 import numpy as np
-from numpy.testing import assert_array_less, run_module_suite
+from numpy.testing import assert_array_less
 
 from nlsam.bias_correction import xi
 from nlsam.smoothing import local_standard_deviation
@@ -42,7 +40,3 @@ def test_local_standard_deviation():
 
         # everything less than 10% error of real value?
         assert_array_less(np.abs(std - corrected_std.mean()) / std, 0.1)
-
-
-if __name__ == "__main__":
-    run_module_suite()

nlsam/tests/test_stabilizer.py

@@ -1,7 +1,5 @@
-#! /usr/bin/env python
-
 import numpy as np
-from numpy.testing import assert_allclose, assert_equal, run_module_suite
+from numpy.testing import assert_allclose, assert_equal
 from itertools import product
 
 from nlsam.stabilizer import (_test_marcumq_cython,
@@ -322,7 +320,3 @@ def test_marcumq_octave():
 
     for (a, b), q in zip(product(A, B), Q):
         assert_allclose(_test_marcumq_cython(a, b, M), q, atol=1e-4, rtol=1e-6)
-
-
-if __name__ == "__main__":
-    run_module_suite()

scripts/nlsam_denoising

@@ -542,6 +542,7 @@ if __name__ == "__main__":
             n_cores = args.cores
 
         client = Client(threads_per_worker=1, n_workers=n_cores)
-        parallel_backend("dask")
-
-    main()
+        with parallel_backend("dask"):
+            main()
+    else:
+        main()