Changeset a05e4b1 in trunk

Timestamp:

2023-01-09T22:04:25Z (3 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

56b93ae, 7c50605, c211731, da8cc19

Parents:

3c3697d (diff), 046d9cf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Itamar Turner-Trauring <itamar@…> (2023-01-09 22:04:25)

git-committer:

GitHub <noreply@…> (2023-01-09 22:04:25)

Message:

Merge pull request #1246 from tahoe-lafs/3964-remove-3.7

Remove support for Python 3.7, Ubuntu 18.04, Debian 10 (oldstable)

Fixes ticket:3964

Files:

• .circleci/config.yml (modified) (11 diffs)
• .github/workflows/ci.yml (modified) (3 diffs)
• README.rst (modified) (1 diff)
• default.nix (modified) (1 diff)
• newsfragments/3964.removed (added)
• setup.py (modified) (3 diffs)
• tests.nix (modified) (2 diffs)
• tox.ini (modified) (3 diffs)

.circleci/config.yml ¶

@@ -16 +16 @@
     jobs:
       # Start with jobs testing various platforms.
-      - "debian-10":
-          {}
       - "debian-11":
           {}
@@ -23 +21 @@
       - "ubuntu-20-04":
           {}
-      - "ubuntu-18-04":
-          requires:
-            - "ubuntu-20-04"
 
       # Equivalent to RHEL 8; CentOS 8 is dead.
@@ -86 +81 @@
       #
       #  https://app.circleci.com/settings/organization/github/tahoe-lafs/contexts
-      - "build-image-debian-10": &DOCKERHUB_CONTEXT
-          context: "dockerhub-auth"
-      - "build-image-debian-11":
-          <<: *DOCKERHUB_CONTEXT
-      - "build-image-ubuntu-18-04":
+      - "build-image-debian-11": &DOCKERHUB_CONTEXT
           <<: *DOCKERHUB_CONTEXT
       - "build-image-ubuntu-20-04":
@@ -168 +159 @@
             dist/Tahoe-LAFS/tahoe --version
 
-  debian-10: &DEBIAN
-    docker:
-      - <<: *DOCKERHUB_AUTH
-        image: "tahoelafsci/debian:10-py3.7"
-        user: "nobody"
-
+  debian-11: &DEBIAN
     environment: &UTF_8_ENVIRONMENT
       # In general, the test suite is not allowed to fail while the job
@@ -185 +171 @@
       LANG: "en_US.UTF-8"
       # Select a tox environment to run for this job.
-      TAHOE_LAFS_TOX_ENVIRONMENT: "py37"
+      TAHOE_LAFS_TOX_ENVIRONMENT: "py39"
       # Additional arguments to pass to tox.
       TAHOE_LAFS_TOX_ARGS: ""
@@ -253 +239 @@
             fi
 
-  debian-11:
-    <<: *DEBIAN
     docker:
       - <<: *DOCKERHUB_AUTH
         image: "tahoelafsci/debian:11-py3.9"
         user: "nobody"
-    environment:
-      <<: *UTF_8_ENVIRONMENT
-      TAHOE_LAFS_TOX_ENVIRONMENT: "py39"
+
 
   # Restore later using PyPy3.8
@@ -312 +294 @@
       - run: *SETUP_VIRTUALENV
       - run: *RUN_TESTS
-
-  ubuntu-18-04: &UBUNTU_18_04
-    <<: *DEBIAN
-    docker:
-      - <<: *DOCKERHUB_AUTH
-        image: "tahoelafsci/ubuntu:18.04-py3.7"
-        user: "nobody"
-
-    environment:
-      <<: *UTF_8_ENVIRONMENT
-      # The default trial args include --rterrors which is incompatible with
-      # this reporter on Python 3.  So drop that and just specify the
-      # reporter.
-      TAHOE_LAFS_TRIAL_ARGS: "--reporter=subunitv2-file"
-      TAHOE_LAFS_TOX_ENVIRONMENT: "py37"
-
 
   ubuntu-20-04:
@@ -446 +412 @@
     docker:
       - <<: *DOCKERHUB_AUTH
-        image: "tahoelafsci/ubuntu:18.04-py3.7"
+        image: "tahoelafsci/ubuntu:20.04-py3.9"
 
     steps:
@@ -458 +424 @@
     docker:
       - <<: *DOCKERHUB_AUTH
-        image: "tahoelafsci/ubuntu:18.04-py3.7"
+        image: "tahoelafsci/ubuntu:20.04-py3.9"
 
     steps:
@@ -509 +475 @@
 
 
-  build-image-debian-10:
-    <<: *BUILD_IMAGE
-
-    environment:
-      DISTRO: "debian"
-      TAG: "10"
-      PYTHON_VERSION: "3.7"
-
-
   build-image-debian-11:
     <<: *BUILD_IMAGE
@@ -525 +482 @@
       TAG: "11"
       PYTHON_VERSION: "3.9"
-
-  build-image-ubuntu-18-04:
-    <<: *BUILD_IMAGE
-
-    environment:
-      DISTRO: "ubuntu"
-      TAG: "18.04"
-      PYTHON_VERSION: "3.7"
 
 

.github/workflows/ci.yml ¶

@@ -49 +49 @@
           - ubuntu-latest
         python-version:
-          - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
         include:
-          # On macOS don't bother with 3.7-3.8, just to get faster builds.
+          # On macOS don't bother with 3.8, just to get faster builds.
           - os: macos-latest
             python-version: "3.9"
@@ -61 +60 @@
           # We only support PyPy on Linux at the moment.
           - os: ubuntu-latest
-            python-version: "pypy-3.7"
+            python-version: "pypy-3.8"
           - os: ubuntu-latest
-            python-version: "pypy-3.8"
+            python-version: "pypy-3.9"
 
     steps:
@@ -164 +163 @@
           # https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3943
           - os: ubuntu-20.04
-            python-version: "3.7"
-            force-foolscap: true
-          - os: ubuntu-20.04
             python-version: "3.9"
             force-foolscap: false

README.rst ¶

@@ -57 +57 @@
 -----------
 
-Python 3.7 or later is now required.
+Python 3.8 or later is required.
 If you are still using Python 2.7, use Tahoe-LAFS version 1.17.1.
 

default.nix ¶

@@ -30 +30 @@
                                   # for dependency resolution
 
-, pythonVersion ? "python37" # a string choosing the python derivation from
+, pythonVersion ? "python39" # a string choosing the python derivation from
                              # nixpkgs to target
 

setup.py ¶

@@ -224 +224 @@
     try:
         p = subprocess.Popen(args, stdout=subprocess.PIPE, cwd=cwd, shell=use_shell)
-    except EnvironmentError as e:  # if this gives a SyntaxError, note that Tahoe-LAFS requires Python 3.7+
+    except EnvironmentError as e:  # if this gives a SyntaxError, note that Tahoe-LAFS requires Python 3.8+
         print("Warning: unable to run %r." % (" ".join(args),))
         print(e)
@@ -375 +375 @@
       packages=find_packages('src') + ['allmydata.test.plugins'],
       classifiers=trove_classifiers,
-      # We support Python 3.7 or later. 3.11 is not supported yet.
-      python_requires=">=3.7, <3.11",
+      # We support Python 3.8 or later. 3.11 is not supported yet.
+      python_requires=">=3.8, <3.11",
       install_requires=install_requires,
       extras_require={
@@ -389 +389 @@
           "test": [
               "flake8",
-              # On Python 3.7, importlib_metadata v5 breaks flake8.
-              # https://github.com/python/importlib_metadata/issues/407
-              "importlib_metadata<5; python_version < '3.8'",
               # Pin a specific pyflakes so we don't have different folks
               # disagreeing on what is or is not a lint issue.  We can bump

tests.nix ¶

@@ -6 +6 @@
 , pkgs ? import sources.${pkgsVersion} { }
 , pypiData ? sources.pypi-deps-db
-, pythonVersion ? "python37"
+, pythonVersion ? "python39"
 , mach-nix ? import sources.mach-nix {
     inherit pkgs pypiData;
@@ -22 +22 @@
     lib = pkgs.lib;
   };
-  tests_require = (mach-lib.extract "python37" ./. "extras_require" ).extras_require.test;
+  tests_require = (mach-lib.extract "python39" ./. "extras_require" ).extras_require.test;
 
   # Get the Tahoe-LAFS package itself.  This does not include test

tox.ini ¶

@@ -8 +8 @@
 [gh-actions]
 python =
-    3.7: py37-coverage
     3.8: py38-coverage
     3.9: py39-coverage
     3.10: py310-coverage
-    pypy-3.7: pypy37
     pypy-3.8: pypy38
     pypy-3.9: pypy39
@@ -20 +18 @@
 
 [tox]
-envlist = typechecks,codechecks,py{37,38,39,310}-{coverage},pypy27,pypy37,pypy38,pypy39,integration
+envlist = typechecks,codechecks,py{38,39,310}-{coverage},pypy27,pypy38,pypy39,integration
 minversion = 2.4
 
@@ -50 +48 @@
      # suffering we're trying to avoid with the above pins.
      certifi
-     # VCS hooks support
-     py37,!coverage: pre-commit
 
 # We add usedevelop=False because testing against a true installation gives