Merge pull request #7831 from asottile/py36_drop_in_CI
py36+: drop python3.5 in CI and setup.cfg
This commit is contained in:
commit
325b988ca8
|
@ -21,13 +21,11 @@ jobs:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
name: [
|
name: [
|
||||||
"windows-py35",
|
|
||||||
"windows-py36",
|
"windows-py36",
|
||||||
"windows-py37",
|
"windows-py37",
|
||||||
"windows-py37-pluggy",
|
"windows-py37-pluggy",
|
||||||
"windows-py38",
|
"windows-py38",
|
||||||
|
|
||||||
"ubuntu-py35",
|
|
||||||
"ubuntu-py36",
|
"ubuntu-py36",
|
||||||
"ubuntu-py37",
|
"ubuntu-py37",
|
||||||
"ubuntu-py37-pluggy",
|
"ubuntu-py37-pluggy",
|
||||||
|
@ -45,11 +43,6 @@ jobs:
|
||||||
]
|
]
|
||||||
|
|
||||||
include:
|
include:
|
||||||
- name: "windows-py35"
|
|
||||||
python: "3.5"
|
|
||||||
os: windows-latest
|
|
||||||
tox_env: "py35-xdist"
|
|
||||||
use_coverage: true
|
|
||||||
- name: "windows-py36"
|
- name: "windows-py36"
|
||||||
python: "3.6"
|
python: "3.6"
|
||||||
os: windows-latest
|
os: windows-latest
|
||||||
|
@ -68,10 +61,6 @@ jobs:
|
||||||
tox_env: "py38-unittestextras"
|
tox_env: "py38-unittestextras"
|
||||||
use_coverage: true
|
use_coverage: true
|
||||||
|
|
||||||
- name: "ubuntu-py35"
|
|
||||||
python: "3.5"
|
|
||||||
os: ubuntu-latest
|
|
||||||
tox_env: "py35-xdist"
|
|
||||||
- name: "ubuntu-py36"
|
- name: "ubuntu-py36"
|
||||||
python: "3.6"
|
python: "3.6"
|
||||||
os: ubuntu-latest
|
os: ubuntu-latest
|
||||||
|
|
60
.travis.yml
60
.travis.yml
|
@ -1,60 +0,0 @@
|
||||||
language: python
|
|
||||||
dist: trusty
|
|
||||||
python: '3.5.1'
|
|
||||||
cache: false
|
|
||||||
|
|
||||||
env:
|
|
||||||
global:
|
|
||||||
- PYTEST_ADDOPTS=-vv
|
|
||||||
|
|
||||||
# setuptools-scm needs all tags in order to obtain a proper version
|
|
||||||
git:
|
|
||||||
depth: false
|
|
||||||
|
|
||||||
install:
|
|
||||||
- python -m pip install --upgrade --pre tox
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
include:
|
|
||||||
# Coverage for Python 3.5.{0,1} specific code, mostly typing related.
|
|
||||||
- env: TOXENV=py35 PYTEST_COVERAGE=1 PYTEST_ADDOPTS="-k test_raises_cyclic_reference"
|
|
||||||
before_install:
|
|
||||||
# Work around https://github.com/jaraco/zipp/issues/40.
|
|
||||||
- python -m pip install -U 'setuptools>=34.4.0' virtualenv==16.7.9
|
|
||||||
|
|
||||||
before_script:
|
|
||||||
- |
|
|
||||||
# Do not (re-)upload coverage with cron runs.
|
|
||||||
if [[ "$TRAVIS_EVENT_TYPE" = cron ]]; then
|
|
||||||
PYTEST_COVERAGE=0
|
|
||||||
fi
|
|
||||||
- |
|
|
||||||
if [[ "$PYTEST_COVERAGE" = 1 ]]; then
|
|
||||||
export COVERAGE_FILE="$PWD/.coverage"
|
|
||||||
export COVERAGE_PROCESS_START="$PWD/.coveragerc"
|
|
||||||
export _PYTEST_TOX_COVERAGE_RUN="coverage run -m"
|
|
||||||
export _PYTEST_TOX_EXTRA_DEP=coverage-enable-subprocess
|
|
||||||
fi
|
|
||||||
|
|
||||||
script: tox
|
|
||||||
|
|
||||||
after_success:
|
|
||||||
- |
|
|
||||||
if [[ "$PYTEST_COVERAGE" = 1 ]]; then
|
|
||||||
env CODECOV_NAME="$TOXENV-$TRAVIS_OS_NAME" scripts/report-coverage.sh -F Travis
|
|
||||||
fi
|
|
||||||
|
|
||||||
notifications:
|
|
||||||
irc:
|
|
||||||
channels:
|
|
||||||
- "chat.freenode.net#pytest"
|
|
||||||
on_success: change
|
|
||||||
on_failure: change
|
|
||||||
skip_join: true
|
|
||||||
email:
|
|
||||||
- pytest-commit@python.org
|
|
||||||
|
|
||||||
branches:
|
|
||||||
only:
|
|
||||||
- master
|
|
||||||
- /^\d+\.\d+\.x$/
|
|
|
@ -0,0 +1 @@
|
||||||
|
pytest now supports python3.6+ only.
|
|
@ -17,7 +17,6 @@ classifiers =
|
||||||
Operating System :: POSIX
|
Operating System :: POSIX
|
||||||
Programming Language :: Python :: 3
|
Programming Language :: Python :: 3
|
||||||
Programming Language :: Python :: 3 :: Only
|
Programming Language :: Python :: 3 :: Only
|
||||||
Programming Language :: Python :: 3.5
|
|
||||||
Programming Language :: Python :: 3.6
|
Programming Language :: Python :: 3.6
|
||||||
Programming Language :: Python :: 3.7
|
Programming Language :: Python :: 3.7
|
||||||
Programming Language :: Python :: 3.8
|
Programming Language :: Python :: 3.8
|
||||||
|
@ -50,7 +49,7 @@ install_requires =
|
||||||
colorama;sys_platform=="win32"
|
colorama;sys_platform=="win32"
|
||||||
importlib-metadata>=0.12;python_version<"3.8"
|
importlib-metadata>=0.12;python_version<"3.8"
|
||||||
pathlib2>=2.2.0;python_version<"3.6"
|
pathlib2>=2.2.0;python_version<"3.6"
|
||||||
python_requires = >=3.5
|
python_requires = >=3.6
|
||||||
package_dir =
|
package_dir =
|
||||||
=src
|
=src
|
||||||
setup_requires =
|
setup_requires =
|
||||||
|
|
Loading…
Reference in New Issue