Merge pull request #177 from ska-sa/minor-version-bumps

Update versions of various things

.ci/py-requirements.sh

@@ -2,9 +2,4 @@
 set -e -u
 
 pip install -U pip setuptools wheel
-python_version="$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')"
-if [ "$python_version" == "3.6" ]; then
-    pip install -r requirements-3.6.txt
-else
-    pip install -r requirements.txt
-fi
+pip install -r requirements.txt

.github/workflows/test.yml

@@ -55,7 +55,7 @@ jobs:
           - os: ubuntu-20.04
             cc: gcc
             cxx: g++
-            python-version: 3.6
+            python-version: 3.7
           # Disabled for now because numba/llvmlite (needed for tests)
           # doesn't have a pypy wheel, and it's not worth the effect to
           # install all the dependencies needed to make that work.
@@ -66,15 +66,15 @@ jobs:
           - os: ubuntu-20.04
             cc: gcc
             cxx: g++
-            python-version: 3.9
+            python-version: '3.10'
           - os: ubuntu-20.04
             cc: clang
             cxx: clang++
-            python-version: 3.9
+            python-version: '3.10'
           - os: macos-10.15
             cc: clang
             cxx: clang++
-            python-version: 3.9
+            python-version: '3.10'
     runs-on: ${{ matrix.os }}
     env:
       CC: ${{ matrix.cc }} -Werror
@@ -135,7 +135,7 @@ jobs:
         run: ./.ci/ccache-path.sh
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install Python dependencies
         run: ./.ci/py-requirements.sh
       - run: ./bootstrap.sh
@@ -171,17 +171,17 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-3.9-${{ hashFiles('requirements*.txt') }}
+          key: ${{ runner.os }}-pip-3.10-${{ hashFiles('requirements*.txt') }}
           restore-keys: |
-            ${{ runner.os }}-pip-3.9-
+            ${{ runner.os }}-pip-3.10-
             ${{ runner.os }}-pip-
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install Python dependencies
         run: ./.ci/py-requirements.sh
       - run: ./bootstrap.sh
-      - run: pip install build==0.6.0.post1
+      - run: pip install build==0.7.0
       - run: python -m build --sdist .
       - uses: actions/upload-artifact@v2
         with:
@@ -193,7 +193,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - uses: pypa/cibuildwheel@v2.1.3
+      - uses: pypa/cibuildwheel@v2.3.1
       - uses: actions/upload-artifact@v2
         with:
           name: wheels

doc/changelog.rst

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+.. rubric:: Development version
+
+- Drop support for Python 3.6, which has reached end-of-life.
+
 .. rubric:: 3.7.0
 
 - Add :py:const:`spead2.send.GroupMode.SERIAL`.

doc/migrate-3.rst

@@ -114,9 +114,8 @@ details.
 Loop argument to asyncio functions
 ----------------------------------
 The Python asyncio-based classes and functions no longer take a `loop`
-argument. As of Python 3.6 (which is now the minimum supported version),
-:py:func:`asyncio.get_event_loop` returns the executing event loop, so there
-is no need to pass the loop explicitly.
+argument. As of Python 3.6, :py:func:`asyncio.get_event_loop` returns the
+executing event loop, so there is no need to pass the loop explicitly.
 
 Command-line arguments in tools
 -------------------------------

manylinux/before_build.sh

@@ -3,5 +3,5 @@
 
 set -e -u
 
-pip install jinja2==3.0.1 pycparser==2.20
+pip install -c requirements.txt jinja2 pycparser
 ./bootstrap.sh

mypy.ini

@@ -1,4 +1,4 @@
 [mypy]
 ignore_missing_imports = 1
 files = src/spead2, examples, tests
-python_version = 3.6
+python_version = 3.7

pyproject.toml

@@ -1,5 +1,7 @@
 [build-system]
-requires = ["setuptools", "wheel", "pybind11==2.8.1", "setuptools_scm==6.0.1"]
+# Setuptools is pinned to an older version due to
+# https://github.com/pypa/setuptools/issues/3130
+requires = ["setuptools==59.8.0", "wheel", "pybind11==2.9.1", "setuptools_scm==6.4.2"]
 
 [tool.cibuildwheel]
 build-frontend = "build"
@@ -8,7 +10,7 @@ before-build = "manylinux/before_build.sh"
 manylinux-x86_64-image="manylinux2014"
 manylinux-i686-image="manylinux2014"
 manylinux-aarch64-image="manylinux2014"
-build = ["cp36*", "cp37*", "cp38*", "cp39*", "cp310*"]
+build = ["cp37-manylinux*", "cp38-manylinux*", "cp39-manylinux*", "cp310-manylinux*"]
 
 [tool.cibuildwheel.linux]
 archs = ["x86_64"]

pytest.ini

@@ -1,2 +1,3 @@
 [pytest]
 testpaths = tests
+asyncio_mode = auto

requirements.txt

@@ -1,59 +1,70 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile with python 3.7
 # To update, run:
 #
 #    pip-compile requirements.in
 #
-attrs==20.3.0
+attrs==21.4.0
     # via pytest
-flake8==3.8.4
+flake8==4.0.1
     # via -r requirements.in
+importlib-metadata==4.2.0
+    # via
+    #   flake8
+    #   pluggy
+    #   pytest
 iniconfig==1.1.1
     # via pytest
-jinja2==2.11.3
+jinja2==3.0.3
     # via -r requirements.in
-llvmlite==0.36.0
+llvmlite==0.38.0
     # via numba
-markupsafe==1.1.1
+markupsafe==2.1.0
     # via jinja2
 mccabe==0.6.1
     # via flake8
-netifaces==0.10.9
+netifaces==0.11.0
     # via -r requirements.in
-numba==0.53.1
+numba==0.55.1
     # via -r requirements.in
-numpy==1.20.1
+numpy==1.21.5
     # via
     #   -r requirements.in
     #   numba
     #   scipy
-packaging==20.9
+packaging==21.3
     # via pytest
-pluggy==0.13.1
+pluggy==1.0.0
     # via pytest
-py==1.10.0
+py==1.11.0
     # via pytest
-pycodestyle==2.6.0
+pycodestyle==2.8.0
     # via flake8
-pycparser==2.20
+pycparser==2.21
     # via -r requirements.in
-pyflakes==2.2.0
+pyflakes==2.4.0
     # via flake8
-pyparsing==2.4.7
+pyparsing==3.0.7
     # via packaging
-pytest==6.2.2
+pytest==7.0.1
     # via
     #   -r requirements.in
     #   pytest-asyncio
     #   pytest-timeout
-pytest-asyncio==0.14.0
+pytest-asyncio==0.18.1
     # via -r requirements.in
-pytest-timeout==1.4.2
+pytest-timeout==2.1.0
     # via -r requirements.in
-scipy==1.7.1
+scipy==1.7.3
     # via -r requirements.in
-toml==0.10.2
+tomli==2.0.1
     # via pytest
+typing-extensions==4.1.1
+    # via
+    #   importlib-metadata
+    #   pytest-asyncio
+zipp==3.7.0
+    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

setup.py

@@ -171,7 +171,7 @@ def build_extension(self, ext):
         'pytest-timeout',
         'scipy'
     ],
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     packages=find_packages('src'),
     package_dir={'': 'src'},
     package_data={'': ['py.typed', '*.pyi']},