From 03db4b9c6213e8883c63afa6bfb8c8ddf74db542 Mon Sep 17 00:00:00 2001 From: Ben Jeffery Date: Wed, 14 Oct 2020 10:27:02 +0100 Subject: [PATCH] Test and build wheels on python3.9 --- .github/workflows/docker/shared.env | 1 + .github/workflows/tests.yml | 2 +- .github/workflows/wheels.yml | 10 +++++----- .mergify.yml | 9 +++------ python/CHANGELOG.rst | 3 +++ python/setup.py | 1 + 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docker/shared.env b/.github/workflows/docker/shared.env index 4f64294499..68d954862c 100644 --- a/.github/workflows/docker/shared.env +++ b/.github/workflows/docker/shared.env @@ -1,4 +1,5 @@ PYTHON_VERSIONS=( + cp39-cp39 cp38-cp38 cp37-cp37m cp36-cp36m diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 23fb3a5d6f..252460d154 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -31,7 +31,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [ 3.6, 3.7, 3.8 ] + python: [ 3.6, 3.9 ] os: [ macos-latest, ubuntu-latest, windows-latest ] defaults: run: diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index b40b09e57b..5621b64798 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -15,7 +15,7 @@ jobs: runs-on: macos-latest strategy: matrix: - python: [3.6, 3.7, 3.8] + python: [3.6, 3.7, 3.8, 3.9] steps: - name: Checkout uses: actions/checkout@v2 @@ -57,7 +57,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python: [3.6, 3.7, 3.8] + python: [3.6, 3.7, 3.8, 3.9] wordsize: [64] steps: - name: Checkout @@ -146,7 +146,7 @@ jobs: runs-on: macos-latest strategy: matrix: - python: [3.6, 3.7, 3.8] + python: [3.6, 3.7, 3.8, 3.9] steps: - name: Download wheels uses: actions/download-artifact@v2 @@ -168,7 +168,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python: [3.6, 3.7, 3.8] + python: [3.6, 3.7, 3.8, 3.9] wordsize: [64] steps: - name: Download wheels @@ -191,7 +191,7 @@ jobs: needs: ['manylinux'] strategy: matrix: - python: [3.6, 3.7, 3.8] + python: [3.6, 3.7, 3.8, 3.9] steps: - name: Download wheels uses: actions/download-artifact@v2 diff --git a/.mergify.yml b/.mergify.yml index 2353d45396..1936d140ca 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -8,14 +8,11 @@ pull_request_rules: - status-success=Build - status-success=Lint - status-success=Python (3.6, macos-latest) - - status-success=Python (3.7, macos-latest) - - status-success=Python (3.8, macos-latest) + - status-success=Python (3.9, macos-latest) - status-success=Python (3.6, ubuntu-latest) - - status-success=Python (3.7, ubuntu-latest) - - status-success=Python (3.8, ubuntu-latest) + - status-success=Python (3.9, ubuntu-latest) - status-success=Python (3.6, windows-latest) - - status-success=Python (3.7, windows-latest) - - status-success=Python (3.8, windows-latest) + - status-success=Python (3.9, windows-latest) - "status-success=ci/circleci: build" #- status-success=codecov/patch #- status-success=codecov/project/c-tests diff --git a/python/CHANGELOG.rst b/python/CHANGELOG.rst index 224bbd46ac..8d01059ce2 100644 --- a/python/CHANGELOG.rst +++ b/python/CHANGELOG.rst @@ -4,6 +4,9 @@ **Features** +- tskit is now supported on, and has wheels for, python3.9. + (:user:`benjeffery`, :issue:`982`, :pr:`907`) + - ``Tree.newick()`` now has extra option ``include_branch_lengths`` to allow branch lengths to be omitted (:user:`hyanwong`, :pr:`931`). diff --git a/python/setup.py b/python/setup.py index 9d75381ab0..32fc139153 100644 --- a/python/setup.py +++ b/python/setup.py @@ -87,6 +87,7 @@ def finalize_options(self): "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3 :: Only", ], keywords="tree sequence",