Skip to content

Commit

Permalink
Sigh. Pip changed the semantics of -U in pip 10. go back to the old w…
Browse files Browse the repository at this point in the history
…ay so we're actually testing changing deps; if it breaks we need to know.
  • Loading branch information
jamadden committed Apr 16, 2018
1 parent 6766b08 commit 383c1c1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -178,8 +178,8 @@ develop:
# Then start installing our deps so they can be cached. Note that use of --build-options / --global-options / --install-options
# disables the cache.
# We need wheel>=0.26 on Python 3.5. See previous revisions.
time ${PYTHON} -m pip install -U -r ci-requirements.txt
GEVENTSETUP_EV_VERIFY=3 time ${PYTHON} -m pip install -U -e .[test,dnspython,events]
time ${PYTHON} -m pip install -U --upgrade-strategy=eager -r ci-requirements.txt
GEVENTSETUP_EV_VERIFY=3 time ${PYTHON} -m pip install -U --upgrade-strategy=eager -e .[test,dnspython,events]
${PYTHON} -m pip freeze
ccache -s
@${PYTHON} scripts/travis.py fold_end install
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Expand Up @@ -124,7 +124,7 @@ install:
# compiled extensions and are not provided as pre-built wheel packages,
# pip will build them from source using the MSVC compiler matching the
# target Python version and architecture
- "%CMD_IN_ENV% %PYEXE% -m pip install -U -r ci-requirements.txt"
- "%CMD_IN_ENV% %PYEXE% -m pip install -U --upgrade-strategy=eager -r ci-requirements.txt"

- ps: "if(Test-Path(\"${env:PYTHON}\\bin\")) {ls ${env:PYTHON}\\bin;}"
- ps: "if(Test-Path(\"${env:PYTHON}\\Scripts\")) {ls ${env:PYTHON}\\Scripts;}"
Expand All @@ -142,7 +142,7 @@ build_script:
# into a variable, using python to glob.
- "%PYEXE% -c \"import glob; print(glob.glob('dist/*whl')[0])\" > whl.txt"
- set /p PYWHL=<whl.txt
- "%PYEXE% -m pip install %PYWHL%[test,events,dnspython]"
- "%PYEXE% -m pip install -U --upgrade-strategy=eager %PYWHL%[test,events,dnspython]"

test_script:
# Run the project tests
Expand Down

0 comments on commit 383c1c1

Please sign in to comment.