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

Drop --use-venv from all CI tests #7999

Closed
wants to merge 1 commit into from
Closed

Drop --use-venv from all CI tests #7999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions .azure-pipelines/jobs/test-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,12 @@ jobs:
Python27-x64:
python.version: '2.7'
python.architecture: x64
useVenv: true
Python35-x64:
python.version: '3.5'
python.architecture: x64
Python36-x64:
python.version: '3.6'
python.architecture: x64
useVenv: true
Python37-x64:
python.version: '3.7'
python.architecture: x64
Expand All @@ -35,7 +33,6 @@ jobs:
- template: ../steps/run-tests-windows.yml
parameters:
runIntegrationTests: true
useVenv: '$(useVenv)'

- job: Test_Secondary
displayName: Test Secondary
Expand Down
6 changes: 1 addition & 5 deletions .azure-pipelines/steps/run-tests-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
parameters:
runIntegrationTests:
useVenv: false

steps:
- task: UsePythonVersion@0
Expand Down Expand Up @@ -44,11 +43,8 @@ steps:
# https://bugs.python.org/issue18199
$env:TEMP = "R:\Temp"

tox -e py -- $env:USE_VENV_ARG -m integration -n auto --duration=5 --junit-xml=junit/integration-test.xml
tox -e py -- -m integration -n auto --duration=5 --junit-xml=junit/integration-test.xml
displayName: Tox run integration tests
env:
${{ if eq(parameters.useVenv, 'true') }}:
USE_VENV_ARG: "--use-venv"

- task: PublishTestResults@2
displayName: Publish Test Results
Expand Down
10 changes: 5 additions & 5 deletions tools/travis/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ if [[ $TOXENV != docs ]] || [[ $TOXENV != lint ]]; then
fi

# Export the correct TOXENV when not provided.
echo "Determining correct TOXENV..."
if [[ -z "$TOXENV" ]]; then
echo "Determining correct TOXENV..."
if [[ ${TRAVIS_PYTHON_VERSION} == pypy* ]]; then
export TOXENV=pypy
else
Expand All @@ -34,19 +34,19 @@ if [[ -z "$TOXENV" ]]; then
_minor=${TRAVIS_PYTHON_VERSION:2:1}
export TOXENV="py${_major}${_minor}"
fi
echo "TOXENV=${TOXENV}"
fi
echo "TOXENV=${TOXENV}"

# Print the commands run for this test.
set -x
if [[ "$GROUP" == "1" ]]; then
# Unit tests
tox -- --use-venv -m unit -n auto
tox -- -m unit -n auto
# Integration tests (not the ones for 'pip install')
tox -- --use-venv -m integration -n auto --duration=5 -k "not test_install"
tox -- -m integration -n auto --duration=5 -k "not test_install"
elif [[ "$GROUP" == "2" ]]; then
# Separate Job for running integration tests for 'pip install'
tox -- --use-venv -m integration -n auto --duration=5 -k "test_install"
tox -- -m integration -n auto --duration=5 -k "test_install"
else
# Non-Testing Jobs should run once
tox
Expand Down