提交 bca59922 authored 作者: Frédéric Bastien's avatar Frédéric Bastien 提交者: GitHub

Merge pull request #6453 from abergeron/fix_version

Make setup.py fallback when versioneer can't get the version.
...@@ -37,6 +37,8 @@ Update the year in the ``Theano/LICENSE.txt`` file too, if necessary. ...@@ -37,6 +37,8 @@ Update the year in the ``Theano/LICENSE.txt`` file too, if necessary.
``NEWS.txt`` usually contains the name and date of the release, change them ``NEWS.txt`` usually contains the name and date of the release, change them
too. too.
Update the fallback version in ``setup.py``.
Update the code and the documentation for the theano flags Update the code and the documentation for the theano flags
``warn.ignore_bug_before`` to accept the new version. You must modify the ``warn.ignore_bug_before`` to accept the new version. You must modify the
file ``theano/configdefaults.py`` and ``doc/library/config.txt``. file ``theano/configdefaults.py`` and ``doc/library/config.txt``.
...@@ -48,7 +50,7 @@ You will need to commit the previous changes, tag the resulting version, and ...@@ -48,7 +50,7 @@ You will need to commit the previous changes, tag the resulting version, and
push that into the original repository. The syntax is something like the push that into the original repository. The syntax is something like the
following:: following::
git commit -m "Modifications for 0.X.Y release" doc/conf.py NEWS.txt HISTORY.txt theano/configdefaults.py doc/library/config.txt git commit -m "Modifications for 0.X.Y release" setup.py doc/conf.py NEWS.txt HISTORY.txt theano/configdefaults.py doc/library/config.txt
git tag -a rel-0.X.Y git tag -a rel-0.X.Y
git push git push
git push --tags git push --tags
......
...@@ -16,6 +16,7 @@ except ImportError: ...@@ -16,6 +16,7 @@ except ImportError:
import versioneer import versioneer
FALLBACK_VERSION="0.10.0beta3+unknown"
CLASSIFIERS = """\ CLASSIFIERS = """\
Development Status :: 4 - Beta Development Status :: 4 - Beta
...@@ -70,9 +71,15 @@ def find_packages(where='.', exclude=()): ...@@ -70,9 +71,15 @@ def find_packages(where='.', exclude=()):
return out return out
version_data = versioneer.get_versions()
if version_data['error'] is not None:
version_data['version'] = FALLBACK_VERSION
def do_setup(): def do_setup():
setup(name=NAME, setup(name=NAME,
version=versioneer.get_version(), version=version_data['version'],
description=DESCRIPTION, description=DESCRIPTION,
long_description=LONG_DESCRIPTION, long_description=LONG_DESCRIPTION,
classifiers=CLASSIFIERS, classifiers=CLASSIFIERS,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论