Changeset 19b2ef9 in trunk

Timestamp:

2013-03-19T23:07:22Z (12 years ago)

Author:

Brian Warner <warner@…>

Branches:

master

Children:

8b144fa1

Parents:

9e449db

git-author:

Brian Warner <warner@…> (2013-03-19 22:26:21)

git-committer:

Brian Warner <warner@…> (2013-03-19 23:07:22)

Message:

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

Also remove lingering traces of darcs from MANIFEST.in,
.darcs-boringfile, setup.cfg, and unit tests.

Files:

• .darcs-boringfile (deleted)
• MANIFEST.in (modified) (2 diffs)
• darcsver-1.7.2.egg/EGG-INFO/PKG-INFO (deleted)
• darcsver-1.7.2.egg/EGG-INFO/SOURCES.txt (deleted)
• darcsver-1.7.2.egg/EGG-INFO/dependency_links.txt (deleted)
• darcsver-1.7.2.egg/EGG-INFO/entry_points.txt (deleted)
• darcsver-1.7.2.egg/EGG-INFO/not-zip-safe (deleted)
• darcsver-1.7.2.egg/EGG-INFO/top_level.txt (deleted)
• darcsver-1.7.2.egg/darcsver/__init__.py (deleted)
• darcsver-1.7.2.egg/darcsver/_version.py (deleted)
• darcsver-1.7.2.egg/darcsver/darcsvermodule.py (deleted)
• darcsver-1.7.2.egg/darcsver/setuptools_command.py (deleted)
• darcsver-1.7.2.egg/scripts/__init__.py (deleted)
• darcsver-1.7.2.egg/scripts/darcsverscript.py (deleted)
• darcsver-1.7.2.egg/share/doc/python-darcsver/README.txt (deleted)
• setup.cfg (modified) (1 diff)
• setup.py (modified) (7 diffs)
• src/allmydata/test/test_runner.py (modified) (1 diff)

MANIFEST.in ¶

@@ -1 +1 @@
 include COPYING.GPL COPYING.TGPPL.rst CREDITS Makefile NEWS.rst Tahoe.home
-include relnotes.txt .darcs-boringfile
+include relnotes.txt
 include bin/tahoe-script.template
 recursive-include src *.xhtml *.js *.png *.css
@@ -7 +7 @@
 graft misc
 graft static
-graft darcsver-1.7.2.egg
 
 graft setuptools-0.6c16dev4.egg

setup.cfg ¶

@@ -15 +15 @@
 
 # https://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-deps.tar.gz contains a
-# bundle of these dependencies (as Python source distributions or "sdists"). So
-# it you want to avoid the build-time download (say, if you're on an airplane,
-# or a desert island), just grab a copy and unpack it in your tahoe darcs tree.
+# bundle of these dependencies (as Python source distributions or "sdists").
+# So it you want to avoid the build-time download (say, if you're on an
+# airplane, or a desert island), just grab a copy and unpack it in your tahoe
+# source tree.
 
 # Alternatively, if you're building from a release/nightly tarball instead of
-# a darcs tree, the 'sumo' tarball variant will include all of these
+# a git tree, the 'sumo' tarball variant will include all of these
 # dependencies in the tahoe-deps/ directory.
 

setup.py ¶

@@ -72 +72 @@
 
 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
@@ -121 +119 @@
 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
@@ -256 +240 @@
                 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 = '''
@@ -344 +319 @@
     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):
@@ -354 +334 @@
         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")
@@ -365 +342 @@
             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)
 
@@ -480 +448 @@
       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
       )

src/allmydata/test/test_runner.py ¶

@@ -155 +155 @@
             self.failIfEqual(required_verstr, "unknown",
                              "We don't know our version, because this distribution didn't come "
-                             "with a _version.py and 'setup.py darcsver' hasn't been run.")
+                             "with a _version.py and 'setup.py update_version' hasn't been run.")
 
             srcdir = os.path.dirname(os.path.dirname(os.path.normcase(os.path.realpath(srcfile))))