From 0cff65f9fc02c85806a1b349cdd8da9ddddcb1a3 Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Tue, 5 Sep 2023 15:47:06 +0200 Subject: [PATCH 01/21] Create ci.yml --- .github/workflows/ci.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..95e4b56 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,35 @@ +--- +name: CI + +on: + push: + branches: [main] + pull_request: + branches: [main] + workflow_dispatch: + +jobs: + tests: + name: tox on ${{ matrix.python-version }} + runs-on: ubuntu-latest + env: + USING_COVERAGE: '3.6,3.8' + + strategy: + matrix: + python-version: ["2.7, 3.6", "3.7", "3.8", "pypy3"] + + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -VV + python -m site + python -m pip install --upgrade pip setuptools wheel + python -m pip install --upgrade coverage[toml] tox tox-gh-actions + + - name: Run tox targets for ${{ matrix.python-version }} + run: python -m tox From 4e766133b5e3e45cf498f74450efa7f4ecb29ec1 Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Tue, 5 Sep 2023 15:50:01 +0200 Subject: [PATCH 02/21] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95e4b56..a487371 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: - python-version: ["2.7, 3.6", "3.7", "3.8", "pypy3"] + python-version: ["2.7", "3.6", "3.7", "3.8"] steps: - uses: actions/checkout@v3 From 75991d9e913c7442fe8d785ce618fe729552af8e Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Tue, 5 Sep 2023 15:51:49 +0200 Subject: [PATCH 03/21] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a487371..f0fea10 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: - python-version: ["2.7", "3.6", "3.7", "3.8"] + python-version: ["3.6", "3.7", "3.8"] steps: - uses: actions/checkout@v3 From 5872e2e313d3d6e53ff1f15386c74c1d6d948631 Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Tue, 5 Sep 2023 15:55:11 +0200 Subject: [PATCH 04/21] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0fea10..8e32d70 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: - python-version: ["3.6", "3.7", "3.8"] + python-version: ["3.6", "3.7", "3.8", "pypy3"] steps: - uses: actions/checkout@v3 From c0b8d3e5c023eaed4ba6f7701353dd56bbfc3d27 Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Tue, 5 Sep 2023 15:56:02 +0200 Subject: [PATCH 05/21] Update tox.ini --- tox.ini | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tox.ini b/tox.ini index 802f007..e72c3e3 100644 --- a/tox.ini +++ b/tox.ini @@ -49,3 +49,10 @@ commands = coverage combine coverage report + +[gh-actions] +python = + 3.6: py36 + 3.7: py37, docs + 3.8: py38, lint, manifest + pypy3: pypy3 From 36a7efbe8e81e3f4eba6b9fe5410bf868271caac Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Tue, 5 Sep 2023 16:04:34 +0200 Subject: [PATCH 06/21] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e32d70..c302816 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: - python-version: ["3.6", "3.7", "3.8", "pypy3"] + python-version: ['3.6', '3.8'] steps: - uses: actions/checkout@v3 From 7345d15f7fdc66cec4e1fcf64c124d884afefb19 Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Tue, 5 Sep 2023 16:13:55 +0200 Subject: [PATCH 07/21] Update ci.yml --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c302816..42ac623 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,8 +12,6 @@ jobs: tests: name: tox on ${{ matrix.python-version }} runs-on: ubuntu-latest - env: - USING_COVERAGE: '3.6,3.8' strategy: matrix: From 4949a09b1016bd46a9e67bf2bb941d375f2003c2 Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Tue, 5 Sep 2023 16:26:35 +0200 Subject: [PATCH 08/21] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42ac623..cd2201d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: - python-version: ['3.6', '3.8'] + python-version: ['3.10', '3.11'] steps: - uses: actions/checkout@v3 From e774c87b3a0755d00dac70df8999794b7ee943fd Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Tue, 5 Sep 2023 16:32:24 +0200 Subject: [PATCH 09/21] Update ci.yml --- .github/workflows/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd2201d..0d6aab5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,8 +14,14 @@ jobs: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: - python-version: ['3.10', '3.11'] + python-version: + - '3.8' + - '3.9' + - '3.10' + - '3.11' + - '3.12' steps: - uses: actions/checkout@v3 From a776123519b848241f8f983017f875ea5380eef9 Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Tue, 5 Sep 2023 17:43:16 +0200 Subject: [PATCH 10/21] Update ci.yml --- .github/workflows/ci.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d6aab5..29033b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,6 +9,15 @@ on: workflow_dispatch: jobs: + build-package: + name: Build & verify package + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - uses: hynek/build-and-inspect-python-package@v1 + tests: name: tox on ${{ matrix.python-version }} runs-on: ubuntu-latest @@ -17,11 +26,11 @@ jobs: fail-fast: false matrix: python-version: - - '3.8' + #- '3.8' - '3.9' - '3.10' - '3.11' - - '3.12' + #- '3.12' steps: - uses: actions/checkout@v3 From 8d98afc5ca0076842ae95988a9b3bfa81b5fcf55 Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Tue, 5 Sep 2023 17:53:15 +0200 Subject: [PATCH 11/21] Update setup.py --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index a07d753..bd53ecb 100644 --- a/setup.py +++ b/setup.py @@ -74,6 +74,7 @@ def find_meta(meta): maintainer_email=find_meta("email"), keywords=KEYWORDS, long_description=read("README.rst"), + long_description_content_type="text/x-rst", packages=PACKAGES, package_dir={"": "src"}, zip_safe=False, From 3c78125414951624a123308be52bf5b00d5b6563 Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Tue, 5 Sep 2023 21:16:36 +0200 Subject: [PATCH 12/21] Update ci.yml --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29033b8..f14e507 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,6 +8,10 @@ on: branches: [main] workflow_dispatch: +env: + FORCE_COLOR: "1" + PIP_DISABLE_PIP_VERSION_CHECK: "1" + jobs: build-package: name: Build & verify package From ece721e6eea053facbe8887bb039cf74f0cf7147 Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Wed, 6 Sep 2023 16:45:40 +0200 Subject: [PATCH 13/21] Update ci.yml --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f14e507..2bf1bb0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,7 @@ jobs: tests: name: tox on ${{ matrix.python-version }} + needs: build-package runs-on: ubuntu-latest strategy: From bf38c9a7a7bd1d7fe3bc6fc653080f94f98e31a9 Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Wed, 6 Sep 2023 16:53:24 +0200 Subject: [PATCH 14/21] Update tox.ini --- tox.ini | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tox.ini b/tox.ini index e72c3e3..dbd3a6d 100644 --- a/tox.ini +++ b/tox.ini @@ -24,12 +24,6 @@ commands = python -m doctest README.rst -[testenv:manifest] -deps = check-manifest -skip_install = true -commands = check-manifest - - [testenv:readme] deps = readme_renderer skip_install = true From 85ee996178afde3c8ae67322ce1909db91933de8 Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Wed, 6 Sep 2023 16:53:38 +0200 Subject: [PATCH 15/21] Delete MANIFEST.in --- MANIFEST.in | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index ab5ea7d..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1,9 +0,0 @@ -include *.txt *.rst *.ini LICENSE .coveragerc docs/Makefile -recursive-include src *.py -recursive-include tests *.py -recursive-include docs *.ico -recursive-include docs *.png -recursive-include docs *.py -recursive-include docs *.rst -recursive-include docs *.txt -prune docs/_build From 8623293650d03067d1c5ea3d69a13cb29fb0dbec Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Wed, 6 Sep 2023 17:00:44 +0200 Subject: [PATCH 16/21] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2bf1bb0..3c00a81 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: fail-fast: false matrix: python-version: - #- '3.8' + - '3.8' - '3.9' - '3.10' - '3.11' From f4213829578947624030e1df574b336379ab4171 Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Wed, 6 Sep 2023 17:04:03 +0200 Subject: [PATCH 17/21] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c00a81..7750fd2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: - '3.9' - '3.10' - '3.11' - #- '3.12' + - '3.12' steps: - uses: actions/checkout@v3 From 935dd9ae7d2d0d3de9333cec839a73dcbafc78d5 Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Wed, 6 Sep 2023 18:04:20 +0200 Subject: [PATCH 18/21] Update ci.yml --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7750fd2..f5342ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,6 @@ jobs: - '3.9' - '3.10' - '3.11' - - '3.12' steps: - uses: actions/checkout@v3 From 15cd729998bf7c9e978d55f5bbe1d1e7631dbca1 Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Wed, 6 Sep 2023 20:32:37 +0200 Subject: [PATCH 19/21] Update ci.yml --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5342ef..0039bda 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,12 +35,14 @@ jobs: - '3.9' - '3.10' - '3.11' + - '3.12' steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} + allopw-prereleases: true - name: Install dependencies run: | python -VV From 41c8574178e2d7b4c0d434ac069db0592b01388b Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Wed, 6 Sep 2023 20:38:55 +0200 Subject: [PATCH 20/21] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0039bda..dbbbfa0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - allopw-prereleases: true + allow-prereleases: true - name: Install dependencies run: | python -VV From 4f192db6d74eb1a63935a847f3de33c1081978ba Mon Sep 17 00:00:00 2001 From: Stephen Tiedemann Date: Thu, 7 Sep 2023 11:35:53 +0200 Subject: [PATCH 21/21] Update ci.yml --- .github/workflows/ci.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbbbfa0..a526696 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,8 +9,9 @@ on: workflow_dispatch: env: - FORCE_COLOR: "1" + FORCE_COLOR: "1" # Make tools pretty. PIP_DISABLE_PIP_VERSION_CHECK: "1" + PIP_NO_PYTHON_VERSION_WARNING: "1" jobs: build-package: @@ -26,7 +27,6 @@ jobs: name: tox on ${{ matrix.python-version }} needs: build-package runs-on: ubuntu-latest - strategy: fail-fast: false matrix: @@ -38,11 +38,20 @@ jobs: - '3.12' steps: + - name: Download pre-built packages + uses: actions/download-artifact@v3 + with: + name: Packages + path: dist + - run: tar xf dist/*.tar.gz --strip-components=1 # needed for config files + - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} allow-prereleases: true + cache: pip + - name: Install dependencies run: | python -VV