Skip to content

Commit 9a6dfd4

Browse files
kashifkhanscbedd
andauthored
install cibuildwheel in pwsh (#389)
* install cibuildwheel in pwsh * try removing user * make pytest not user installs * make uamqp install not user level * revert the install_python to leveraging the native python version instead of reinstalling * remove more stuff --------- Co-authored-by: Scott Beddall (from Dev Box) <scbedd@microsoft.com>
1 parent 2d79b9c commit 9a6dfd4

1 file changed

Lines changed: 9 additions & 18 deletions

File tree

.azure-pipelines/client.yml

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -110,27 +110,18 @@ extends:
110110
- script: sudo xcode-select --switch /Applications/Xcode_13.1.app
111111
displayName: 'Select Xcode 13.1'
112112

113-
- script: source ./install_python_osx.sh
114-
displayName: 'Install Official Python'
115-
116-
- script: |
117-
echo "Prepending PATH environment variable with directory: /usr/local/bin"
118-
echo "##vso[task.prependpath]/usr/local/bin"
119-
export PYTHON_SHORT_VER=`echo $(PythonVersion) | cut -d . -f 1,2`
120-
echo "Prepending PATH environment variable with directory: $HOME/Library/Python/$PYTHON_SHORT_VER/bin"
121-
echo "##vso[task.prependpath]$HOME/Library/Python/$PYTHON_SHORT_VER/bin"
122-
displayName: 'Prepare PATH'
113+
- template: /.azure-pipelines/use-python-version.yml
114+
parameters:
115+
versionSpec: '$(PythonVersion)'
123116

124117
- script: |
125-
$(PythonBin) --version
126-
curl -sS $(GetPip) | $(PythonBin) - --user
127-
$(PythonBin) -m pip --version
128-
$(PythonBin) -m pip install --user -r dev_requirements.txt
118+
python -m pip --version
119+
python -m pip install --user -r dev_requirements.txt
129120
displayName: 'Install dependencies'
130121
131122
- bash: |
132123
set -o errexit
133-
$(PythonBin) -m pip install --user cibuildwheel==2.16.2 --force
124+
python -m pip install cibuildwheel==2.16.2 --force
134125
displayName: Install cibuildwheel 2.16.2
135126
136127
- pwsh: |
@@ -145,9 +136,9 @@ extends:
145136
displayName: 'Check output'
146137

147138
- script: |
148-
$(PythonBin) -m pip install --user --ignore-installed ./dist/*.whl
149-
$(PythonBin) -m pip install --user pytest==6.2.4 --force
150-
$(PythonBin) -m pip install --user pytest-asyncio==0.12.0 --force
139+
python -m pip install --ignore-installed ./dist/*.whl
140+
python -m pip install pytest==6.2.4 --force
141+
python -m pip install pytest-asyncio==0.12.0 --force
151142
pytest tests --doctest-modules --junitxml=junit/test-results-c.xml
152143
pytest samples --doctest-modules --junitxml=junit/test-results-live.xml
153144
displayName: 'Run tests'

0 commit comments

Comments
 (0)