Merge commit 'bb495cf52225d429e7161a191c9b62288fd10635' into develop

Author: mwatts15

.github/workflows/python-package.yml

@@ -79,7 +79,9 @@ jobs:
   dev-deploy:
     name: Deploy Dev Package to PyPI
     needs: build
-    if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
+    if: github.event_name == 'push'
+      && (github.ref == 'refs/heads/develop'
+          || startsWith(github.ref, 'refs/heads/release/'))
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

deploy.sh

@@ -1,14 +1,9 @@
 #!/bin/bash -xe
 HEAD_REV=$(git rev-parse HEAD)
-ORIGIN_DEV_REV=$(git ls-remote origin refs/heads/develop | grep -E -o '^[^[:space:]]+')
-if [ "$HEAD_REV" != "$ORIGIN_DEV_REV" ] ; then
-    echo "Not deploying since we aren't on the 'develop' branch" >&2
-    exit 0
-fi
 
 git log --format=%s -n 1 "$HEAD_REV" | grep -q '^MINOR:' && exit 0
 
 date=$(date +"%Y%m%d%H%M%S")
-sed -i -r 's/^version = "([^"]+)\.dev0"$/version = "\1.dev'$date'"/' setup.py
+sed -i -r 's/^version = "([^"]+)(\.dev|a)0"$/version = "\1\2'$date'"/' setup.py
 python setup.py egg_info sdist bdist_wheel
 twine upload -c "Built by CI. Uploaded after $(date +"%Y-%m-%d %H:%M:%S")" dist/rdflib-sqlalchemy*tar.gz dist/rdflib_sqlalchemy*whl

setup.py

@@ -38,6 +38,7 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "License :: OSI Approved :: BSD License",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Operating System :: OS Independent",