From 09725dcb556dfeaf1ae6500ffc02f26351939ce5 Mon Sep 17 00:00:00 2001 From: Luke Campagnola Date: Mon, 7 Nov 2016 17:57:23 -0800 Subject: [PATCH] Fixes to --publish option in pg-release script --- tools/pg-release.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/pg-release.py b/tools/pg-release.py index ac32b199..bc05f638 100644 --- a/tools/pg-release.py +++ b/tools/pg-release.py @@ -77,7 +77,7 @@ def build(args): mkdir -p {build_dir} cd {build_dir} rm -rf pyqtgraph - git clone --depth 1 -b master {source_repo} pyqtgraph + git clone --depth 1 --branch master --single-branch {source_repo} pyqtgraph cd pyqtgraph git checkout -b release-{version} git pull {source_repo} release-{version} @@ -202,15 +202,19 @@ def publish(args): ### Upload everything to server shell(""" - # Uploading documentation.. cd {build_dir}/pyqtgraph - rsync -rv doc/build/* pyqtgraph.org:/www/code/pyqtgraph/pyqtgraph/documentation/build/ + + # Uploading documentation.. (disabled; now hosted by readthedocs.io) + #rsync -rv doc/build/* pyqtgraph.org:/www/code/pyqtgraph/pyqtgraph/documentation/build/ # Uploading release packages to website - rsync -v {pkg_dir}/{version} pyqtgraph.org:/www/code/pyqtgraph/downloads/ + rsync -v {pkg_dir} pyqtgraph.org:/www/code/pyqtgraph/downloads/ - # Push to github - git push --tags https://github.com/pyqtgraph/pyqtgraph master:master + # Push master to github + git push https://github.com/pyqtgraph/pyqtgraph master:master + + # Push tag to github + git push https://github.com/pyqtgraph/pyqtgraph pyqtgraph-{version} # Upload to pypi.. python setup.py sdist upload