cleanup, script seems to be working

tools/release/REAME.md

@@ -1,25 +1,23 @@
 PyQtGraph Release Procedure
 ---------------------------
 
-0. Create your release_config.py based on release_config.example.py
-
 1. Create a release-x.x.x branch
 
-2. Run build-release script
-    - creates clone of master from github
+2. Run build-pg-release script
+    - creates clone of master
     - merges release branch into master
     - updates version numbers in code
     - creates pyqtgraph-x.x.x tag
     - creates release commit
     - builds source dist
+    - test pip install
     - builds windows dists
     - builds deb dist
 
 3. test build files
     - test setup.py, pip on OSX
-    - test 32/64 exe on windows
-    - deb on linux (py2, py3)
-    - source install on linux (py2, py3)
+    - test setup.py, pip, 32/64 exe on windows
+    - test setup.py, pip, deb on linux (py2, py3)
     
 4. Run upload-release script
     - pip upload
@@ -30,5 +28,4 @@ PyQtGraph Release Procedure
     - update website
     - mailing list announcement
     - new conda recipe  (http://conda.pydata.org/docs/build.html)
-    - contact deb maintainer
-    - other package maintainers?
+    - contact various package maintainers

tools/release/build-pg-release.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 import os, sys, argparse, random
-from common import shell, ssh
+from shell import shell, ssh
 
 
 
@@ -51,6 +51,8 @@ ap.add_argument('--win-host', metavar='', help='user@hostname to build .exe inst
 ap.add_argument('--self-host', metavar='', help='user@hostname for Windows server to access localhost (for git clone).', default=None)
 
 args = ap.parse_args()
+args.build_dir = os.path.abspath(args.build_dir)
+args.pkg_dir = os.path.abspath(args.pkg_dir)
 
 if os.path.exists(args.build_dir):
     sys.stderr.write("Please remove the build directory %s before proceeding, or specify a different path with --build-dir.\n" % args.build_dir)
@@ -140,7 +142,7 @@ else:
 if 'linux' in sys.platform and not args.no_deb: 
     shell('''
         # build deb packages
-        cd {bld}
+        cd {bld}/pyqtgraph
         python setup.py --command-packages=stdeb.command sdist_dsc
         cd deb_dist/pyqtgraph-{ver}
         sed -i "s/^Depends:.*/Depends: python (>= 2.6), python-qt4 | python-pyside, python-numpy/" debian/control    
@@ -157,7 +159,7 @@ else:
 
 # build windows installers locally if possible, otherwise try configured windows server
 vars['winpath'] = None
-if (sys.platform == 'win32' or winhost is not None) and not args.no_exe:
+if (sys.platform == 'win32' or args.win_host is not None) and not args.no_exe:
     shell("# Build windows executables")
     if sys.platform == 'win32':
         shell("""
@@ -169,7 +171,7 @@ if (sys.platform == 'win32' or winhost is not None) and not args.no_exe:
         vars['exe_status'] = 'built'
     else:
         vars['winpath'] = 'pyqtgraph-build_%x' % random.randint(0, 1e12)
-        ssh(winhost, '''
+        ssh(args.win_host, '''
             git clone {self}:{bld}/pyqtgraph {winpath}
             cd {winpath}
             python setup.py build --plat-name=win32 bdist_wininst

tools/release/release_config.example.py

@@ -1,18 +0,0 @@
-"""
-Example configuration file required by build-pg-release and upload-pg-release.
-
-Copy this file to release_config.py and edit.
-"""
-
-# Where to find the repository from which the release files will be built.
-# This repository must have a branch called release-x.y.z
-sourcedir = '/home/user/pyqtgraph'
-
-# Where to generate build files--source packages, deb packages, .exe installers, etc.
-builddir = '/home/user/pyqtgraph-build'
-
-# Where to archive build files (optional)
-archivedir = builddir + '/archive'
-
-# A windows machine (typically a VM) running an SSH server for automatically building .exe installers
-winhost = 'luke@192.168.56.101'

tools/release/shell.py

@@ -1,4 +1,4 @@
-import os
+import os, sys
 import subprocess as sp