Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 377e3cf

Browse filesBrowse files
committed
Apply review comments
1 parent 7483e1b commit 377e3cf
Copy full SHA for 377e3cf

File tree

1 file changed

+19
-40
lines changed
Filter options

1 file changed

+19
-40
lines changed

‎.github/workflows/build_wheels.yml

Copy file name to clipboardExpand all lines: .github/workflows/build_wheels.yml
+19-40Lines changed: 19 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ jobs:
6262
- name: before test
6363
run: |
6464
cd ${{ github.workspace }}/tests
65-
$env:PYTHONWARNINGS = "ignore:::pip._internal.cli.base_command"
6665
&python -m pip install --user --no-warn-script-location (ls "../wheelhouse/opencv*.whl")
6766
if ($LastExitCode -ne 0) {throw $LastExitCode}
6867
shell: powershell
@@ -126,6 +125,7 @@ jobs:
126125
127126
- name: Set up Python ${{ matrix.python-version }}
128127
uses: actions/setup-python@v2
128+
if: ${{ 'macos-latest' == matrix.os }}
129129
with:
130130
python-version: ${{ matrix.python-version }}
131131
architecture: ${{ matrix.platform }}
@@ -143,47 +143,22 @@ jobs:
143143
- name: before install
144144
run: |
145145
set -e
146-
if [[ $SDIST == 0 ]]; then
147-
# Check out and prepare the source
148-
# Multibuild doesn't have releases, so --depth would break eventually (see
149-
# https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)
150-
git submodule update --init multibuild
151-
source multibuild/common_utils.sh
152-
# https://github.com/matthew-brett/multibuild/issues/116
153-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export ARCH_FLAGS=" "; fi
154-
source multibuild/travis_steps.sh
155-
# This sets -x
156-
# source travis_multibuild_customize.sh
157-
echo $ENABLE_CONTRIB > contrib.enabled
158-
echo $ENABLE_HEADLESS > headless.enabled
159-
echo "end"
160-
# Not interested in travis internal scripts' output
161-
fi
162-
set +x
163-
# Build and package
164-
set -x
165-
ls
166-
if [[ $SDIST == 1 ]]; then
167-
python -m pip install --upgrade pip
168-
python -m pip install scikit-build
169-
python setup.py sdist
170-
else
171-
build_wheel $REPO_DIR $PLAT
172-
fi
173-
set +x
174-
# Install and run tests
146+
# Check out and prepare the source
147+
# Multibuild doesn't have releases, so --depth would break eventually (see
148+
# https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)
149+
git submodule update --init multibuild
150+
source multibuild/common_utils.sh
151+
# https://github.com/matthew-brett/multibuild/issues/116
152+
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export ARCH_FLAGS=" "; fi
153+
source multibuild/travis_steps.sh
154+
# This sets -x
155+
# source travis_multibuild_customize.sh
156+
echo $ENABLE_CONTRIB > contrib.enabled
157+
echo $ENABLE_HEADLESS > headless.enabled
175158
set -x
176-
if [[ $SDIST == 1 ]]; then
177-
echo "skipping tests because of sdist"
178-
rc=0
179-
else
180-
install_run $PLAT && rc=$? || rc=$?
181-
fi
159+
build_wheel $REPO_DIR $PLAT
160+
install_run $PLAT
182161
set +x
183-
#otherwise, Travis logic terminates prematurely
184-
#https://travis-ci.community/t/shell-session-update-command-not-found-in-build-log-causes-build-to-fail-if-trap-err-is-set/817
185-
trap ERR
186-
test "$rc" -eq 0
187162
- name: saving artifacts
188163
uses: actions/upload-artifact@v2
189164
with:
@@ -287,8 +262,12 @@ jobs:
287262
# PYPI repository credentials
288263
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
289264
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
265+
TEST_ENV_VAR: test
290266
run: |
291267
python -m pip install twine
268+
echo ${{ secrets.OPENCV_PYTHON_USERNAME }}
269+
echo ${Env:TWINE_USERNAME}
270+
echo ${Env:TEST_ENV_VAR}
292271
python -m twine upload --repository testpypi -u ${Env:TWINE_USERNAME} -p ${Env:TWINE_PASSWORD} --skip-existing wheelhouse/opencv_*
293272
294273

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.