From 36d8fa526f407bf365bd6e55e27cb53cdd74f599 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Tue, 14 Feb 2023 21:47:41 +0200 Subject: [PATCH 1/5] Add support for Python 3.11 --- .github/workflows/tests.yml | 5 +---- pyproject.toml | 2 +- setup.py | 1 + tox.ini | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ab8ef0b..7cddf25 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,11 +11,8 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', 'pypy-3.8'] + python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', 'pypy-3.8'] os: [ubuntu-latest, macos-latest, windows-latest] - exclude: - - os: windows-latest - python-version: '3.6' timeout-minutes: 20 steps: diff --git a/pyproject.toml b/pyproject.toml index ee31196..241a63a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ exclude = ''' )/ | docs/conf.py ''' -target-version = ['py36', 'py37', 'py38', 'py39', 'py310'] +target-version = ['py36', 'py37', 'py38', 'py39', 'py310', 'py311'] [tool.coverage.run] source = ['tabledata'] diff --git a/setup.py b/setup.py index 5e72987..42de768 100644 --- a/setup.py +++ b/setup.py @@ -75,6 +75,7 @@ def get_release_command_class() -> Dict[str, setuptools.Command]: "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", diff --git a/tox.ini b/tox.ini index b2362e7..aec4cdc 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{36,37,38,39,310} + py{36,37,38,39,310,311} build clean cov From 1ba66e95caa2d68662cf655c5ca23508ccdeae14 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Tue, 14 Feb 2023 21:48:11 +0200 Subject: [PATCH 2/5] Bump GitHub Actions --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7cddf25..ababf11 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,10 +16,10 @@ jobs: timeout-minutes: 20 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} @@ -31,7 +31,7 @@ jobs: run: echo "::set-output name=dir::$(pip cache dir)" - name: Cache pip - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ${{ steps.pip-cache.outputs.dir }} From d733a43deeaa47f92dc1f9ef3fc8f01b9527d9ea Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Tue, 14 Feb 2023 22:09:20 +0200 Subject: [PATCH 3/5] Use builtin caching from actions/setup-python --- .github/workflows/tests.yml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ababf11..2b11e96 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,23 +22,14 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} + cache: pip + cache-dependency-path: | + setup.py + **/requirements.txt - name: Install pip run: python -m pip install --upgrade --disable-pip-version-check 'pip>=21.1' - - name: Get pip cache dir - id: pip-cache - run: echo "::set-output name=dir::$(pip cache dir)" - - - name: Cache pip - uses: actions/cache@v3 - with: - path: | - ${{ steps.pip-cache.outputs.dir }} - ./.tox - key: ${{ matrix.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('setup.py', '**/requirements.txt') }} - restore-keys: ${{ matrix.os }}-${{ matrix.python-version }}-pip- - - name: Install dependencies run: python -m pip install --upgrade --disable-pip-version-check tox From 5c0543a6b4f28992fced9678c7f9a3f8a36d1d91 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Tue, 14 Feb 2023 22:11:06 +0200 Subject: [PATCH 4/5] Test Python 3.12-dev --- .github/workflows/tests.yml | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2b11e96..2faf735 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', 'pypy-3.8'] + python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12-dev', 'pypy-3.8'] os: [ubuntu-latest, macos-latest, windows-latest] timeout-minutes: 20 diff --git a/tox.ini b/tox.ini index aec4cdc..ee1d893 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{36,37,38,39,310,311} + py{36,37,38,39,310,311,312} build clean cov From 11d95499a11028b49beba6612c07588ea639c06a Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 17 Feb 2023 23:51:15 +0200 Subject: [PATCH 5/5] Need ubuntu-20.04 to test Python 3.6 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2faf735..b2c9359 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12-dev', 'pypy-3.8'] - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-20.04, macos-latest, windows-latest] timeout-minutes: 20 steps: