Initial rename from d2to1 to setup.cfg

Author: embray

setup.cfg

@@ -1,13 +1,13 @@
 [metadata]
-name = d2to1
-version = 0.2.12.dev
+name = setup.cfg
+version = 0.9.0.dev
 author = Erik M. Bray
 author-email = [email protected]
 summary = Allows using distutils2-like setup.cfg files for a package's metadata with a distribute/setuptools setup.py
 description-file =
     README.rst
     CHANGES.rst
-home-page = http://pypi.python.org/pypi/d2to1
+home-page = http://pypi.python.org/pypi/setup.cfg
 requires-dist = setuptools
 classifier = 
     Development Status :: 5 - Production/Stable
@@ -24,8 +24,9 @@ classifier =
 
 [files]
 packages =
-    d2to1
-    d2to1.extern
+    setup
+    setup.cfg
+    setup.cfg.extern
 extra_files =
     CHANGES.rst
     LICENSE
@@ -37,18 +38,18 @@ tests-require = nose
 
 [entry_points]
 distutils.setup_keywords = 
-	d2to1 = d2to1.core:d2to1
+	setup_cfg = setup.cfg.core:setup_cfg
 zest.releaser.prereleaser.middle = 
-	d2_version = d2to1.zestreleaser:prereleaser_middle
+	d2_version = setup.cfg.zestreleaser:prereleaser_middle
 zest.releaser.postreleaser.middle = 
-	d2_version = d2to1.zestreleaser:postreleaser_middle
+	d2_version = setup.cfg.zestreleaser:postreleaser_middle
 
 [test]
 test-suite = nose.collector
 
 [zest.releaser]
 # These zest.releaser hooks are not installed as entry points as they are only
-# used for d2to1 itself--the ones that are installed as entry points are useful
-# to any project that uses d2to1
-releaser.middle = d2to1.zestreleaser.releaser_middle
-postreleaser.before = d2to1.zestreleaser.postreleaser_before
+# used for setup.cfg itself--the ones that are installed as entry points are
+# useful to any project that uses setup.cfg
+releaser.middle = setup.cfg.zestreleaser.releaser_middle
+postreleaser.before = setup.cfg.zestreleaser.postreleaser_before

setup.py

@@ -6,8 +6,8 @@
     use_setuptools()
     from setuptools import setup
 
-# d2to1 basically installs itself!  See setup.cfg for the project metadata.
-from d2to1.util import cfg_to_args
+# setup.cfg basically installs itself!  See setup.cfg for the project metadata.
+from setup.cfg.util import cfg_to_args
 
 
 setup(**cfg_to_args())

d2to1/__init__.py renamed to setup/__init__.py

@@ -1,4 +1,4 @@
 try:
-    __version__ = __import__('pkg_resources').get_distribution('d2to1').version
+    __version__ = __import__('pkg_resources').get_distribution('setup.cfg').version
 except:
     __version__ = ''

d2to1/extern/__init__.py renamed to setup/cfg/__init__.py

@@ -13,14 +13,15 @@
 _Distribution = _get_unpatched(_Distribution)
 
 
-def d2to1(dist, attr, value):
-    """Implements the actual d2to1 setup() keyword.  When used, this should be
-    the only keyword in your setup() aside from `setup_requires`.
+def setup_cfg(dist, attr, value):
+    """
+    Implements the actual setup_cfg setup() keyword.  When used, this should be
+    the only keyword in your setup() aside from ``setup_requires``.
 
-    If given as a string, the value of d2to1 is assumed to be the relative path
-    to the setup.cfg file to use.  Otherwise, if it evaluates to true, it
-    simply assumes that d2to1 should be used, and the default 'setup.cfg' is
-    used.
+    If given as a string, the value of setup_cfg is assumed to be the relative
+    path to the setup.cfg file to use.  Otherwise, if it evaluates to true, it
+    simply assumes that setup.cfg should be used, and the default 'setup.cfg'
+    file is used.
 
     This works by reading the setup.cfg file, parsing out the supported
     metadata and command options, and using them to rebuild the

