提交 c4f57d9f 编写于 作者: O Olli-Pekka Heinisuo

add --skip-existing for twine uploads, cleanup, first release

上级 de54fdc8
......@@ -97,4 +97,4 @@ script:
after_success:
# Upload wheels to pypi
- pip install twine
- 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
\ No newline at end of file
- 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
\ No newline at end of file
......@@ -2,14 +2,14 @@
:target: https://ci.appveyor.com/project/skvark/opencv-python
:alt: AppVeyor CI test status (Windows)
.. image:: https://img.shields.io/travis/skvark/opencv-python.svg?maxAge=3600&label="Linux and OS X"
.. image:: https://img.shields.io/travis/skvark/opencv-python.svg?maxAge=3600&label="Linux / OS X"
:target: https://travis-ci.org/skvark/opencv-python
:alt: Travis CI test status (Linux and OS X)
OpenCV on wheels
================
Unofficial OpenCV packages for Python. Work in progress!
Unofficial OpenCV packages for Python.
The aim of this repository is to provide means to package each new
`OpenCV release <https://github.com/opencv/opencv/releases>`__ for the
......@@ -107,20 +107,23 @@ Manylinux wheels
Linux wheels are built using
`manylinux <https://github.com/pypa/python-manylinux-demo>`__. These
wheels should work out of the box for most of the distros out there
since they are built against an old version of glibc.
wheels should work out of the box for most of the distros
(which use GNU C standard library) out there since they are built
against an old version of glibc.
Supported Python versions
-------------------------
Windows:
~~~~~~~~
There's a build time limitation (AppVeyor open source builds may take
max 1 hour) which restricts the supported Python versions to two. As
Python's 2.x releases are slowly approaching legacy state, 2.7.x
releases will be the only supported Python 2 versions on Windows. On
Python 3 side, builds will be run only for the latest release.
max 1 hour) which restricts the supported Python versions to two
(note: the performance is better nowadays, for example py33 and py34
could be added to appveyor.yml). As Python's 2.x releases are slowly
approaching legacy state, 2.7.x releases will be the only supported Python 2
versions on Windows. On Python 3 side, builds will be run only for the latest release.
However, if you wan't to get some other versions, just fork this repo
and change the dependencies.
......
......@@ -109,4 +109,4 @@ artifacts:
deploy_script:
- cd %APPVEYOR_BUILD_FOLDER%
- if "%APPVEYOR_REPO_TAG%"=="true" (python -m twine upload -u %USER% -p %PASS% -r pypitest dist/opencv*) else (echo "Tag not set, deployment skipped.")
- if "%APPVEYOR_REPO_TAG%"=="true" (python -m twine upload -u %USER% -p %PASS% --skip-existing dist/opencv*) else (echo "Tag not set, deployment skipped.")
......@@ -44,8 +44,8 @@ setup(name='opencv-python',
distclass=BinaryDistribution,
packages=['cv2'],
package_data=package_data,
maintainer="Olli-Pekka Heinisuo",
include_package_data=True,
maintainer="Olli-Pekka Heinisuo",
include_package_data=True,
install_requires="numpy==%s" % numpy_version,
classifiers=[
'Development Status :: 5 - Production/Stable',
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册