Skip to content

Commit

Permalink
Merge 3679b48 into b37e7d9
Browse files Browse the repository at this point in the history
  • Loading branch information
josef-pkt committed Sep 1, 2020
2 parents b37e7d9 + 3679b48 commit 7a33100
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ build_script:
- wmic cpu get caption, name, numberofcores
- If Defined PY_MAJOR_VER ( call tools\ci\appveyor_conda.bat ) else ( call tools\ci\appveyor_pip.bat )
# Pin to 1.29 for now due to test discovery issues
- python -m pip install --upgrade pip
- python -m pip install --upgrade pip "setuptools<50.0"
- pip install pytest "pytest-xdist==1.29" pytest-randomly
- if Defined PYTEST_DIRECTIVES ( pip install -e . --no-build-isolation ) else ( pip install . )

Expand Down
2 changes: 1 addition & 1 deletion tools/ci/azure_template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
architecture: 'x64'

- script: |
python -m pip install --upgrade pip
python -m pip install --upgrade pip "setuptools<50.0"
pip install -r requirements.txt
pip install -r requirements-dev.txt
displayName: 'Install dependencies'
Expand Down

0 comments on commit 7a33100

Please sign in to comment.