save wheels to dist

skvark · skvark · commit 615cca379464 · 2020-07-14T00:10:37.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -647,22 +647,21 @@ jobs:
 before_install: |
     set -e
 
-    # Check out and prepare the source
-    # Multibuild doesn't have releases, so --depth would break eventually (see
-    # https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)
-    git submodule update --init multibuild
-
-    source multibuild/common_utils.sh
+    if [[ $SDIST == 0 ]]; then
+      # Check out and prepare the source
+      # Multibuild doesn't have releases, so --depth would break eventually (see
+      # https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)
+      git submodule update --init multibuild
 
-    # https://github.com/matthew-brett/multibuild/issues/116
-    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export ARCH_FLAGS=" "; fi
+      source multibuild/common_utils.sh
 
-    source multibuild/travis_steps.sh
-    # This sets -x
-    source travis_multibuild_customize.sh
+      # https://github.com/matthew-brett/multibuild/issues/116
+      if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export ARCH_FLAGS=" "; fi
 
-    if [[ $SDIST == 0 ]]; then
+      source multibuild/travis_steps.sh
+      # This sets -x
 
+      source travis_multibuild_customize.sh
       echo $ENABLE_CONTRIB > contrib.enabled
       echo $ENABLE_HEADLESS > headless.enabled
 
@@ -702,12 +701,15 @@ install: |
 
 script: |
     # Install and run tests
-    if [[ $SDIST == 0 ]]; then
-      set -x
+    set -x
+    if [[ $SDIST == 1 ]]; then
+      echo "skipping tests because of sdist"
+    else
       install_run $PLAT && rc=$? || rc=$?
-      set +x
     fi
 
+    set +x
+
     #otherwise, Travis logic terminates prematurely
     #https://travis-ci.community/t/shell-session-update-command-not-found-in-build-log-causes-build-to-fail-if-trap-err-is-set/817
     trap ERR
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" -m pip wheel . --verbose
+    "%PYTHON%/python.exe" -m pip wheel . --verbose --wheel-dir=dist
 
 before_test:
 - ps: |
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
-    pip wheel . --no-build-isolation --verbose $BDIST_PARAMS
+    pip wheel . --no-build-isolation --verbose --wheel-dir=dist $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`		`- pip wheel . --no-build-isolation --verbose $BDIST_PARAMS`
	`17`	`+ pip wheel . --no-build-isolation --verbose --wheel-dir=dist $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`	`}`