Merge branch 'wheelbuilding' into develop

Author: rhpvorderman

.github/workflows/ci.yml

@@ -226,13 +226,13 @@ jobs:
         # pypa/gh-action-pypi-publish@master does not work on OSX
         # Alpha, Beta and dev releases contain a - in the tag.
         if: contains(github.ref, '-') && startsWith(github.ref, 'refs/tags')
-        run: twine upload --repository-url https://test.pypi.org/legacy/ dist/*
+        run: twine upload --skip-existing --repository-url https://test.pypi.org/legacy/ dist/*
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.TEST_PYPI_API_TOKEN }}
       - name: Publish package to PyPI
         if: "!contains(github.ref, '-') && startsWith(github.ref, 'refs/tags')"
-        run: twine upload dist/*
+        run: twine upload --skip-existing dist/*
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}