Merge branch 'bump-python-39' into 'master'

Bump python 39

See merge request !323

bob/devtools/data/conda_build_config.yaml

@@ -139,8 +139,8 @@ channel_sources:
 ## the dependencies that we build against multiple versions
 python:
   # part of a zip_keys: python, python_impl, numpy
-  - 3.8.* *_cpython
   - 3.9.* *_cpython
+  - 3.10.* *_cpython
 python_impl:
   # part of a zip_keys: python, python_impl, numpy
   - cpython

bob/devtools/data/gitlab-ci/beat-docker-package.yaml

-build_linux_38:
+build_linux_39:
   tags:
     - bob
     - linux
     - docker-build
 
-build_linux_39:
+build_linux_310:
   tags:
     - bob
     - linux

bob/devtools/data/gitlab-ci/nightlies.yaml

@@ -49,41 +49,41 @@ stages:
     # The version of cuda at Idiap
     CONDA_OVERRIDE_CUDA: "11.6"
 
-build_linux_38:
+build_linux_39:
   extends: .build_linux_template
   variables:
-    PYTHON_VERSION: "3.8"
+    PYTHON_VERSION: "3.9"
   cache:
-    key: 'build-py38'
+    key: 'build-py39'
 
-build_linux_39:
+build_linux_310:
   extends: .build_linux_template
   variables:
-    PYTHON_VERSION: "3.9"
+    PYTHON_VERSION: "3.10"
   cache:
-    key: 'build-py39'
+    key: 'build-py310'
 
-build_macos_intel_38:
+build_macos_intel_39:
   extends: .build_template
   variables:
-    PYTHON_VERSION: "3.8"
+    PYTHON_VERSION: "3.9"
   tags:
     - bob
     - macos
     - intel
   cache:
-    key: 'build-py38'
+    key: 'build-py39'
 
-build_macos_intel_39:
+build_macos_intel_310:
   extends: .build_template
   variables:
-    PYTHON_VERSION: "3.9"
+    PYTHON_VERSION: "3.10"
   tags:
     - bob
     - macos
     - intel
   cache:
-    key: 'build-py39'
+    key: 'build-py310'
 
 build_macos_arm_39:
   extends: .build_template
@@ -96,6 +96,17 @@ build_macos_arm_39:
   cache:
     key: 'build-py39'
 
+build_macos_arm_310:
+  extends: .build_template
+  variables:
+    PYTHON_VERSION: "3.10"
+  tags:
+    - bob
+    - macos
+    - arm
+  cache:
+    key: 'build-py310'
+
 
 # Periodic cleanup of beta packages
 .cleanup_template:

bob/devtools/data/gitlab-ci/noarch.yaml

@@ -57,7 +57,7 @@ build_linux:
     - docker
   image: quay.io/condaforge/linux-anvil-cos7-x86_64
   variables:
-    PYTHON_VERSION: "3.9"
+    PYTHON_VERSION: "3.10"
     BUILD_EGG: "true"
   script:
     - bdt ci build -vv
@@ -75,7 +75,7 @@ build_linux:
 
 build_macos_intel:
   variables:
-    PYTHON_VERSION: "3.9"
+    PYTHON_VERSION: "3.10"
   cache:
     key: "build"
   extends: .build_template
@@ -87,7 +87,7 @@ build_macos_intel:
 
 build_macos_arm:
   variables:
-    PYTHON_VERSION: "3.9"
+    PYTHON_VERSION: "3.10"
   cache:
     key: "build"
   extends: .build_template

bob/devtools/data/gitlab-ci/python-package.yaml

@@ -63,12 +63,6 @@ build:
       - ${PIP_CACHE_DIR}
 
 
-test_py38:
-  extends: .test_template
-  image: python:3.8
-  script:
-    - tox -e py38
-
 test_py39:
   extends: .test_template
   image: python:3.9
@@ -89,7 +83,6 @@ test_py310:
     - docker
   stage: deploy
   dependencies:
-    - test_py38
     - test_py39
     - test_py310
     - build
@@ -130,7 +123,6 @@ pypi:
   except:
     - branches
   dependencies:
-    - test_py38
     - test_py39
     - test_py310
     - build

bob/devtools/data/gitlab-ci/single-package.yaml

