Mercurial > piecrust2

changeset 676:a04288f199a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cm: Don't always generation the version when running `setuptools`.
author Ludovic Chabant <ludovic@chabant.com>
date Sun, 06 Mar 2016 23:51:20 -0800
parents 3df808b133f8
children a9b13c848b20
files garcon/pypi.py setup.py
diffstat 2 files changed, 6 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/garcon/pypi.py	Sun Mar 06 23:49:41 2016 -0800
+++ b/garcon/pypi.py	Sun Mar 06 23:51:20 2016 -0800
@@ -25,5 +25,6 @@
         run("hg tag %s" % version)
 
         # PyPi upload.
+        run("python setup.py version")
         run("python setup.py sdist upload")
 
--- a/setup.py	Sun Mar 06 23:49:41 2016 -0800
+++ b/setup.py	Sun Mar 06 23:51:20 2016 -0800
@@ -137,21 +137,12 @@
     f.close()
 
 
-# Always try to generate an up to date version.
-# Otherwise, fall back on an (hopefully) existing version file.
 try:
-    version = generate_version()
-    write_version(version)
-except:
-    version = None
-
-if version is None:
-    try:
-        from piecrust.__version__ import APP_VERSION
-        version = APP_VERSION
-    except ImportError:
-        raise Exception("Can't get version from either a version file or "
-                        "from the repository.")
+    from piecrust.__version__ import APP_VERSION
+    version = APP_VERSION
+except ImportError:
+    raise Exception("Can't get version from either a version file or "
+                    "from the repository.")
 
 
 install_requires = read('requirements.txt').splitlines()