diff --git a/.circleci/config.yml b/.circleci/config.yml index fa71df8f8..ef8c6eb29 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,13 +4,29 @@ version: 2.1 orbs: orb: invocations/orb@1.3.1 +executors: + # Basically extending what the python orb's executor does: + # - s/tag/version/ + # - default to 3.6, not 3.8 or w/e + # - set common environment vars + default: + parameters: + version: + type: string + default: "3.11" + docker: + - image: cimg/python:<< parameters.version >> + # TODO: explicitly select 'resource_class: small' if credits ever become + # too tight; seems like small uses 5 credits/min and medium, the default, + # uses 10 + environment: + TERM: screen-256color jobs: # Unit+integration tests, with coverage coverage: executor: - name: orb/default - version: "3.6" + name: default steps: - orb/setup - run: inv ci.make-sudouser @@ -19,8 +35,7 @@ jobs: regression: executor: - name: orb/default - version: "3.6" + name: default steps: - orb/setup - run: inv regression @@ -28,8 +43,7 @@ jobs: doctests: executor: - name: orb/default - version: "3.6" + name: default steps: - orb/setup - run: inv www.doctest @@ -37,8 +51,7 @@ jobs: typecheck: executor: - name: orb/default - version: "3.6" + name: default steps: - orb/setup - run: mypy . @@ -65,7 +78,7 @@ workflows: requires: ["Test"] matrix: parameters: - version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + version: ["3.9", "3.10", "3.11"] - orb/docs: name: "Docs" requires: ["Test"] diff --git a/setup.py b/setup.py index 1bfb53fe2..0478c9c62 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ "Changelog": "https://www.pyinvoke.org/changelog.html", "CI": "https://app.circleci.com/pipelines/github/pyinvoke/invoke", }, - python_requires=">=3.6", + python_requires=">=3.9", packages=find_packages(exclude=exclude), include_package_data=True, entry_points={ @@ -62,9 +62,6 @@ "Programming Language :: Python", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.6", - "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", diff --git a/sites/www/installing.rst b/sites/www/installing.rst index 97168daf6..9ac167246 100644 --- a/sites/www/installing.rst +++ b/sites/www/installing.rst @@ -10,7 +10,7 @@ via `pip `_:: $ pip install invoke -We currently support **Python 3.6+**. Users still on Python 3.5 or older are +We currently support **Python 3.9+**. Users still on Python 3.8 or older are urged to upgrade. As long as you have a supported Python interpreter, **there are no other