Merge pull request #413 from campagnola/pg-release-fixes

Fixes to --publish option in pg-release script
This commit is contained in:
Luke Campagnola 2016-12-14 10:49:36 -08:00 committed by GitHub
commit 183ca1f5d2

View File

@ -77,7 +77,7 @@ def build(args):
mkdir -p {build_dir} mkdir -p {build_dir}
cd {build_dir} cd {build_dir}
rm -rf pyqtgraph 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 cd pyqtgraph
git checkout -b release-{version} git checkout -b release-{version}
git pull {source_repo} release-{version} git pull {source_repo} release-{version}
@ -202,15 +202,19 @@ def publish(args):
### Upload everything to server ### Upload everything to server
shell(""" shell("""
# Uploading documentation..
cd {build_dir}/pyqtgraph 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 # 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 # Push master to github
git push --tags https://github.com/pyqtgraph/pyqtgraph master:master 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.. # Upload to pypi..
python setup.py sdist upload python setup.py sdist upload