Skip to content

Commit

Permalink
Merge pull request #7831 from asottile/py36_drop_in_CI
Browse files Browse the repository at this point in the history
py36+: drop python3.5 in CI and setup.cfg
  • Loading branch information
asottile committed Oct 2, 2020
2 parents cb0a13a + 179f432 commit 325b988
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 74 deletions.
11 changes: 0 additions & 11 deletions .github/workflows/main.yml
Expand Up @@ -21,13 +21,11 @@ jobs:
fail-fast: false
matrix:
name: [
"windows-py35",
"windows-py36",
"windows-py37",
"windows-py37-pluggy",
"windows-py38",

"ubuntu-py35",
"ubuntu-py36",
"ubuntu-py37",
"ubuntu-py37-pluggy",
Expand All @@ -45,11 +43,6 @@ jobs:
]

include:
- name: "windows-py35"
python: "3.5"
os: windows-latest
tox_env: "py35-xdist"
use_coverage: true
- name: "windows-py36"
python: "3.6"
os: windows-latest
Expand All @@ -68,10 +61,6 @@ jobs:
tox_env: "py38-unittestextras"
use_coverage: true

- name: "ubuntu-py35"
python: "3.5"
os: ubuntu-latest
tox_env: "py35-xdist"
- name: "ubuntu-py36"
python: "3.6"
os: ubuntu-latest
Expand Down
60 changes: 0 additions & 60 deletions .travis.yml

This file was deleted.

1 change: 1 addition & 0 deletions changelog/7808.breaking.rst
@@ -0,0 +1 @@
pytest now supports python3.6+ only.
3 changes: 1 addition & 2 deletions setup.cfg
Expand Up @@ -17,7 +17,6 @@ classifiers =
Operating System :: POSIX
Programming Language :: Python :: 3
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Expand Down Expand Up @@ -50,7 +49,7 @@ install_requires =
colorama;sys_platform=="win32"
importlib-metadata>=0.12;python_version<"3.8"
pathlib2>=2.2.0;python_version<"3.6"
python_requires = >=3.5
python_requires = >=3.6
package_dir =
=src
setup_requires =
Expand Down
1 change: 0 additions & 1 deletion tox.ini
Expand Up @@ -5,7 +5,6 @@ distshare = {homedir}/.tox/distshare
# make sure to update environment list in travis.yml and appveyor.yml
envlist =
linting
py35
py36
py37
py38
Expand Down

0 comments on commit 325b988

Please sign in to comment.