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

Fixing ci, adding python3.5 python3.6 #27

Merged
merged 7 commits into from Oct 24, 2017
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 17 additions & 7 deletions .travis.yml
Expand Up @@ -3,16 +3,26 @@ python: 2.7

sudo: false

env:
- TOX_ENV=py26
- TOX_ENV=py27
- TOX_ENV=py33
- TOX_ENV=py34
- TOX_ENV=pypy
matrix:
include:
- python: 2.6
env: TOX_ENV=py26
- python: 2.7
env: TOX_ENV=py27
- python: 3.3
env: TOX_ENV=py33
- python: 3.4
env: TOX_ENV=py34
- python: 3.5
env: TOX_ENV=py35
- python: 3.6
env: TOX_ENV=py36
- python: pypy
env: TOX_ENV=pypy
Copy link
Owner

Choose a reason for hiding this comment

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

I don't understand, we shouldn't need to specify the python versions here because tox should take care of that. If it doesn't then what is the point of using tox at all?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

i think the reason is that travis does not come with python3.6 pre-istalled. Tox creates a virtualenv from this executable.

Copy link
Owner

Choose a reason for hiding this comment

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

exactly, but if you're specifying python: 3.6 then you're telling TravisCI to run in a container that uses Python 3.6 by default.

we're using tox so that we can run Python 2.7 locally (or whatever version you use) and tox will take care of creating a virtualenv with the correct Python version for the test that it currently is running.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

i thought virtualenv needed an executable of the correction python version?

Copy link
Owner

Choose a reason for hiding this comment

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

nope, tox should take care of putting the correct python version into the virtualenv


install:
# Install tox and flake8 style checker
- pip install tox==1.7.2 flake8==2.1.0
- pip install tox==2.9.1 flake8==2.1.0

script:
# Run the library through flake8
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Expand Up @@ -3,4 +3,4 @@

# Additional requirements for development
sphinx==1.2.1
tox==1.7.2
tox==2.9.1
4 changes: 2 additions & 2 deletions requirements-test.txt
Expand Up @@ -2,9 +2,9 @@
-e .

# Additional requirements for running the testsuite
pytest==2.6.2
pytest==3.2.3
coverage==3.7.1
pytest-cov==1.8.0
pytest-cov==2.5.1
flake8==2.1.0
freezegun==0.3.8
six==1.10
2 changes: 1 addition & 1 deletion tox.ini
@@ -1,5 +1,5 @@
[tox]
envlist = py26, py27, py33, py34, pypy
envlist = py26, py27, py33, py34, py35, py36, pypy
skipsdist = True

[testenv]
Expand Down