d2to1/core.py renamed to setup/cfg/core.py

@@ -4,20 +4,21 @@
 import subprocess
 import sys
 import tempfile
+import textwrap
 
 import pkg_resources
 
 from .util import rmtree, open_config
 
 
-D2TO1_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__),
-                                         os.pardir, os.pardir))
+SETUP_CFG_DIR = os.path.abspath(
+    os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, os.pardir))
 
 
-def fake_d2to1_dist():
-    # Fake a d2to1 distribution from the d2to1 package that these tests reside
-    # in and make sure it's active on the path with the appropriate entry
-    # points installed
+def fake_setup_cfg_dist():
+    # Fake a setup.cfg distribution from the setup.cfg package that these tests
+    # reside in and make sure it's active on the path with the appropriate
+    # entry points installed
 
     class _FakeProvider(pkg_resources.EmptyProvider):
         """A fake metadata provider that does almost nothing except to return
@@ -29,24 +30,28 @@ def has_metadata(self, name):
 
         def get_metadata(self, name):
             if name == 'entry_points.txt':
-                return '[distutils.setup_keywords]\nd2to1 = d2to1.core:d2to1\n'
+                return textwrap.dedent("""\
+                    [distutils.setup_keywords]
+                    setup_cfg = setup.cfg.core:setup_cfg
+                """)
             else:
                 return ''
 
 
-    sys.path.insert(0, D2TO1_DIR)
-    if 'd2to1' in sys.modules:
-        del sys.modules['d2to1']
-    if 'd2to1' in pkg_resources.working_set.by_key:
-        del pkg_resources.working_set.by_key['d2to1']
-    dist = pkg_resources.Distribution(location=D2TO1_DIR, project_name='d2to1',
+    sys.path.insert(0, SETUP_CFG_DIR)
+    if 'setup.cfg' in sys.modules:
+        del sys.modules['setup.cfg']
+    if 'setup.cfg' in pkg_resources.working_set.by_key:
+        del pkg_resources.working_set.by_key['setup.cfg']
+    dist = pkg_resources.Distribution(location=SETUP_CFG_DIR,
+                                      project_name='setup.cfg',
                                       metadata=_FakeProvider())
     pkg_resources.working_set.add(dist)
 
 
 class D2to1TestCase(object):
     def setup(self):
-        self.temp_dir = tempfile.mkdtemp(prefix='d2to1-test-')
+        self.temp_dir = tempfile.mkdtemp(prefix='setup.cfg-test-')
         self.package_dir = os.path.join(self.temp_dir, 'testpackage')
         shutil.copytree(os.path.join(os.path.dirname(__file__), 'testpackage'),
                         self.package_dir)
@@ -55,20 +60,21 @@ def setup(self):
 
     def teardown(self):
         os.chdir(self.oldcwd)
-        # Remove d2to1.testpackage from sys.modules so that it can be freshly
-        # re-imported by the next test
+        # Remove setup.cfg.testpackage from sys.modules so that it can be
+        # freshly re-imported by the next test
         for k in list(sys.modules):
-            if (k == 'd2to1_testpackage' or
-                k.startswith('d2to1_testpackage.')):
+            if (k == 'setup_cfg_testpackage' or
+                k.startswith('setup_cfg_testpackage.')):
                 del sys.modules[k]
         rmtree(self.temp_dir)
 
     def run_setup(self, *args):
         cmd = ('-c',
                'import sys;sys.path.insert(0, %r);'
-               'from d2to1.tests import fake_d2to1_dist;'
-               'from d2to1.extern.six import exec_;'
-               'fake_d2to1_dist();exec_(open("setup.py").read())' % D2TO1_DIR)
+               'from setup.cfg.tests import fake_setup_cfg_dist;'
+               'from setup.cfg.extern.six import exec_;'
+               'fake_setup_cfg_dist();exec_(open("setup.py").read())' %
+               SETUP_CFG_DIR)
         return self._run_cmd(sys.executable, cmd + args)
 
     def run_svn(self, *args):