summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2017-11-11 22:41:37 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2017-11-11 22:41:37 +0100
commit53fb242fbb7025ac892abf615b3bdf5acc5a6156 (patch)
treea50bfae90e891736e138f8d5110cdeca7669563d
parent500b80bcf7deb77ceeaa9165fa538e0f7ad134c8 (diff)
downloadpsutil-53fb242fbb7025ac892abf615b3bdf5acc5a6156.tar.gz
change make cmds
-rw-r--r--.travis.yml2
-rw-r--r--Makefile12
2 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 10ddd73d..9289eb6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ matrix:
env: PYVER=py27
- language: generic
os: osx
- env: PYVER=py36
+ env: PYVER=py34
install:
- ./.ci/travis/install.sh
script:
diff --git a/Makefile b/Makefile
index a3fef692..f3d0275c 100644
--- a/Makefile
+++ b/Makefile
@@ -191,21 +191,21 @@ install-git-hooks: ## Install GIT pre-commit hook.
# Distribution
# ===================================================================
-sdist: ## Generate tar.gz source distribution.
+dist-source: ## Generate tar.gz source distribution.
${MAKE} generate-manifest
$(PYTHON) setup.py sdist
-upload-src: ## Upload source tarball on https://pypi.python.org/pypi/psutil.
+dist-upload-src: ## Upload source tarball on https://pypi.python.org/pypi/psutil.
${MAKE} sdist
$(PYTHON) setup.py sdist upload
-win-download-exes: ## Download exes/wheels hosted on appveyor.
+dist-download-win-wheels: ## Download wheels hosted on appveyor.
$(TEST_PREFIX) $(PYTHON) scripts/internal/download_exes.py --user giampaolo --project psutil
-win-upload-exes: ## Upload wheels in dist/* directory on PYPI.
+dist-upload-win-wheels: ## Upload wheels in dist/* directory on PYPI.
$(PYTHON) -m twine upload dist/*.whl
-pre-release: ## Check if we're ready to produce a new release.
+dist-pre-release: ## Check if we're ready to produce a new release.
${MAKE} install
$(PYTHON) -c \
"from psutil import __version__ as ver; \
@@ -220,7 +220,7 @@ pre-release: ## Check if we're ready to produce a new release.
${MAKE} win-download-exes
${MAKE} sdist
-release: ## Create a release (down/uploads tar.gz, wheels, git tag release).
+dist-release: ## Create a release (down/uploads tar.gz, wheels, git tag release).
${MAKE} pre-release
$(PYTHON) -m twine upload dist/* # upload tar.gz and Windows wheels on PYPI
${MAKE} git-tag-release