Skip to content

Commit c4f57d9

Browse files
committed
add --skip-existing for twine uploads, cleanup, first release
1 parent de54fdc commit c4f57d9

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,4 @@ script:
9797
after_success:
9898
# Upload wheels to pypi
9999
- pip install twine
100-
- if [ -n "$TRAVIS_TAG" ]; then twine upload -u ${USER} -p ${PASS} -r pypitest ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*; else echo "Tag not set, deployment skipped."; fi
100+
- if [ -n "$TRAVIS_TAG" ]; then twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*; else echo "Tag not set, deployment skipped."; fi

README.rst

+11-8
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
:target: https://ci.appveyor.com/project/skvark/opencv-python
33
:alt: AppVeyor CI test status (Windows)
44

5-
.. image:: https://img.shields.io/travis/skvark/opencv-python.svg?maxAge=3600&label="Linux and OS X"
5+
.. image:: https://img.shields.io/travis/skvark/opencv-python.svg?maxAge=3600&label="Linux / OS X"
66
:target: https://travis-ci.org/skvark/opencv-python
77
:alt: Travis CI test status (Linux and OS X)
88

99
OpenCV on wheels
1010
================
1111

12-
Unofficial OpenCV packages for Python. Work in progress!
12+
Unofficial OpenCV packages for Python.
1313

1414
The aim of this repository is to provide means to package each new
1515
`OpenCV release <https://github.com/opencv/opencv/releases>`__ for the
@@ -107,20 +107,23 @@ Manylinux wheels
107107

108108
Linux wheels are built using
109109
`manylinux <https://github.com/pypa/python-manylinux-demo>`__. These
110-
wheels should work out of the box for most of the distros out there
111-
since they are built against an old version of glibc.
110+
wheels should work out of the box for most of the distros
111+
(which use GNU C standard library) out there since they are built
112+
against an old version of glibc.
112113

113114
Supported Python versions
114115
-------------------------
115116

117+
116118
Windows:
117119
~~~~~~~~
118120

119121
There's a build time limitation (AppVeyor open source builds may take
120-
max 1 hour) which restricts the supported Python versions to two. As
121-
Python's 2.x releases are slowly approaching legacy state, 2.7.x
122-
releases will be the only supported Python 2 versions on Windows. On
123-
Python 3 side, builds will be run only for the latest release.
122+
max 1 hour) which restricts the supported Python versions to two
123+
(note: the performance is better nowadays, for example py33 and py34
124+
could be added to appveyor.yml). As Python's 2.x releases are slowly
125+
approaching legacy state, 2.7.x releases will be the only supported Python 2
126+
versions on Windows. On Python 3 side, builds will be run only for the latest release.
124127

125128
However, if you wan't to get some other versions, just fork this repo
126129
and change the dependencies.

appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,4 @@ artifacts:
109109

110110
deploy_script:
111111
- cd %APPVEYOR_BUILD_FOLDER%
112-
- if "%APPVEYOR_REPO_TAG%"=="true" (python -m twine upload -u %USER% -p %PASS% -r pypitest dist/opencv*) else (echo "Tag not set, deployment skipped.")
112+
- if "%APPVEYOR_REPO_TAG%"=="true" (python -m twine upload -u %USER% -p %PASS% --skip-existing dist/opencv*) else (echo "Tag not set, deployment skipped.")

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ def is_pure(self):
4444
distclass=BinaryDistribution,
4545
packages=['cv2'],
4646
package_data=package_data,
47-
maintainer="Olli-Pekka Heinisuo",
48-
include_package_data=True,
47+
maintainer="Olli-Pekka Heinisuo",
48+
include_package_data=True,
4949
install_requires="numpy==%s" % numpy_version,
5050
classifiers=[
5151
'Development Status :: 5 - Production/Stable',

0 commit comments

Comments
 (0)