Merge be7fa34 into 9ad6353

src/pkglts/option/appveyor/option.py

@@ -1,6 +1,5 @@
 from os.path import dirname
 
-from pkglts.dependency import Dependency
 from pkglts.option.doc import fmt_badge
 from pkglts.option_object import Option
 from pkglts.version import __version__
@@ -17,15 +16,15 @@ def update_parameters(self, cfg):
         sec = dict(
             token=""
         )
-        cfg['appveyor'] = sec
+        cfg[self._name] = sec
 
     def require_option(self):
         return ['doc', 'pysetup', 'github']
 
     def environment_extensions(self, cfg):
         owner = cfg['github']['owner']
         project = cfg['github']['project'].replace("_", "-")
-        token = cfg['appveyor']['token']
+        token = cfg[self._name]['token']
 
         url = "ci.appveyor.com/project/%s/%s/branch/master" % (owner, project)
         img = "ci.appveyor.com/api/projects/status/%s/branch/master?svg=true" % token

src/pkglts/option/base/option.py

@@ -20,12 +20,12 @@ def update_parameters(self, cfg):
             url=None,
             authors=[("moi", "moi@email.com")]
         )
-        cfg['base'] = sec
+        cfg[self._name] = sec
 
     def check(self, cfg):
         invalids = []
-        pkgname = cfg['base']['pkgname']
-        namespace = cfg['base']['namespace']
+        pkgname = cfg[self._name]['pkgname']
+        namespace = cfg[self._name]['namespace']
 
         if "." in pkgname:
             invalids.append('base.pkgname')

src/pkglts/option/data/option.py

@@ -17,7 +17,7 @@ def update_parameters(self, cfg):
             filetype=[".json", ".ini"],
             use_ext_dir=False
         )
-        cfg['data'] = sec
+        cfg[self._name] = sec
 
     def require_option(self):
         return ['src']

src/pkglts/option/doc/option.py

@@ -20,12 +20,12 @@ def update_parameters(self, cfg):
             fmt="rst",
             keywords=[]
         )
-        cfg['doc'] = sec
+        cfg[self._name] = sec
 
     def check(self, cfg):
         invalids = []
-        description = cfg['doc']['description']
-        fmt = cfg['doc']['fmt']
+        description = cfg[self._name]['description']
+        fmt = cfg[self._name]['fmt']
         # keywords = env.globals['doc'].keywords
 
         if not description:
@@ -40,19 +40,18 @@ def require_option(self):
         return ['base']
 
     def require(self, cfg):
-        if cfg['doc']['fmt'] == 'md':
+        if cfg[self._name]['fmt'] == 'md':
             yield Dependency('mkdocs', intent='doc')
 
     def environment_extensions(self, cfg):
         badges = []
-        for name in cfg.installed_options():
-            if name != 'doc':
-                opt = available_options[name]
-                ext = opt.environment_extensions(cfg)
-                if 'badge' in ext:
-                    badges.append(ext['badge'])
-                if 'badges' in ext:
-                    badges.extend(ext['badges'])
+        for name in set(cfg.installed_options()) - {self._name}:
+            opt = available_options[name]
+            ext = opt.environment_extensions(cfg)
+            if 'badge' in ext:
+                badges.append(ext['badge'])
+            if 'badges' in ext:
+                badges.extend(ext['badges'])
 
         return {"badges": badges}
 

src/pkglts/option/github/option.py

@@ -17,11 +17,11 @@ def update_parameters(self, cfg):
             project="{{ base.pkgname }}",
             url="https://github.com/{{ github.owner }}/{{ github.project }}"
         )
-        cfg['github'] = sec
+        cfg[self._name] = sec
 
     def check(self, cfg):
         invalids = []
-        project = cfg['github']['project']
+        project = cfg[self._name]['project']
 
         if not project:
             invalids.append('github.project')

src/pkglts/option/gitlab/option.py

@@ -18,11 +18,11 @@ def update_parameters(self, cfg):
             server="framagit.org",
             url="https://{{ gitlab.server }}/{{ gitlab.owner }}/{{ gitlab.project }}"
         )
-        cfg['gitlab'] = sec
+        cfg[self._name] = sec
 
     def check(self, cfg):
         invalids = []
-        project = cfg['gitlab']['project']
+        project = cfg[self._name]['project']
 
         if not project:
             invalids.append('gitlab.project')

src/pkglts/option/license/option.py

@@ -25,11 +25,11 @@ def update_parameters(self, cfg):
             organization="organization",
             project="{{ base.pkgname }}"
         )
-        cfg['license'] = sec
+        cfg[self._name] = sec
 
     def check(self, cfg):
         invalids = []
-        name = cfg['license']['name']
+        name = cfg[self._name]['name']
         # year = pkg_cfg['license']['year']
         # organization = pkg_cfg['license']['organization']
         # project = pkg_cfg['license']['project']

src/pkglts/option/notebook/option.py

@@ -16,11 +16,11 @@ def update_parameters(self, cfg):
         sec = dict(
             src_directory="example"
         )
-        cfg['notebook'] = sec
+        cfg[self._name] = sec
 
     def check(self, cfg):
         invalids = []
