Skip to content

Commit fafdd77

Browse files
authored
Merge pull request #128 from xylar/update_to_0.1.6
Update to version 0.1.6
2 parents 687c5ca + 1d0e7d8 commit fafdd77

File tree

4 files changed

+11
-75
lines changed

4 files changed

+11
-75
lines changed

conda/meta.yaml

Lines changed: 0 additions & 71 deletions
This file was deleted.

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666
# built documents.
6767
#
6868
# The short X.Y version.
69-
version = u'0.1.5'
69+
version = geometric_features.__version__
7070
# The full version, including alpha/beta/rc tags.
71-
release = u'0.1.5'
71+
release = geometric_features.__version__
7272

7373
# The language for content autogenerated by Sphinx. Refer to documentation
7474
# for a list of supported languages.

geometric_features/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
from geometric_features.feature_collection import FeatureCollection, \
77
read_feature_collection
88

9-
__version_info__ = (0, 1, 5)
9+
__version_info__ = (0, 1, 6)
1010
__version__ = '.'.join(str(vi) for vi in __version_info__)

setup.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
#!/usr/bin/env python
22

3+
import os
4+
import re
35
from setuptools import setup, find_packages
46

5-
version = '0.1.5'
7+
here = os.path.abspath(os.path.dirname(__file__))
8+
with open(os.path.join(here, 'geometric_features', '__init__.py')) as f:
9+
init_file = f.read()
10+
11+
version = re.search(r'{}\s*=\s*[(]([^)]*)[)]'.format('__version_info__'),
12+
init_file).group(1).replace(', ', '.')
613

714
setup(name='geometric_features',
815
version=version,

0 commit comments

Comments
 (0)