summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2015-09-07 07:53:26 -0400
committerNed Batchelder <ned@nedbatchelder.com>2015-09-07 07:53:26 -0400
commitba8edf61e30ce3fc5ce3508fbb86bf9778594a4e (patch)
tree6b17b9e5d00681d9358712f17e7c7e047ca73aca
parente745a5ee076f49d47759539be7eaef88d96435d5 (diff)
downloadpython-coveragepy-git-ba8edf61e30ce3fc5ce3508fbb86bf9778594a4e.tar.gz
Don't try to upload dist/* if dist doesn't exist
-rw-r--r--Makefile2
-rw-r--r--appveyor.yml5
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c54280e1..e6925186 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ pep8:
pep8 --filename=*.py --repeat $(LINTABLE)
test:
- tox -e py27 $(ARGS)
+ tox -e py27,py34 $(ARGS)
metacov:
COVERAGE_COVERAGE=yes tox $(ARGS)
diff --git a/appveyor.yml b/appveyor.yml
index c275f4f8..90df51af 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -115,8 +115,11 @@ install:
- "%CMD_IN_ENV% pip install -r ci/requirements.pip"
build_script:
+ # If not a metacov job, then build wheels and .exe installers.
- if NOT "%COVERAGE_COVERAGE%" == "yes" %CMD_IN_ENV% %PYTHON%\python setup.py bdist_wheel bdist_wininst
- - ps: Get-ChildItem dist\*.* | % { Push-AppveyorArtifact $_.FullName -FileName ('dist\' + $_.Name) }
+
+ # Push everything in dist\ as an artifact.
+ - ps: if ( Test-Path 'dist' -PathType Container ) { Get-ChildItem dist\*.* | % { Push-AppveyorArtifact $_.FullName -FileName ('dist\' + $_.Name) } }
test_script:
- "%CMD_IN_ENV% %PYTHON%\\Scripts\\tox"