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

Fix CI for Python 2.7 #156

Merged
merged 10 commits into from
Feb 11, 2020
Merged

Fix CI for Python 2.7 #156

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e28affd
Install newer six version
danimtb Feb 11, 2020
d161e7f
fix six version
danimtb Feb 11, 2020
b3ea78b
try with 1.13.0
danimtb Feb 11, 2020
020b084
try 1.14
danimtb Feb 11, 2020
56e11e6
remove six requirement
danimtb Feb 11, 2020
5aac7d1
Fix virtualenv version
danimtb Feb 11, 2020
4519bf2
Move requirements to file
danimtb Feb 11, 2020
4a4f860
relax virtualenv version
danimtb Feb 11, 2020
83fee5a
remove other packages
danimtb Feb 11, 2020
8088cec
conditional for pip uninstall
danimtb Feb 11, 2020
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ install:
pyenv activate conan;
fi
- pip install --upgrade pip
- pip install tox tox-venv
- pip uninstall -y -r <(pip freeze)
Copy link
Member Author

Choose a reason for hiding this comment

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

This is done to avoid conflicts with pluggy (requirement of pytest in the travis env and the requirement of tox and tox-env installed by us)

- pip install -r .travis/requirements_travis.txt

script:
Expand Down
4 changes: 3 additions & 1 deletion .travis/requirements_travis.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
tox-travis
tox
tox-venv
virtualenv<=16.7.9 # TODO: Remove when dropping Python 2