Merge branch 'issue127' into devel
This commit is contained in:
commit
7aec21f49c
3 changed files with 12 additions and 2 deletions
|
|
@ -14,6 +14,8 @@ before_install:
|
||||||
install: "pip install -r travis-requirements.txt --use-mirrors"
|
install: "pip install -r travis-requirements.txt --use-mirrors"
|
||||||
|
|
||||||
# command to run tests
|
# command to run tests
|
||||||
|
# 2.7 should skip no more than 342 tests
|
||||||
|
# 3.3 should skip no more than 339 tests
|
||||||
script: "python -m unittest discover"
|
script: "python -m unittest discover"
|
||||||
|
|
||||||
notifications:
|
notifications:
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,8 @@ from distutils.version import LooseVersion
|
||||||
from .lib import openjpeg as opj
|
from .lib import openjpeg as opj
|
||||||
from .lib import openjp2 as opj2
|
from .lib import openjp2 as opj2
|
||||||
|
|
||||||
|
# Do not change the format of this next line! Doing so risks breaking
|
||||||
|
# setup.py
|
||||||
version = "0.5.4"
|
version = "0.5.4"
|
||||||
_sv = LooseVersion(version)
|
_sv = LooseVersion(version)
|
||||||
version_tuple = _sv.version
|
version_tuple = _sv.version
|
||||||
|
|
|
||||||
10
setup.py
10
setup.py
|
|
@ -1,4 +1,6 @@
|
||||||
from setuptools import setup, find_packages
|
from setuptools import setup, find_packages
|
||||||
|
import os
|
||||||
|
import re
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
kwargs = {'name': 'Glymur',
|
kwargs = {'name': 'Glymur',
|
||||||
|
|
@ -38,7 +40,11 @@ clssfrs = ["Programming Language :: Python",
|
||||||
"Topic :: Software Development :: Libraries :: Python Modules"]
|
"Topic :: Software Development :: Libraries :: Python Modules"]
|
||||||
kwargs['classifiers'] = clssfrs
|
kwargs['classifiers'] = clssfrs
|
||||||
|
|
||||||
import glymur
|
# Get the version string. Cannot do this by importing glymur!
|
||||||
kwargs['version'] = glymur.version.version
|
version_file = os.path.join('glymur', 'version.py')
|
||||||
|
with open('glymur/version.py', 'rt') as fptr:
|
||||||
|
contents = fptr.read()
|
||||||
|
match = re.search('version\s*=\s*"(?P<version>\d*.\d*.\d*.*)"\n', contents)
|
||||||
|
kwargs['version'] = match.group('version')
|
||||||
|
|
||||||
setup(**kwargs)
|
setup(**kwargs)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue