Merge branch 'master' into feature/advertise-webcal-calendars

.github/workflows/pypi-publish.yml

@@ -11,10 +11,10 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: 3.x
-      - name: Install dependencies
-        run: python -m pip install wheel
+      - name: Install Build dependencies
+        run: pip install build
       - name: Build
-        run: python setup.py sdist bdist_wheel
+        run: python -m build --sdist --wheel
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@master
         with:

.github/workflows/test.yml

@@ -6,30 +6,33 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', pypy-3.7, pypy-3.8]
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', pypy-3.7, pypy-3.8, pypy-3.9]
         exclude:
           - os: windows-latest
             python-version: pypy-3.7
           - os: windows-latest
             python-version: pypy-3.8
+          - os: windows-latest
+            python-version: pypy-3.9
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install from source
-        run: python -m pip install --editable .[test,bcrypt]
-      - name: Run tests
-        run: python setup.py test
+      - name: Install Test dependencies
+        run: pip install tox
+      - name: Test
+        run: tox
+      - name: Install Coveralls
+        if: github.event_name == 'push'
+        run: pip install coveralls
       - name: Upload coverage to Coveralls
         if: github.event_name == 'push'
         env:
           COVERALLS_PARALLEL: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          python -m pip install coveralls
-          python -m coveralls --service=github
+        run: coveralls --service=github
 
   coveralls-finish:
     needs: test
@@ -39,9 +42,9 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: 3.x
+      - name: Install Coveralls
+        run: pip install coveralls
       - name: Finish Coveralls parallel builds
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          python -m pip install coveralls
-          python -m coveralls --service=github --finish
+        run: coveralls --service=github --finish

CHANGELOG.md

@@ -2,6 +2,24 @@
 
 ## master
 
+## 3.1.8
+
+* Fix setuptools requirement if installing wheel
+* Tests: Switch from `python setup.py test` to `tox`
+* Small changes to build system configuration and tests
+
+## 3.1.7
+
+* Fix random href fallback
+
+## 3.1.6
+
+* Ignore `Not a directory` error for optional config paths
+* Fix upload of whole address book/calendar with UIDs that collide on
+  case-insensitive filesystem
+* Remove runtime dependency on setuptools for Python>=3.9
+* Windows: Block ADS paths
+
 ## 3.1.5
 
 * Ignore configuration file if access is denied