Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop support for EOL Python 3.6 #1564

Closed
wants to merge 3 commits into from
Closed

Drop support for EOL Python 3.6 #1564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e94fcf
Daily cron: Test pip main on 3.10 but not 3.6
hugovk Jan 31, 2022
9a15401
Drop support for EOL Python 3.6
hugovk Jan 31, 2022
0ec6355
With the release of pip 22.0, bump pipprevious to 21.3
hugovk Jan 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ jobs:
- macOS
python-version:
- "3.10"
- 3.9
- 3.6
- 3.7
- 3.8
- "3.9"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest to use an ascending order as used in other projects.

- "3.8"
- "3.7"
pip-version:
- "latest"
- "previous"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/cron.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
- Windows
- MacOS
python-version:
- 3.9
- 3.6
- 3.7
- 3.8
- "3.10"
- "3.9"
- "3.8"
- "3.7"
pip-version:
- main
env:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repos:
rev: v2.29.0
hooks:
- id: pyupgrade
args: [--py36-plus]
args: [--py37-plus]
- repo: https://github.com/PyCQA/flake8
rev: 4.0.1
hooks:
Expand Down
8 changes: 5 additions & 3 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,15 +454,15 @@ then yes, you should commit both ``requirements.in`` and ``requirements.txt`` to
Note that if you are deploying on multiple Python environments (read the section below),
then you must commit a seperate output file for each Python environment.
We suggest to use the ``{env}-requirements.txt`` format
(ex: ``win32-py3.7-requirements.txt``, ``macos-py3.6-requirements.txt``, etc.).
(ex: ``win32-py3.7-requirements.txt``, ``macos-py3.10-requirements.txt``, etc.).


Cross-environment usage of ``requirements.in``/``requirements.txt`` and ``pip-compile``
=======================================================================================

The dependencies of a package can change depending on the Python environment in which it
is installed. Here, we define a Python environment as the combination of Operating
System, Python version (3.6, 3.7, etc.), and Python implementation (CPython, PyPy,
System, Python version (3.7, 3.8, etc.), and Python implementation (CPython, PyPy,
etc.). For an exact definition, refer to the possible combinations of `PEP 508
environment markers`_.

Expand Down Expand Up @@ -527,5 +527,7 @@ versions as the required ``pip`` versions.
+---------------+----------------+----------------+
| 6.0.0 - 6.3.1 | 20.3 - 21.2.* | 3.6 - 3.9 |
+---------------+----------------+----------------+
| 6.4.0+ | 21.2+ | 3.6 - 3.10 |
| 6.4.0 | 21.2+ | 3.6 - 3.10 |
+---------------+----------------+----------------+
| 6.5.0+ | 21.2+ | 3.7 - 3.10 |
+---------------+----------------+----------------+
31 changes: 0 additions & 31 deletions piptools/_compat/contextlib.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion piptools/repositories/pypi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import contextlib
import hashlib
import itertools
import logging
Expand Down Expand Up @@ -39,7 +40,6 @@
from pip._vendor.packaging.version import _BaseVersion
from pip._vendor.requests import RequestException, Session

from .._compat import contextlib
from ..exceptions import NoCandidateFound
from ..logging import log
from ..utils import (
Expand Down
3 changes: 1 addition & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ classifiers =
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
Expand All @@ -25,7 +24,7 @@ classifiers =
Topic :: System :: Systems Administration

[options]
python_requires = >=3.6
python_requires = >=3.7
setup_requires = setuptools_scm
packages = find:
zip_safe = false
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tox]
envlist =
# NOTE: keep this in sync with the env list in .github/workflows/ci.yml.
py{36,37,38,39,310,311,py3}-pip{previous,latest,main}-coverage
py{37,38,39,310,311,py3}-pip{previous,latest,main}-coverage
checkqa
readme
skip_missing_interpreters = True
Expand All @@ -11,7 +11,7 @@ extras =
testing
coverage: coverage
deps =
pipprevious: pip==21.2.*
pipprevious: pip==21.3.*
piplatest: pip
pipmain: -e git+https://github.com/pypa/pip.git@main#egg=pip
setenv =
Expand Down