Merge pull request #1173 from tahoe-lafs/3865-drop-python36

Drop Python 3.6 Fixes ticket:3865
2025-04-16 15:08:58 +00:00 · 2022-01-25 10:41:37 -05:00 · 2022-01-25 10:41:37 -05:00 · 6480e0c8d3
commit 6480e0c8d3
parent 766a53b520 e1f9f7de94
8 changed files with 24 additions and 74 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -49,8 +49,8 @@ workflows:
      - "pypy27-buster":
          {}

-      # Just one Python 3.6 configuration while the port is in-progress.
-      - "python36":
+      # Test against Python 3:
+      - "python37":
          {}

      # Other assorted tasks and configurations
@ -118,7 +118,7 @@ workflows:
          <<: *DOCKERHUB_CONTEXT
      - "build-image-pypy27-buster":
          <<: *DOCKERHUB_CONTEXT
-      - "build-image-python36-ubuntu":
+      - "build-image-python37-ubuntu":
          <<: *DOCKERHUB_CONTEXT


@ -379,11 +379,11 @@ jobs:
        user: "nobody"


-  python36:
+  python37:
    <<: *UBUNTU_18_04
    docker:
      - <<: *DOCKERHUB_AUTH
-        image: "tahoelafsci/ubuntu:18.04-py3"
+        image: "tahoelafsci/ubuntu:18.04-py3.7"
        user: "nobody"

    environment:
@ -392,7 +392,7 @@ jobs:
      # this reporter on Python 3.  So drop that and just specify the
      # reporter.
      TAHOE_LAFS_TRIAL_ARGS: "--reporter=subunitv2-file"
-      TAHOE_LAFS_TOX_ENVIRONMENT: "py36"
+      TAHOE_LAFS_TOX_ENVIRONMENT: "py37"


  ubuntu-20-04:
@ -511,7 +511,9 @@ jobs:
    # https://circleci.com/blog/how-to-build-a-docker-image-on-circleci-2-0/
    docker:
      - <<: *DOCKERHUB_AUTH
-        image: "docker:17.05.0-ce-git"
+        # CircleCI build images; https://github.com/CircleCI-Public/cimg-base
+        # for details.
+        image: "cimg/base:2022.01"

    environment:
      DISTRO: "tahoelafsci/<DISTRO>:foo-py2"
@ -577,13 +579,13 @@ jobs:
      PYTHON_VERSION: "2.7"


-  build-image-python36-ubuntu:
+  build-image-python37-ubuntu:
    <<: *BUILD_IMAGE

    environment:
      DISTRO: "ubuntu"
      TAG: "18.04"
-      PYTHON_VERSION: "3"
+      PYTHON_VERSION: "3.7"


  build-image-ubuntu-20-04:
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -39,12 +39,11 @@ jobs:
          - ubuntu-latest
        python-version:
          - 2.7
-          - 3.6
          - 3.7
          - 3.8
          - 3.9
        include:
-          # On macOS don't bother with 3.6-3.8, just to get faster builds.
+          # On macOS don't bother with 3.7-3.8, just to get faster builds.
          - os: macos-10.15
            python-version: 2.7
          - os: macos-latest
@ -181,10 +180,10 @@ jobs:
          - ubuntu-latest
        python-version:
          - 2.7
-          - 3.6
+          - 3.7
          - 3.9
        include:
-          # On macOS don't bother with 3.6, just to get faster builds.
+          # On macOS don't bother with 3.7, just to get faster builds.
          - os: macos-10.15
            python-version: 2.7
          - os: macos-latest
--- a/4
+++ b/4
@ -35,7 +35,7 @@ test: .tox/create-venvs.log
 # Run codechecks first since it takes the least time to report issues early.
 	tox --develop -e codechecks
 # Run all the test environments in parallel to reduce run-time
-	tox --develop -p auto -e 'py27,py36,pypy27'
+	tox --develop -p auto -e 'py27,py37,pypy27'
 .PHONY: test-venv-coverage
 ## Run all tests with coverage collection and reporting.
 test-venv-coverage:
@ -51,7 +51,7 @@ test-venv-coverage:
 .PHONY: test-py3-all
 ## Run all tests under Python 3
 test-py3-all: .tox/create-venvs.log
-	tox --develop -e py36 allmydata
+	tox --develop -e py37 allmydata

 # This is necessary only if you want to automatically produce a new
 # _version.py file from the current git history (without doing a build).
