multiple fixes

skvark · skvark · commit 55fc534a6776 · 2020-07-13T23:17:34.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -643,7 +643,7 @@ jobs:
 before_install: |
     set -e
 
-    if [ -z "$SDIST" ]; then
+    if [ -n "$SDIST" ]; then
         echo "sdist build"
     else
         # Check out and prepare the source
@@ -687,7 +687,9 @@ install: |
     # Build and package
     set -x
 
-    if [ -z "$SDIST" ]; then
+    if [ -n "$SDIST" ]; then
+        python -m pip install --upgrade pip
+        python -m pip install scikit-build
         python setup.py sdist
     else
         build_wheel $REPO_DIR $PLAT
@@ -699,7 +701,7 @@ script: |
     # Install and run tests
     set -x
 
-    if [ -z "$SDIST" ]; then
+    if [ -n "$SDIST" ]; then
       echo "sdist"
     else
         install_run $PLAT && rc=$? || rc=$?
@@ -753,7 +755,7 @@ after_success: |
           pip install --user twine
           pip install --user --upgrade six
 
-          if [ -z "$SDIST" ]; then
+          if [ -n "$SDIST" ]; then
             twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/dist
           else
             twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
@@ -768,7 +770,7 @@ after_success: |
           /usr/bin/python -m pip install --user -U pip
           /usr/bin/python -m pip install --user -U -I twine
 
-          if [ -z "$SDIST" ]; then
+          if [ -n "$SDIST" ]; then
             /usr/bin/python -m upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/dist
           else
             /usr/bin/python -m upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*
@@ -788,7 +790,7 @@ after_success: |
 
     az storage container create -n ${TRAVIS_COMMIT} --public-access blob
 
-    if [ -z "$SDIST" ]; then
+    if [ -n "$SDIST" ]; then
       az storage blob upload-batch -d ${TRAVIS_COMMIT} -s ${TRAVIS_BUILD_DIR}/dist --pattern *.gz
     else
       az storage blob upload-batch -d ${TRAVIS_COMMIT} -s ${TRAVIS_BUILD_DIR}/wheelhouse --pattern *.whl
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,6 +3,7 @@ include LICENSE.txt
 include README.md
 include find_version.py
 include setup.py
+include pyproject.toml
 recursive-include cv2 *
 recursive-include docker *
 recursive-include opencv *
diff --git a/appveyor.yml b/appveyor.yml
@@ -141,7 +141,7 @@ build_script:
 - cmd: |
     "%PYTHON%/python.exe" -m pip install --upgrade pip
     "%PYTHON%/python.exe" -m pip install --upgrade setuptools
-    "%PYTHON%/python.exe" setup.py bdist_wheel
+    "%PYTHON%/python.exe" -m pip wheel . --no-build-isolation --verbose
 
 before_test:
 - ps: |
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,2 +1,8 @@
 [build-system]
-requires = ["setuptools", "wheel", "scikit-build", "cmake"]
+requires = [
+  "setuptools", "wheel", "scikit-build", "cmake", "pip",
+  "numpy==1.11.3; python_version=='3.5'",
+  "numpy==1.13.3; python_version=='3.6'",
+  "numpy==1.14.5; python_version=='3.7'",
+  "numpy==1.17.3; python_version>='3.8'"
+]
diff --git a/setup.py b/setup.py
@@ -15,13 +15,13 @@ def main():
 
     # These are needed for source fetching
     cmake_source_dir = "opencv"
-    minimum_supported_numpy = "1.11.1"
+    minimum_supported_numpy = "1.13.1"
     build_contrib = get_build_env_var_by_name("contrib")
     # headless flag to skip GUI deps if needed
     build_headless = get_build_env_var_by_name("headless")
 
     if sys.version_info[:2] >= (3, 6):
-        minimum_supported_numpy = "1.11.3"
+        minimum_supported_numpy = "1.13.3"
     if sys.version_info[:2] >= (3, 7):
         minimum_supported_numpy = "1.14.5"
     if sys.version_info[:2] >= (3, 8):
@@ -176,7 +176,6 @@ def main():
         packages=packages,
         package_data=package_data,
         maintainer="Olli-Pekka Heinisuo",
-        include_package_data=True,
         ext_modules=EmptyListWithLength(),
         install_requires=numpy_version,
         classifiers=[
diff --git a/travis_config.sh b/travis_config.sh
@@ -14,7 +14,7 @@ function bdist_wheel_cmd {
     # copied from multibuild's common_utils.sh
     # add osx deployment target so it doesnt default to 10.6
     local abs_wheelhouse=$1
-    python setup.py bdist_wheel $BDIST_PARAMS
+    pip wheel . --no-build-isolation --verbose $BDIST_PARAMS
     cp dist/*.whl $abs_wheelhouse
     if [ -n "$USE_CCACHE" -a -z "$BREW_BOOTSTRAP_MODE" ]; then ccache -s; fi
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ function bdist_wheel_cmd {`
`14`	`14`	`# copied from multibuild's common_utils.sh`
`15`	`15`	`# add osx deployment target so it doesnt default to 10.6`
`16`	`16`	`local abs_wheelhouse=$1`
`17`		`- python setup.py bdist_wheel $BDIST_PARAMS`
	`17`	`+ pip wheel . --no-build-isolation --verbose $BDIST_PARAMS`
`18`	`18`	`cp dist/*.whl $abs_wheelhouse`
`19`	`19`	`if [ -n "$USE_CCACHE" -a -z "$BREW_BOOTSTRAP_MODE" ]; then ccache -s; fi`
`20`	`20`	`}`