Skip to content

Commit

Permalink
About to release v0.6.12
Browse files Browse the repository at this point in the history
  • Loading branch information
bjodah committed Oct 17, 2018
1 parent c927fba commit d25c8f0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
4 changes: 4 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ v0.7.1
======
- Updated requirements on upstream packages

v0.6.12
=======
- Fixed bug with quantities.constants when used with Arrhenius class

v0.6.11
=======
- Fixed an issue with PuLP under FreeBSD (gh-109)
Expand Down
13 changes: 3 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,6 @@

RELEASE_VERSION = os.environ.get('%s_RELEASE_VERSION' % pkg_name.upper(), '') # v*

# http://conda.pydata.org/docs/build.html#environment-variables-set-during-the-build-process
if os.environ.get('CONDA_BUILD', '0') == '1':
try:
RELEASE_VERSION = 'v' + io.open(
'__conda_version__.txt', 'rt', encoding='utf-8'
).readline().rstrip()
except IOError:
pass


def _path_under_setup(*args):
return os.path.join(os.path.dirname(__file__), *args)
Expand All @@ -52,7 +43,9 @@ def _path_under_setup(*args):
else:
if 'develop' not in sys.argv:
warnings.warn("Using git to derive version: dev-branches may compete.")
__version__ = re.sub('v([0-9.]+)-(\d+)-(\w+)', r'\1.post\2+\3', _git_version) # .dev < '' < .post
_ver_tmplt = r'\1.post\2' if os.environ.get('CONDA_BUILD', '0') == '1' else r'\1.post\2+\3'
__version__ = re.sub('v([0-9.]+)-(\d+)-(\S+)', _ver_tmplt, _git_version) # .dev < '' < .post


submodules = [
'chempy.electrochemistry',
Expand Down

0 comments on commit d25c8f0

Please sign in to comment.