--- a/misc/python3/Makefile
+++ b/misc/python3/Makefile
@ -1,53 +0,0 @@
-# Python 3 porting targets
-#
-# NOTE: this Makefile requires GNU make
-
-### Defensive settings for make:
-#     https://tech.davis-hansson.com/p/make/
-SHELL := bash
-.ONESHELL:
-.SHELLFLAGS := -xeu -o pipefail -c
-.SILENT:
-.DELETE_ON_ERROR:
-MAKEFLAGS += --warn-undefined-variables
-MAKEFLAGS += --no-builtin-rules
-
-
-# Top-level, phony targets
-
-.PHONY: default
-default:
-	@echo "no default target"
-
-.PHONY: test-py3-all-before
-## Log the output of running all tests under Python 3 before changes
-test-py3-all-before: ../../.tox/make-test-py3-all-old.log
-.PHONY: test-py3-all-diff
-## Compare the output of running all tests under Python 3 after changes
-test-py3-all-diff: ../../.tox/make-test-py3-all.diff
-
-
-# Real targets
-
-# Gauge the impact of changes on Python 3 compatibility
-# Compare the output from running all tests under Python 3 before and after changes.
-# Before changes:
-# `$ rm -f .tox/make-test-py3-all-*.log && make .tox/make-test-py3-all-old.log`
-# After changes:
-# `$ make .tox/make-test-py3-all.diff`
-$(foreach side,old new,../../.tox/make-test-py3-all-$(side).log):
-	cd "../../"
-	tox --develop --notest -e py36-coverage
-	(make VIRTUAL_ENV=./.tox/py36-coverage TEST_SUITE=allmydata \
-		test-venv-coverage || true) | \
-		sed -E 's/\([0-9]+\.[0-9]{3} secs\)/(#.### secs)/' | \
-		tee "./misc/python3/$(@)"
-../../.tox/make-test-py3-all.diff: ../../.tox/make-test-py3-all-new.log
-	(diff -u "$(<:%-new.log=%-old.log)" "$(<)" || true) | tee "$(@)"
-
-# Locate modules that are candidates for naively converting `unicode` -> `str`.
-# List all Python source files that reference `unicode` but don't reference `str`
-../../.tox/py3-unicode-no-str.ls:
-	cd "../../"
-	find src -type f -iname '*.py' -exec grep -l -E '\Wunicode\W' '{}' ';' | \
-		xargs grep -L '\Wstr\W' | xargs ls -ld | tee "./misc/python3/$(@)"
--- a/newsfragments/3865.incompat
+++ b/newsfragments/3865.incompat
@ -0,0 +1 @@
+Python 3.6 is no longer supported, as it has reached end-of-life and is no longer receiving security updates.
--- a/setup.py
+++ b/setup.py
@ -376,9 +376,8 @@ setup(name="tahoe-lafs", # also set in __init__.py
      package_dir = {'':'src'},
      packages=find_packages('src') + ['allmydata.test.plugins'],
      classifiers=trove_classifiers,
-      # We support Python 2.7, and we're working on support for 3.6 (the
-      # highest version that PyPy currently supports).
-      python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*",
+      # We support Python 2.7, and Python 3.7 or later.
+      python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, !=3.6.*",
      install_requires=install_requires,
      extras_require={
          # Duplicate the Twisted pywin32 dependency here.  See
--- a/src/allmydata/util/encodingutil.py
+++ b/src/allmydata/util/encodingutil.py
@ -320,6 +320,9 @@ def quote_output(s, quotemarks=True, quote_newlines=None, encoding=None):
        # Although the problem is that doesn't work in Python 3.6, only 3.7 or
        # later... For now not thinking about it, just returning unicode since
        # that is the right thing to do on Python 3.
+        #
+        # Now that Python 3.7 is the minimum, this can in theory be done:
+        # https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3866
        result = result.decode(encoding)
    return result

--- a/tox.ini
+++ b/tox.ini
@ -8,7 +8,6 @@
 [gh-actions]
 python =
    2.7: py27-coverage,codechecks
-    3.6: py36-coverage
    3.7: py37-coverage,typechecks,codechecks3
    3.8: py38-coverage
    3.9: py39-coverage
@ -18,7 +17,7 @@ python =
 twisted = 1

 [tox]
-envlist = typechecks,codechecks,codechecks3,py{27,36,37,38,39}-{coverage},pypy27,pypy3,integration,integration3
+envlist = typechecks,codechecks,codechecks3,py{27,37,38,39}-{coverage},pypy27,pypy3,integration,integration3
 minversion = 2.4

 [testenv]
@ -51,7 +50,7 @@ deps =
     # suffering we're trying to avoid with the above pins.
     certifi
     # VCS hooks support
-     py36,!coverage: pre-commit
+     py37,!coverage: pre-commit

 # We add usedevelop=False because testing against a true installation gives
 # more useful results.
				`@ -0,0 +1 @@`
				`Python 3.6 is no longer supported, as it has reached end-of-life and is no longer receiving security updates.`