Merge branch 'DigitalSlideArchive:master' into update-NucleiFeatureEx…

…traction

.circleci/config.yml

@@ -324,7 +324,7 @@ jobs:
           command: ./build_wheels.sh
       - run:
           name: Release to PyPi
-          command: twine upload --verbose wheels/* dist/*
+          command: twine upload --verbose --skip-existing wheels/* dist/*
   docs-deploy:
     working_directory: ~/project
     docker:

.github/workflows/ci.yml

@@ -57,21 +57,18 @@ jobs:
           name: docs
           path: ./docs/_build
   build_wheels:
-    name: Build wheels on ${{ matrix.buildplat[0] }} / ${{ matrix.buildplat[1] }} for ${{ matrix.python }}
+    name: Wheels for ${{ matrix.python }} / ${{ matrix.buildplat[0] }} / ${{ matrix.buildplat[1] }}
     runs-on: ${{ matrix.buildplat[0] }}
     # Don't build external PRs.
     if: github.repository == 'DigitalSlideArchive/HistomicsTK'
     strategy:
       matrix:
+        # See matplotlib for some of the rationale of this
         buildplat:
-          - [ubuntu-latest, manylinux_x86_64]
-          - [ubuntu-latest, musllinux_x86_64]
-          - [macos-latest, macosx_*]
-          - [windows-latest, win_amd64]
+          - [ubuntu-latest, x86_64]
+          - [macos-latest, "x86_64 arm64"]
+          - [windows-latest, auto64]
         python: ["cp37", "cp38", "cp39", "cp310", "cp311"]
-        exclude:
-          - buildplat:
-            - [windows-latest, win32]
       fail-fast: false
 
     steps:
@@ -87,7 +84,10 @@ jobs:
       - name: Build wheels
         uses: pypa/[email protected]
         env:
-          CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
+          CIBW_BUILD: ${{ matrix.python }}-*
+          CIBW_TEST_SKIP: "*-macosx_arm64"
+          CIBW_ARCHS: ${{ matrix.buildplat[1] }}
+          MACOSX_DEPLOYMENT_TARGET: "10.12"
 
       - uses: actions/upload-artifact@v3
         with:
@@ -130,7 +130,8 @@ jobs:
         with:
           name: artifact
           path: dist
-          skip-existing: true
       - name: List dist directory
         run: ls dist
       - uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          skip-existing: true

.gitignore

@@ -152,6 +152,7 @@ cython_debug/
 .idea/
 
 .vscode
+*.sw[po]
 
 # temporary downloaded data when doing unit testing locally
 tests/externaldata/

setup.py

@@ -1,5 +1,4 @@
 import importlib
-import os
 import sys
 
 from setuptools import find_packages
@@ -19,26 +18,9 @@
     readme = readme_file.read()
 
 
-def prerelease_local_scheme(version):
-    """
-    Return local scheme version unless building on master in CircleCI.
-
-    This function returns the local scheme version number
-    (e.g. 0.0.0.dev<N>+g<HASH>) unless building on CircleCI for a
-    pre-release in which case it ignores the hash and produces a
-    PEP440 compliant pre-release version number (e.g. 0.0.0.dev<N>).
-    """
-    from setuptools_scm.version import get_local_node_and_date
-
-    if os.getenv('CIRCLE_BRANCH') in {'master'} or os.getenv('CI_BRANCH') in {'master'}:
-        return ''
-    else:
-        return get_local_node_and_date(version)
-
-
 setup(
     name='histomicstk',
-    use_scm_version={'local_scheme': prerelease_local_scheme,
+    use_scm_version={'local_scheme': 'no-local-version',
                      'fallback_version': '0.0.0'},
     description='A Python toolkit for Histopathology Image Analysis',
     long_description=readme,