Merge pull request #77 from benjeffery/3.11

Support 3.10, 3.11, remove 3.7

Author: benjeffery

.circleci/config.yml

@@ -1,8 +1,11 @@
-version: 2
+version: 2.1
+orbs:
+  codecov: codecov/[email protected]
+
 jobs:
   build:
     docker:
-      - image: circleci/python:3.7-buster
+      - image: cimg/python:3.10
     working_directory: /home/circleci/tszip
     steps:
       - checkout
@@ -12,7 +15,6 @@ jobs:
       - run:
           name: Install dependencies and set path
           command: |
-            sudo apt-get install libgsl-dev # Needed for msprime
             pip install --user -r requirements/development.txt
             pip install twine --user
             echo 'export PATH=/home/circleci/.local/bin:$PATH' >> $BASH_ENV
@@ -30,6 +32,10 @@ jobs:
             codecov
             rm .coverage
 
+      - codecov/upload:
+          flags: tszip
+          token: CODECOV_TOKEN
+
       - run:
           name: Build Python package
           command: |

.github/workflows/docker/shared.env

@@ -1,5 +1,6 @@
 PYTHON_VERSIONS=(
+    cp311-cp311
+    cp310-cp310
     cp39-cp39
     cp38-cp38
-    cp37-cp37m
 )

.github/workflows/wheels.yml

@@ -19,10 +19,10 @@ jobs:
         with:
             submodules: true
 
-      - name: Set up Python 3.8
+      - name: Set up Python 3.10
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.10
 
       - name: Build sdist
         shell: bash
@@ -51,7 +51,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        python: [3.7, 3.8, 3.9]
+        python: [3.8, 3.8, 3.9, "3.10", "3.11"]
     steps:
       - name: Download wheels
         uses: actions/download-artifact@v2
@@ -73,7 +73,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python: [3.7, 3.8, 3.9]
+        python: [3.8, 3.8, 3.9, "3.10", "3.11"]
         wordsize: [64]
     steps:
       - name: Download wheels
@@ -97,7 +97,7 @@ jobs:
     needs: ['manylinux']
     strategy:
       matrix:
-        python: [3.7, 3.8, 3.9]
+        python: [3.8, 3.8, 3.9, "3.10", "3.11"]
     steps:
       - name: Download wheels
         uses: actions/download-artifact@v2

.mergify.yml

@@ -4,12 +4,12 @@ queue_rules:
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
       - status-success=Lint
-      - status-success=Python (3.7, macos-latest)
-      - status-success=Python (3.9, macos-latest)
-      - status-success=Python (3.7, ubuntu-latest)
-      - status-success=Python (3.9, ubuntu-latest)
-      - status-success=Python (3.7, windows-latest)
-      - status-success=Python (3.9, windows-latest)
+      - status-success=Python (3.8, macos-latest)
+      - status-success=Python (3.11, macos-latest)
+      - status-success=Python (3.8, ubuntu-latest)
+      - status-success=Python (3.11, ubuntu-latest)
+      - status-success=Python (3.8, windows-latest)
+      - status-success=Python (3.11, windows-latest)
       - "status-success=ci/circleci: build"
 pull_request_rules:
   - name: Automatic rebase, CI and merge
@@ -20,12 +20,12 @@ pull_request_rules:
       - base=main
       - label=AUTOMERGE-REQUESTED
       - status-success=Lint
-      - status-success=Python (3.7, macos-latest)
-      - status-success=Python (3.9, macos-latest)
-      - status-success=Python (3.7, ubuntu-latest)
-      - status-success=Python (3.9, ubuntu-latest)
-      - status-success=Python (3.7, windows-latest)
-      - status-success=Python (3.9, windows-latest)
+      - status-success=Python (3.8, macos-latest)
+      - status-success=Python (3.11, macos-latest)
+      - status-success=Python (3.8, ubuntu-latest)
+      - status-success=Python (3.11, ubuntu-latest)
+      - status-success=Python (3.8, windows-latest)
+      - status-success=Python (3.11 windows-latest)
       - "status-success=ci/circleci: build"
     actions:
       queue:

.pre-commit-config.yaml

@@ -15,9 +15,9 @@ repos:
     rev: v3.15.0
     hooks:
       - id: pyupgrade
-        args: [--py3-plus, --py36-plus]
+        args: [--py3-plus, --py38-plus]
   - repo: https://github.com/psf/black
-    rev: 23.9.1
+    rev: 23.10.1
     hooks:
       - id: black
         language_version: python3

CHANGELOG.rst

@@ -1,10 +1,12 @@
 --------------------
-[0.2.3] - 2023-XX-XX
+[0.2.3] - 2023-10-30
 --------------------
 
 - Add `tszip.load` which loads both compressed and uncompressed trees sequences
   (benjeffery, #75)
 
+- tszip now supports Python 3.10 and 3.11, 3.7 support has been removed.
+  (benjeffery, #76)
 
 --------------------
 [0.2.2] - 2022-02-22

requirements/development.txt

@@ -6,7 +6,7 @@ pre-commit
 pytest
 pytest-cov
 pytest-xdist
-sphinx
+sphinx<=4.5.0
 sphinx-argparse
 sphinx_rtd_theme
 sphinx-issues

setup.cfg

@@ -15,9 +15,10 @@ project_urls =
 classifiers =
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.7
     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
     Development Status :: 5 - Production/Stable
     Environment :: Other Environment
@@ -38,7 +39,7 @@ platforms =
 
 [options]
 packages = tszip
-python_requires = >=3.7
+python_requires = >=3.8
 include_package_data = True
 install_requires =
      numpy