@@ -94,19 +94,19 @@ stages:
       - ${CONDA_ROOT}/conda-bld/osx-arm64/*.tar.bz2
 
 
-build_macos_intel_38:
+build_macos_intel_39:
   extends: .build_macos_intel_template
   variables:
-    PYTHON_VERSION: "3.8"
+    PYTHON_VERSION: "3.9"
   cache:
-    key: "build-py38"
+    key: "build-py39"
 
-build_macos_intel_39:
+build_macos_intel_310:
   extends: .build_macos_intel_template
   variables:
-    PYTHON_VERSION: "3.9"
+    PYTHON_VERSION: "3.10"
   cache:
-    key: "build-py39"
+    key: "build-py310"
 
 build_macos_arm_39:
   extends: .build_macos_arm_template
@@ -115,17 +115,24 @@ build_macos_arm_39:
   cache:
     key: "build-py39"
 
-build_linux_38:
-  extends: .build_linux_template
+build_macos_arm_310:
+  extends: .build_macos_arm_template
   variables:
-    PYTHON_VERSION: "3.8"
+    PYTHON_VERSION: "3.10"
   cache:
-    key: "build-py38"
+    key: "build-py310"
 
 build_linux_39:
   extends: .build_linux_template
   variables:
     PYTHON_VERSION: "3.9"
+  cache:
+    key: "build-py39"
+
+build_linux_310:
+  extends: .build_linux_template
+  variables:
+    PYTHON_VERSION: "3.10"
     BUILD_EGG: "true"
   script:
     - bdt ci build -vv
@@ -138,7 +145,7 @@ build_linux_39:
       - ${CONDA_ROOT}/conda-bld/linux-64/*.conda
       - ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2
   cache:
-    key: "build-py39"
+    key: "build-py310"
 
 
 # Deploy targets
@@ -149,11 +156,12 @@ build_linux_39:
     - bdt ci deploy -vv
     - bdt ci clean -vv
   dependencies:
-    - build_linux_38
     - build_linux_39
-    - build_macos_intel_38
+    - build_linux_310
     - build_macos_intel_39
+    - build_macos_intel_310
     - build_macos_arm_39
+    - build_macos_arm_310
   tags:
     - bob
     - docker
@@ -193,11 +201,12 @@ pypi:
     - bdt ci pypi -vv dist/*.zip
     - bdt ci clean -vv
   dependencies:
-    - build_linux_38
     - build_linux_39
-    - build_macos_intel_38
+    - build_linux_310
     - build_macos_intel_39
+    - build_macos_intel_310
     - build_macos_arm_39
+    - build_macos_arm_310
   tags:
     - bob
     - docker

bob/devtools/scripts/dependencies.py

@@ -5,14 +5,16 @@ import click
 @click.command(
     epilog="""Example:
 
-    Creates an environment called `myenv' based on Python 3.8 and containing all external bob dependencies:
+    Creates an environment called `myenv' based on Python 3.10 and containing all external bob dependencies:
 
 
-    bdt dev dependencies --python 3.8 myenv
+    bdt dev dependencies --python 3.10 myenv
 """
 )
 @click.argument("env_name", nargs=1)
-@click.option("--python", required=True, help="Python version to pin, e.g. 3.8")
+@click.option(
+    "--python", required=True, help="Python version to pin, e.g. 3.10"
+)
 def dependencies(env_name, python):
     """Creates an environment with all external bob dependencies."""
     import subprocess

bob/devtools/scripts/update_pins.py

@@ -6,15 +6,17 @@ import click
 @click.command(
     epilog="""Example:
 
-python bob/devtools/scripts/update_pins.py --python 3.8
+python bob/devtools/scripts/update_pins.py --python 3.10
 
 Force specific version of packages:
 
-python bob/devtools/scripts/update_pins.py --python 3.8 opencv=4.5.1 pytorch=1.9
+python bob/devtools/scripts/update_pins.py --python 3.10 opencv=4.5.1 pytorch=1.9
 """
 )
 @click.argument("manual_pins", nargs=-1)
-@click.option("--python", required=True, help="Python version to pin, e.g. 3.8")
+@click.option(
+    "--python", required=True, help="Python version to pin, e.g. 3.10"
+)
 def update_pins(manual_pins, python):
     import subprocess
 

conda/conda_build_config.yaml

 ## the dependencies that we build against multiple versions
 python:
-  - 3.8
   - 3.9
+  - 3.10

conda/meta.yaml

@@ -47,7 +47,7 @@ requirements:
     - requests
     - sphinx >=4.0.2
     - pyyaml >=5.1
-    - twine <3
+    - twine
     - lxml
     - jinja2
     - termcolor

doc/install.rst

@@ -8,7 +8,7 @@
 ==============
 
 You can install this package via conda_ or mamba_, simply pointing to our beta channel.
-We provide packages for both 64-bit Linux and MacOS, for Python 3.8+.
+We provide packages for both 64-bit Linux and MacOS, for Python 3.9+.
 
 .. code-block:: sh
 

setup.py

@@ -22,7 +22,7 @@ requires = [
     "sphinx",
     "pyyaml>=5.1",
     "python-dateutil",
-    "twine<3",
+    "twine",
     "lxml",
     "jinja2",
     "tabulate",