0.2.5

- add license to standard attributes for PKG_INFO inlusion
- move magic index to attribute of Config

Author: a-tal

pypackage/config.py

@@ -134,6 +134,7 @@ def write_pkg_info(self, egg_info):
 class Config(object):
     """Config object. Attributes are passed as kwargs."""
 
+    _STD_TO_EXTD_INDEX = 18
     _KEYS = OrderedDict([  # all available configuration keys: value type
         ("name", str),
         ("version", str),
@@ -143,6 +144,7 @@ class Config(object):
         ("author_email", str),
         ("maintainer", str),
         ("maintainer_email", str),
+        ("license", str),
         ("url", str),
         ("download_url", str),
         ("packages", list),

pypackage/configure.py

@@ -136,7 +136,7 @@ def standard_attributes(config, options):
         config: config object to use
     """
 
-    all_in_this_cat = list(config._KEYS.keys())[:17]
+    all_in_this_cat = list(config._KEYS.keys())[:config._STD_TO_EXTD_INDEX]
 
     if options.re_config:
         return all_in_this_cat
@@ -170,7 +170,7 @@ def feature_attributes(config, options):
 def extended_attributes(config, options):
     """Builds a list of unconfigured extended attributes in config."""
 
-    all_in_this_cat = list(config._KEYS.keys())[17:]
+    all_in_this_cat = list(config._KEYS.keys())[config._STD_TO_EXTD_INDEX:]
 
     if options.re_config:
         return all_in_this_cat

setup.py

@@ -32,7 +32,7 @@ def long_description():
 
 setup(
     name="pypackage",
-    version="0.2.4",
+    version="0.2.5",
     author="Adam Talsma",
     author_email="[email protected]",
     url="http://ccpgames.github.io/pypackage",

test/test_configure.py

@@ -160,7 +160,7 @@ def test_standard_attributes(reset_sys_argv, move_home_pypackage):
     """Ensure the standard attribute set."""
 
     conf = Config()
-    expected_attrs = list(conf._KEYS.keys())[:17]
+    expected_attrs = list(conf._KEYS.keys())[:conf._STD_TO_EXTD_INDEX]
     conf.name = "foobar"
     conf.classifiers = ["fake classifier"]
     expected_attrs.remove("name")
@@ -176,7 +176,7 @@ def test_standard_attributes__re_config(reset_sys_argv):
     conf.name = "something"
     sys.argv = ["py-build", "-r"]
     attrs = configure.standard_attributes(conf, get_options())
-    expected = list(conf._KEYS.keys())[:17]
+    expected = list(conf._KEYS.keys())[:conf._STD_TO_EXTD_INDEX]
     assert attrs == expected
 
 
@@ -213,10 +213,10 @@ def test_feature_attributes__re_config(reset_sys_argv):
 
 
 def test_extended_attributes(reset_sys_argv, move_home_pypackage):
-    """Extended attributes should return any unset keys past 17."""
+    """Extended attributes should return unset keys past _STD_TO_EXTD_INDEX."""
 
     conf = Config()
-    expected = list(conf._KEYS.keys())[17:]
+    expected = list(conf._KEYS.keys())[conf._STD_TO_EXTD_INDEX:]
     conf.use_2to3 = True
     expected.remove("use_2to3")
     attrs = configure.extended_attributes(conf, get_options())
@@ -230,7 +230,7 @@ def test_extended_attributes__re_config(reset_sys_argv):
     conf.use_2to3 = True
     sys.argv = ["py-build", "-r"]
     attrs = configure.extended_attributes(conf, get_options())
-    expected = list(conf._KEYS.keys())[17:]
+    expected = list(conf._KEYS.keys())[conf._STD_TO_EXTD_INDEX:]
     assert attrs == expected