Remove darcs from setup.py, remove darcsver egg. Closes #1908.

[tahoe-lafs/tahoe-lafs.git] / setup.py

diff --git a/setup.py b/setup.py
index 3501777080d425f7df57cb81e4b784361e0cf557..e78f2a4824e181c008374a523f5bfa9a60c2a3f1 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -72,8 +72,6 @@ __requires__ = install_requires[:]
 
 egg = os.path.realpath(glob.glob('setuptools-*.egg')[0])
 sys.path.insert(0, egg)
-egg = os.path.realpath(glob.glob('darcsver-*.egg')[0])
-sys.path.insert(0, egg)
 import setuptools; setuptools.bootstrap_install_from = egg
 
 from setuptools import setup
@@ -120,20 +118,6 @@ trove_classifiers=[
 
 setup_requires = []
 
-# The darcsver command from the darcsver plugin is needed to initialize the
-# distribution's .version attribute correctly. (It does this either by
-# examining darcs history, or if that fails by reading the
-# src/allmydata/_version.py file). darcsver will also write a new version
-# stamp in src/allmydata/_version.py, with a version number derived from
-# darcs history. Note that the setup.cfg file has an "[aliases]" section
-# which enumerates commands that you might run and specifies that it will run
-# darcsver before each one. If you add different commands (or if I forgot
-# some that are already in use), you may need to add it to setup.cfg and
-# configure it to run darcsver before your command, if you want the version
-# number to be correct when that command runs.
-# http://pypi.python.org/pypi/darcsver
-setup_requires.append('darcsver >= 1.7.2')
-
 # Nevow imports itself when building, which causes Twisted and zope.interface
 # to be imported. We need to make sure that the versions of Twisted and
 # zope.interface used at build time satisfy Nevow's requirements. If not
@@ -256,15 +240,6 @@ class MakeExecutable(Command):
                 raise
 
 
-DARCS_VERSION_BODY = '''
-# This _version.py is generated from darcs metadata by the tahoe setup.py
-# and the "darcsver" package.
-
-__pkgname__ = "%(pkgname)s"
-verstr = "%(pkgversion)s"
-__version__ = verstr
-'''
-
 GIT_VERSION_BODY = '''
 # This _version.py is generated from git metadata by the tahoe setup.py.
 
@@ -343,6 +318,11 @@ def versions_from_git(tag_prefix, verbose=False):
         normalized_version += ".dev0"
     return {"version": version, "normalized": normalized_version, "full": full}
 
+# setup.cfg has an [aliases] section which runs "update_version" before many
+# commands (like "build" and "sdist") that need to know our package version
+# ahead of time. If you add different commands (or if we forgot some), you
+# may need to add it to setup.cfg and configure it to run update_version
+# before your command.
 
 class UpdateVersion(Command):
     description = "update _version.py from revision-control metadata"
@@ -353,38 +333,26 @@ class UpdateVersion(Command):
     def finalize_options(self):
         pass
     def run(self):
-        target = self.distribution.versionfiles[0]
-        if os.path.isdir(os.path.join(basedir, "_darcs")):
-            verstr = self.try_from_darcs(target)
-        elif os.path.isdir(os.path.join(basedir, ".git")):
-            verstr = self.try_from_git(target)
+        if os.path.isdir(os.path.join(basedir, ".git")):
+            verstr = self.try_from_git()
         else:
             print("no version-control data found, leaving _version.py alone")
             return
         if verstr:
             self.distribution.metadata.version = verstr
 
-    def try_from_darcs(self, target):
-        from darcsver.darcsvermodule import update
-        (rc, verstr) = update(pkgname=self.distribution.get_name(),
-                              verfilename=self.distribution.versionfiles,
-                              revision_number=True,
-                              version_body=DARCS_VERSION_BODY)
-        if rc == 0:
-            return verstr
-
-    def try_from_git(self, target):
+    def try_from_git(self):
         versions = versions_from_git("allmydata-tahoe-", verbose=True)
         if versions:
-            for fn in self.distribution.versionfiles:
-                f = open(fn, "wb")
-                f.write(GIT_VERSION_BODY %
-                        { "pkgname": self.distribution.get_name(),
-                          "version": versions["version"],
-                          "normalized": versions["normalized"],
-                          "full": versions["full"] })
-                f.close()
-                print("git-version: wrote '%s' into '%s'" % (versions["version"], fn))
+            fn = 'src/allmydata/_version.py'
+            f = open(fn, "wb")
+            f.write(GIT_VERSION_BODY %
+                    { "pkgname": self.distribution.get_name(),
+                      "version": versions["version"],
+                      "normalized": versions["normalized"],
+                      "full": versions["full"] })
+            f.close()
+            print("git-version: wrote '%s' into '%s'" % (versions["version"], fn))
         return versions.get("normalized", None)
 
 
@@ -479,6 +447,5 @@ setup(name=APPNAME,
       setup_requires=setup_requires,
       entry_points = { 'console_scripts': [ 'tahoe = allmydata.scripts.runner:run' ] },
       zip_safe=False, # We prefer unzipped for easier access.
-      versionfiles=['src/allmydata/_version.py',],
       **setup_args
       )