Skip to content

Commit ad06688

Browse files
GArikGArik
committed
Test deployment to PyPI
1 parent 3359907 commit ad06688

File tree

4 files changed

+26
-27
lines changed

4 files changed

+26
-27
lines changed

‎.travis.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -964,26 +964,26 @@ after_success: |
964964
965965
if [[ $ENABLE_CONTRIB == 0 ]]; then
966966
if [[ $ENABLE_HEADLESS == 0 ]]; then
967-
echo "This is default build. Deployment will be done to to PyPI entry opencv-python."
967+
echo "This is default build. Deployment will be done to PyPI entry opencv-python."
968968
else
969-
echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-python-headless."
969+
echo "This is headless contrib build. Deployment will be done to PyPI entry opencv-python-headless."
970970
fi
971971
else
972972
if [[ $ENABLE_HEADLESS == 0 ]]; then
973-
echo "This is contrib build. Deployment will be done to to PyPI entry opencv-contrib-python."
973+
echo "This is contrib build. Deployment will be done to PyPI entry opencv-contrib-python."
974974
else
975-
echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-contrib-python-headless."
975+
echo "This is headless contrib build. Deployment will be done to PyPI entry opencv-contrib-python-headless."
976976
fi
977977
fi
978978
979979
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
980980
if [[ $SDIST == 1 ]]; then
981981
pip install twine
982-
twine upload -u ${PYPI_USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/dist/opencv*
982+
twine upload -u ${PYPI_USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/dist/openc*
983983
else
984984
pip install --user twine
985985
pip install --user --upgrade six
986-
twine upload -u ${PYPI_USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
986+
twine upload -u ${PYPI_USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/openc*
987987
fi
988988
989989
fi
@@ -996,9 +996,9 @@ after_success: |
996996
/usr/bin/python -m pip install --user -U -I twine
997997
998998
if [[ $SDIST == 1 ]]; then
999-
/usr/bin/python -m twine upload -u ${PYPI_USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/dist/opencv*
999+
/usr/bin/python -m twine upload -u ${PYPI_USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/dist/openc*
10001000
else
1001-
/usr/bin/python -m twine upload -u ${PYPI_USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
1001+
/usr/bin/python -m twine upload -u ${PYPI_USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/openc*
10021002
fi
10031003
10041004
fi
@@ -1019,7 +1019,7 @@ after_success: |
10191019
if [[ $SDIST == 1 ]]; then
10201020
az storage blob upload-batch -d ${TRAVIS_COMMIT} -s ${TRAVIS_BUILD_DIR}/dist --pattern *.gz
10211021
else
1022-
az storage blob upload-batch -d ${TRAVIS_COMMIT} -s ${TRAVIS_BUILD_DIR}/wheelhouse --pattern opencv*.whl
1022+
az storage blob upload-batch -d ${TRAVIS_COMMIT} -s ${TRAVIS_BUILD_DIR}/wheelhouse --pattern openc*.whl
10231023
fi
10241024
fi
10251025

‎appveyor.yml

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
environment:
22
USER:
3-
secure: fXgF9uyy6sT0JoVOR7BoqA==
4-
3+
secure: faDqtT21igTqQlsKgq9+UA==
54
PASS:
6-
secure: 0bXSOVjf9x8L7nErTivu92TF1FwNosTjFJQPmxp8Dys=
5+
secure: LARTd04b3VIW+7ADTEP7Lw==
76

87
matrix:
98
- PYTHON: "C:\\Python36"
@@ -158,7 +157,7 @@ before_test:
158157
159158
cd ${Env:APPVEYOR_BUILD_FOLDER}\tests
160159
$env:PYTHONWARNINGS = "ignore:::pip._internal.cli.base_command"
161-
&"${Env:PYTHON}\\python.exe" -m pip install --user --no-warn-script-location (ls "../dist/opencv_*.whl")
160+
&"${Env:PYTHON}\\python.exe" -m pip install --user --no-warn-script-location (ls "../dist/opencovis_*.whl")
162161
if ($LastExitCode -ne 0) {throw $LastExitCode}
163162
164163
test_script:
@@ -168,7 +167,7 @@ test_script:
168167
"%PYTHON%\\python.exe" -m unittest test
169168
170169
artifacts:
171-
- path: dist\opencv*.whl
170+
- path: dist\opencovis*.whl
172171
name: wheels
173172

174173
deploy_script:
@@ -194,7 +193,7 @@ deploy_script:
194193
}
195194
196195
&"${Env:PYTHON}\\python.exe" -m pip install twine
197-
&"${Env:PYTHON}\\python.exe" -m twine upload -u ${Env:USER} -p ${Env:PASS} --skip-existing dist/opencv*
196+
&"${Env:PYTHON}\\python.exe" -m twine upload -u ${Env:USER} -p ${Env:PASS} --skip-existing dist/opencovis*
198197
}
199198
else {
200199
echo "Tag not set, deployment skipped."

‎setup-osx.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@ def main():
4545
build_contrib = version["contrib"]
4646
build_headless = version["headless"]
4747

48-
package_name = "opencv-python"
48+
package_name = "opencovis-python"
4949

5050
if build_contrib and not build_headless:
51-
package_name = "opencv-contrib-python"
51+
package_name = "opencovis-contrib-python"
5252

5353
if build_contrib and build_headless:
54-
package_name = "opencv-contrib-python-headless"
54+
package_name = "opencovis-contrib-python-headless"
5555

5656
if build_headless and not build_contrib:
57-
package_name = "opencv-python-headless"
57+
package_name = "opencovis-python-headless"
5858

5959
long_description = io.open("README.md", encoding="utf-8").read()
6060

@@ -70,15 +70,15 @@ def main():
7070
setuptools.setup(
7171
name=package_name,
7272
version=package_version,
73-
url="https://github.com/skvark/opencv-python",
73+
url="https://github.com/GArik/opencv-python",
7474
license="MIT",
7575
description="Wrapper package for OpenCV python bindings.",
7676
long_description=long_description,
7777
long_description_content_type="text/markdown",
7878
packages=packages,
7979
package_data=package_data,
8080
include_package_data=True,
81-
maintainer="Olli-Pekka Heinisuo",
81+
maintainer="Igor Murzov",
8282
ext_modules=EmptyListWithLength(),
8383
install_requires=numpy_version,
8484
python_requires=">=3.6",

‎setup.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,16 @@ def main():
6767
# https://stackoverflow.com/questions/1405913/python-32bit-or-64bit-mode
6868
x64 = sys.maxsize > 2 ** 32
6969

70-
package_name = "opencv-python"
70+
package_name = "opencovis-python"
7171

7272
if build_contrib and not build_headless:
73-
package_name = "opencv-contrib-python"
73+
package_name = "opencovis-contrib-python"
7474

7575
if build_contrib and build_headless:
76-
package_name = "opencv-contrib-python-headless"
76+
package_name = "opencovis-contrib-python-headless"
7777

7878
if build_headless and not build_contrib:
79-
package_name = "opencv-python-headless"
79+
package_name = "opencovis-python-headless"
8080

8181
long_description = io.open("README.md", encoding="utf-8").read()
8282

@@ -217,14 +217,14 @@ def main():
217217
skbuild.setup(
218218
name=package_name,
219219
version=package_version,
220-
url="https://github.com/skvark/opencv-python",
220+
url="https://github.com/GArik/opencv-python",
221221
license="MIT",
222222
description="Wrapper package for OpenCV python bindings.",
223223
long_description=long_description,
224224
long_description_content_type="text/markdown",
225225
packages=packages,
226226
package_data=package_data,
227-
maintainer="Olli-Pekka Heinisuo",
227+
maintainer="Igor Murzov",
228228
ext_modules=EmptyListWithLength(),
229229
install_requires=numpy_version,
230230
python_requires=">=3.6",

0 commit comments

Comments
 (0)