Commit 70cfdb4b authored by Luke Campagnola's avatar Luke Campagnola
Browse files

PyQtGraph release 0.9.10

parents 8f638776 e8820667
recursive-include pyqtgraph *.py *.ui *.m README *.txt recursive-include pyqtgraph *.py *.ui *.m README.* *.txt
recursive-include tests *.py *.ui
recursive-include examples *.py *.ui *.gz *.cfg recursive-include examples *.py *.ui *.gz *.cfg
recursive-include doc *.rst *.py *.svg *.png *.jpg recursive-include doc *.rst *.py *.svg *.png
recursive-include doc/build/html * recursive-include doc/build/html *
recursive-include tools * recursive-include tools *
include doc/Makefile doc/make.bat README.md LICENSE.txt CHANGELOG include doc/Makefile doc/make.bat README.md LICENSE.txt CHANGELOG
......
...@@ -50,9 +50,9 @@ copyright = '2011, Luke Campagnola' ...@@ -50,9 +50,9 @@ copyright = '2011, Luke Campagnola'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '0.9.9' version = '0.9.10'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '0.9.9' release = '0.9.10'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
......
...@@ -4,7 +4,7 @@ PyQtGraph - Scientific Graphics and GUI Library for Python ...@@ -4,7 +4,7 @@ PyQtGraph - Scientific Graphics and GUI Library for Python
www.pyqtgraph.org www.pyqtgraph.org
""" """
__version__ = '0.9.9' __version__ = '0.9.10'
### import all the goodies and add some helper functions for easy CLI use ### import all the goodies and add some helper functions for easy CLI use
......
...@@ -34,14 +34,17 @@ setupOpts = dict( ...@@ -34,14 +34,17 @@ setupOpts = dict(
) )
from distutils.core import setup
import distutils.dir_util import distutils.dir_util
from distutils.command import build
import os, sys, re import os, sys, re
try: try:
# just avoids warning about install_requires
import setuptools import setuptools
from setuptools import setup
from setuptools.command import install
except ImportError: except ImportError:
pass from distutils.core import setup
from distutils.command import install
path = os.path.split(__file__)[0] path = os.path.split(__file__)[0]
sys.path.insert(0, os.path.join(path, 'tools')) sys.path.insert(0, os.path.join(path, 'tools'))
...@@ -55,9 +58,8 @@ allPackages = (helpers.listAllPackages(pkgroot='pyqtgraph') + ...@@ -55,9 +58,8 @@ allPackages = (helpers.listAllPackages(pkgroot='pyqtgraph') +
version, forcedVersion, gitVersion, initVersion = helpers.getVersionStrings(pkg='pyqtgraph') version, forcedVersion, gitVersion, initVersion = helpers.getVersionStrings(pkg='pyqtgraph')
import distutils.command.build
class Build(distutils.command.build.build): class Build(build.build):
""" """
* Clear build path before building * Clear build path before building
* Set version string in __init__ after building * Set version string in __init__ after building
...@@ -71,7 +73,7 @@ class Build(distutils.command.build.build): ...@@ -71,7 +73,7 @@ class Build(distutils.command.build.build):
if os.path.isdir(buildPath): if os.path.isdir(buildPath):
distutils.dir_util.remove_tree(buildPath) distutils.dir_util.remove_tree(buildPath)
ret = distutils.command.build.build.run(self) ret = build.build.run(self)
# If the version in __init__ is different from the automatically-generated # If the version in __init__ is different from the automatically-generated
# version string, then we will update __init__ in the build directory # version string, then we will update __init__ in the build directory
...@@ -94,9 +96,8 @@ class Build(distutils.command.build.build): ...@@ -94,9 +96,8 @@ class Build(distutils.command.build.build):
sys.excepthook(*sys.exc_info()) sys.excepthook(*sys.exc_info())
return ret return ret
import distutils.command.install
class Install(distutils.command.install.install): class Install(install.install):
""" """
* Check for previously-installed version before installing * Check for previously-installed version before installing
""" """
...@@ -108,7 +109,8 @@ class Install(distutils.command.install.install): ...@@ -108,7 +109,8 @@ class Install(distutils.command.install.install):
"installed at %s; remove this before installing." "installed at %s; remove this before installing."
% (name, path)) % (name, path))
print("Installing to %s" % path) print("Installing to %s" % path)
return distutils.command.install.install.run(self) return install.install.run(self)
setup( setup(
version=version, version=version,
......
...@@ -360,12 +360,9 @@ def getGitVersion(tagPrefix): ...@@ -360,12 +360,9 @@ def getGitVersion(tagPrefix):
# Find last tag matching "tagPrefix.*" # Find last tag matching "tagPrefix.*"
tagNames = check_output(['git', 'tag'], universal_newlines=True).strip().split('\n') tagNames = check_output(['git', 'tag'], universal_newlines=True).strip().split('\n')
while True: tagNames = [x for x in tagNames if re.match(tagPrefix + r'\d+\.\d+\..*', x)]
if len(tagNames) == 0: tagNames.sort(key=lambda s: map(int, s[len(tagPrefix):].split('.')))
raise Exception("Could not determine last tagged version.") lastTagName = tagNames[-1]
lastTagName = tagNames.pop()
if re.match(tagPrefix+r'\d+\.\d+.*', lastTagName):
break
gitVersion = lastTagName.replace(tagPrefix, '') gitVersion = lastTagName.replace(tagPrefix, '')
# is this commit an unchanged checkout of the last tagged version? # is this commit an unchanged checkout of the last tagged version?
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment