Skip to content

Make changes for pip 1.5 #139

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

Closed
wants to merge 4 commits into from
Closed

Make changes for pip 1.5 #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18bd38a
Stop using --use-mirrors when installing requirements.
gsnedders Jan 5, 2014
a2d58b8
Installing flake8 separately is unnecessary; it is in requirements-te…
gsnedders Jan 5, 2014
bc0e23a
Allow Genshi to be installed insecurely, for now.
gsnedders Jan 5, 2014
8734f89
fixup! Allow Genshi to be installed insecurely, for now.
gsnedders Jan 5, 2014
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
10 changes: 3 additions & 7 deletions requirements-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@ if [[ $USE_OPTIONAL != "true" && $USE_OPTIONAL != "false" ]]; then
exit 1
fi

pip install -r requirements-test.txt --use-mirrors
pip install -r requirements-test.txt

if [[ $USE_OPTIONAL == "true" && $TRAVIS_PYTHON_VERSION != "pypy" ]]; then
if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then
pip install -r requirements-optional-2.6.txt --use-mirrors
pip install --allow-external Genshi --allow-insecure Genshi -r requirements-optional-2.6.txt
else
pip install -r requirements-optional-cpython.txt --use-mirrors
pip install --allow-external Genshi --allow-insecure Genshi -r requirements-optional-cpython.txt
fi
fi

if [[ $FLAKE == "true" ]]; then
pip install --use-mirrors flake8
fi
2 changes: 2 additions & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ deps =
commands =
{envbindir}/nosetests -q
{toxinidir}/flake8-run.sh
install_command =
pip install --allow-external Genshi --allow-insecure Genshi {opts} {packages}

[testenv:pypy]
# lxml doesn't work and datrie doesn't make sense
Expand Down