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.

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

Remove support for Python 3.3, add support for Python 3.6 & 3.7 #1085

Merged
merged 5 commits into from
Oct 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 12 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,27 @@ before_script:
# Add an IPv6 config - see the corresponding Travis issue
# https://github.com/travis-ci/travis-ci/issues/8361
# Taken from https://github.com/travis-ci/travis-ci/issues/8361#issuecomment-350497804
- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6';
fi

jobs:
include:
- python: 3.5
env: TOX_ENV=py35
- python: 3.5
- python: 3.7
env: TOX_ENV=py37
# cf https://github.com/travis-ci/travis-ci/issues/9069#issuecomment-425720905
sudo: required
dist: xenial
- python: 3.6
env: TOX_ENV=docs
- python: 3.5
- python: 3.6
env: TOX_ENV=flake8
- python: 3.6
env: TOX_ENV=py36
- python: 3.5
env: TOX_ENV=py35
- python: 3.4
env: TOX_ENV=py34
- python: 3.3
env: TOX_ENV=py33
- python: 2.7
env: TOX_ENV=py27
- python: 2.7
Expand Down
3 changes: 1 addition & 2 deletions circus/tests/test_watcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,7 @@ def test_venv(self):
major = py_version[0]
minor = py_version[1]
wanted = os.path.join(venv, 'lib', 'python%d.%d' % (major, minor),
'site-packages',
'pip-7.7-py%d.%d.egg' % (major, minor))
'site-packages')
ppath = watcher.watcher.env['PYTHONPATH']
finally:
yield watcher.stop()
Expand Down
Loading