Merge pull request #28 from niaid/simpleitk_22

Add support for SimpleITK 2.2

.github/workflows/main.yml

@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.8
+    - name: Set up Python 3.9
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.9
     - name: Install tools
       run: |
         python -m pip install --upgrade pip
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ['3.7', '3.8', '3.9', '3.10']
 
     steps:
     - uses: actions/checkout@v2
@@ -91,19 +91,17 @@ jobs:
     - name: Git LFS Pull
       run: |
         git lfs pull
-    - name: Set up Python 3.8
+    - name: Set up Python 3.9
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.9
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install -r requirements-dev.txt -r docs/requirements.txt twine
-        # install so that setuptools_scm generate version for package
-        pip install -e .
+        python -m pip install build twine
     - name: Build package
       run: |
-        python setup.py sdist bdist_wheel
+        python -m build --wheel
         python -m twine check dist/*
         ls -la dist
     - name: Upload package
@@ -114,7 +112,9 @@ jobs:
         path: dist
     - name: Build Sphinx Documentation
       run: |
-        make -C docs html
+        python -m pip install dist/rap_sitkcore*.whl -r docs/requirements.txt
+        cd docs
+        make html
     - name: Upload documentation
       if: github.event_name == 'push'
       uses: actions/upload-artifact@v1
@@ -139,10 +139,10 @@ jobs:
     needs: package_docs
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Python 3.8
+      - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

requirements.txt

@@ -1,4 +1,4 @@
-SimpleITK >=2.1.0, <2.2
+SimpleITK >=2.1.0, <2.3
 
 numpy
 pydicom