-        src_directory = cfg['notebook']['src_directory']
+        src_directory = cfg[self._name]['src_directory']
 
         if not exists(src_directory):
             invalids.append("notebook.src_directory")

src/pkglts/option/plugin_project/option.py

@@ -14,13 +14,13 @@ def root_dir(self):
         return dirname(__file__)
 
     def update_parameters(self, cfg):
-        cfg['plugin_project'] = {
+        cfg[self._name] = {
             "plugin_name": "{{ base.pkgname }}"
         }
 
     def check(self, cfg):
         invalids = []
-        plugin_name = cfg['plugin_project']['plugin_name']
+        plugin_name = cfg[self._name]['plugin_name']
 
         if "." in plugin_name:
             invalids.append('plugin_project.plugin_name')

src/pkglts/option/pypi/option.py

@@ -27,11 +27,11 @@ def update_parameters(self, cfg):
                 dict(name="test", url="https://testpypi.python.org/pypi")
             ]
         )
-        cfg['pypi'] = sec
+        cfg[self._name] = sec
 
     def check(self, cfg):
         invalids = []
-        classifiers = cfg['pypi']['classifiers']
+        classifiers = cfg[self._name]['classifiers']
 
         if not classifiers:
             invalids.append("pypi.classifiers")

src/pkglts/option/pysetup/option.py

@@ -15,11 +15,11 @@ def update_parameters(self, cfg):
         sec = dict(
             intended_versions=["36"],
         )
-        cfg['pysetup'] = sec
+        cfg[self._name] = sec
 
     def check(self, cfg):
         invalids = []
-        intended_versions = cfg['pysetup']['intended_versions']
+        intended_versions = cfg[self._name]['intended_versions']
 
         if not intended_versions:
             invalids.append("pysetup.intended_versions")

src/pkglts/option/readthedocs/option.py

@@ -16,11 +16,11 @@ def update_parameters(self, cfg):
         sec = dict(
             project="{{ github.project }}"
         )
-        cfg['readthedocs'] = sec
+        cfg[self._name] = sec
 
     def check(self, cfg):
         invalids = []
-        project = cfg['readthedocs']['project']
+        project = cfg[self._name]['project']
 
         if not project:
             invalids.append("readthedocs.project")

src/pkglts/option/reqs/option.py

@@ -19,12 +19,12 @@ def update_parameters(self, cfg):
         sec = dict(
             require=[]
         )
-        cfg['reqs'] = sec
+        cfg[self._name] = sec
 
     def check(self, cfg):
         invalids = []
 
-        req = cfg['reqs']['require']
+        req = cfg[self._name]['require']
 
         valid_methods = (None, "pip", "conda", "git")
         if any(dep.get('pkg_mng') not in valid_methods for dep in req):

src/pkglts/option/sphinx/option.py

@@ -20,18 +20,18 @@ def update_parameters(self, cfg):
             build_dir="build/sphinx",
             gallery="",
         )
-        cfg['sphinx'] = sec
+        cfg[self._name] = sec
 
     def check(self, cfg):
         invalids = []
         if cfg['doc']['fmt'] != 'rst':
             invalids.append('doc.fmt')
 
-        theme = cfg['sphinx']['theme']
+        theme = cfg[self._name]['theme']
         if theme != str(theme):
             invalids.append('sphinx.theme')
 
-        gallery = cfg['sphinx']['gallery']
+        gallery = cfg[self._name]['gallery']
         if gallery != "" and not is_pathname_valid(gallery):
             invalids.append('sphinx.gallery')
 

src/pkglts/option/src/option.py

@@ -16,12 +16,12 @@ def update_parameters(self, cfg):
         sec = dict(
             namespace_method="pkg_util",
         )
-        cfg['src'] = sec
+        cfg[self._name] = sec
 
     def check(self, cfg):
         invalids = []
 
-        if cfg['src']['namespace_method'] not in ("pkg_util", "setuptools", "P3.3>"):
+        if cfg[self._name]['namespace_method'] not in ("pkg_util", "setuptools", "P3.3>"):
             invalids.append("src.namespace_method")
 
         return invalids

src/pkglts/option/test/option.py

@@ -16,11 +16,11 @@ def update_parameters(self, cfg):
         sec = dict(
             suite_name="pytest",
         )
-        cfg['test'] = sec
+        cfg[self._name] = sec
 
     def check(self, cfg):
         invalids = []
-        name = cfg['test']['suite_name']
+        name = cfg[self._name]['suite_name']
 
         if name not in ("pytest", "nose"):
             invalids.append('test.suite_name')

src/pkglts/option/version/option.py

@@ -18,13 +18,13 @@ def update_parameters(self, cfg):
             minor=0,
             post=1,
         )
-        cfg['version'] = sec
+        cfg[self._name] = sec
 
     def check(self, cfg):
         invalids = []
-        major = cfg['version']['major']
-        minor = cfg['version']['minor']
-        post = cfg['version']['post']
+        major = cfg[self._name]['major']
+        minor = cfg[self._name]['minor']
+        post = cfg[self._name]['post']
 
         if not isinstance(major, int):
             invalids.append("version.major")