dk-tasklib 3.0.6__tar.gz → 3.0.8__tar.gz

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/PKG-INFO

@@ -1,12 +1,10 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: dk-tasklib
-Version: 3.0.6
+Version: 3.0.8
 Summary: dk-tasklib - pyinvoke task library
 Home-page: https://github.com/datakortet/dk-tasklib
 Author: Bjorn Pettersen
 Author-email: bp@datakortet.no
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python
@@ -15,6 +13,17 @@ Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.5
 Classifier: Topic :: Software Development :: Libraries
+Requires-Dist: invoke
+Requires-Dist: PyYAML
+Requires-Dist: dkfileutils>=1.4.2
+Requires-Dist: yamldirs>=1.1.8
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: summary
 
 
 .. image:: https://travis-ci.org/datakortet/dk-tasklib.svg?branch=master
@@ -54,3 +63,16 @@ to make local changes to the source code.
 See docs/ folder for documentation.
 
 
+Development
+-----------
+
+Run the authoritative package checks from the repository root::
+
+    dk testpackage
+
+The suite enforces branch-aware coverage of at least 83 percent. Build the
+documentation with::
+
+    dk docs
+
+The documentation is maintained against current Sphinx 8 and 9 releases.

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/README.rst

@@ -34,3 +34,18 @@ to make local changes to the source code.
 
 
 See docs/ folder for documentation.
+
+
+Development
+-----------
+
+Run the authoritative package checks from the repository root::
+
+    dk testpackage
+
+The suite enforces branch-aware coverage of at least 83 percent. Build the
+documentation with::
+
+    dk docs
+
+The documentation is maintained against current Sphinx 8 and 9 releases.

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/dk_tasklib.egg-info/PKG-INFO

@@ -1,12 +1,10 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: dk-tasklib
-Version: 3.0.6
+Version: 3.0.8
 Summary: dk-tasklib - pyinvoke task library
 Home-page: https://github.com/datakortet/dk-tasklib
 Author: Bjorn Pettersen
 Author-email: bp@datakortet.no
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python
@@ -15,6 +13,17 @@ Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.5
 Classifier: Topic :: Software Development :: Libraries
+Requires-Dist: invoke
+Requires-Dist: PyYAML
+Requires-Dist: dkfileutils>=1.4.2
+Requires-Dist: yamldirs>=1.1.8
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: summary
 
 
 .. image:: https://travis-ci.org/datakortet/dk-tasklib.svg?branch=master
@@ -54,3 +63,16 @@ to make local changes to the source code.
 See docs/ folder for documentation.
 
 
+Development
+-----------
+
+Run the authoritative package checks from the repository root::
+
+    dk testpackage
+
+The suite enforces branch-aware coverage of at least 83 percent. Build the
+documentation with::
+
+    dk docs
+
+The documentation is maintained against current Sphinx 8 and 9 releases.

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/dk_tasklib.egg-info/SOURCES.txt

@@ -37,4 +37,33 @@ dktasklib/entry_points/dktasklibcmd.py
 dktasklib/entry_points/pytemplate.py
 dktasklib/entry_points/taskbase.py
 dktasklib/package/__init__.py
-dktasklib/package/package_interface.py
+dktasklib/package/package_interface.py
+tests/test_clean.py
+tests/test_commands_and_runners.py
+tests/test_concat.py
+tests/test_dktasklib_import.py
+tests/test_docs.py
+tests/test_docs_behavior.py
+tests/test_entry_points_behavior.py
+tests/test_executables.py
+tests/test_executables_behavior.py
+tests/test_help_behavior.py
+tests/test_jstools.py
+tests/test_jstools_behavior.py
+tests/test_lessc.py
+tests/test_lessc_behavior.py
+tests/test_manage_behavior.py
+tests/test_npm.py
+tests/test_package_ini.py
+tests/test_package_json.py
+tests/test_package_setup.py
+tests/test_packageinfo.py
+tests/test_pset.py
+tests/test_publish.py
+tests/test_rule.py
+tests/test_rule_and_watch.py
+tests/test_taskbase_behavior.py
+tests/test_upversion_behavior.py
+tests/test_urlinliner_and_npm.py
+tests/test_utils_behavior.py
+tests/test_version.py

dk_tasklib-3.0.8/dk_tasklib.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+dk-tasklib = dktasklib.entry_points.dktasklibcmd:main

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/dk_tasklib.egg-info/requires.txt

@@ -1,5 +1,4 @@
 invoke
 PyYAML
 dkfileutils>=1.4.2
-pathtools
 yamldirs>=1.1.8

dk_tasklib-3.0.8/dktasklib/_version.py

@@ -0,0 +1 @@
+__version__ = '3.0.8'

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/dktasklib/commands.py

@@ -5,7 +5,6 @@ import invoke
 
 from .executables import exe
 from .utils import fmt
-from past.builtins import basestring
 
 
 default_command_policy = dict(
@@ -58,12 +57,12 @@ class Command(object):
                     res += flag
                 else:
                     if self.policy['negative_bool'] == 'prefix':
-                        res += '--no' + flag
+                        res += '--no-' + flag.lstrip('-')
 
             elif isinstance(v, (list, tuple)) and v:
                 res += flag + '=' + self.policy['list_join'].join(str(item) for item in v)
 
-            elif isinstance(v, basestring):
+            elif isinstance(v, str):
                 res += flag + '="%s"' % v
 
             else:

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/dktasklib/docs.py

@@ -96,7 +96,7 @@ def create_docs_directory(ctx, force=False):
     ctx.pkg.docs.makedirs('_templates')
     confbase = DIRNAME / 'entry_points/confbase.py'
     txt = confbase.read('rb')
-    txt = txt.replace('\r\n', '\n')
+    txt = txt.replace(b'\r\n', b'\n')
     t = PyTemplate(txt)
 
     (ctx.pkg.docs / 'conf.py').write(t.substitute(
@@ -117,7 +117,7 @@ def create_index(ctx, force=False):
         sys.exit(1)
     confbase = DIRNAME / 'entry_points/index.rst'
     txt = confbase.read('rb')
-    txt = txt.replace('\r\n', '\n')
+    txt = txt.replace(b'\r\n', b'\n')
     t = PyTemplate(txt)
 
     index.write(t.substitute(

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/dktasklib/entry_points/confbase.py

@@ -164,7 +164,9 @@ texinfo_documents = [
 # -- Options for intersphinx extension ---------------------------------------
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/': None}
+intersphinx_mapping = {
+    'python': ('https://docs.python.org/3', None),
+}
 
 # -- Options for todo extension ----------------------------------------------
 

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/dktasklib/entry_points/dktasklibcmd.py

@@ -49,6 +49,7 @@ def create_docs_cmd(args):
     txt = txt.replace(b'\r\n', b'\n')
     t = PyTemplate(txt)
 
+    docsdir.makedirs()
     (docsdir / 'conf.py').write(t.substitute(
         VERSION=run('python setup.py --version'),
         PACKAGE=run('python setup.py --name'),
@@ -64,7 +65,7 @@ def add_django_to_docs_conf():
         print("./docs/conf.py already contains django.setup()")
         return
 
-    src = conf_file.read('rT')
+    src = conf_file.read('r')
     pre, post = src.split('\n\n', 1)
     conf_file.write(
         pre + "\n\n" +

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/dktasklib/entry_points/pytemplate.py

@@ -7,7 +7,9 @@ class PyTemplate(Template):
     Template strings that can replace ##{PATTERN} instances.
     """
     def __init__(self, t):
-        super(PyTemplate, self).__init__(t.replace(b'$', b'$$').replace(b'##{', b'${'))
+        if isinstance(t, bytes):
+            t = t.decode('u8')
+        super(PyTemplate, self).__init__(t.replace('$', '$$').replace('##{', '${'))
 
     def substitute(self, *args, **kw):
         return super(PyTemplate, self).substitute(

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/dktasklib/executables.py

@@ -82,9 +82,9 @@ class Executables(object):
             if win32:
                 # self.ctx.run(cmd, echo=True)
                 runners.run(cmd)
-                wheel = get_executable(exename)
+                exepath = get_executable(exename)
                 # generate signing key if downloading wheel
-                runners.run(wheel + ' keygen')
+                runners.run(exepath + ' keygen')
             else:
                 raise MissingCommand("Missing wheel (%s)" % cmd)
             print('Your ~/.pypirc file should have a [pypi] section instead of a [server-login] section')

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/dktasklib/jstools.py

@@ -241,9 +241,9 @@ def browserify(ctx,
     ctx.run(cmd)
     with open(dest, 'rb') as fp:
         txt = fp.read()
-    if '\r\n' in txt:
+    if b'\r\n' in txt:
         with open(dest, 'wb') as fp:
-            fp.write(txt.replace('\r\n', '\n'))
+            fp.write(txt.replace(b'\r\n', b'\n'))
     return dest
 
 

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/dktasklib/pset.py

@@ -50,7 +50,7 @@ class pset(dict):
         """
         if other is None:
             return False
-        if type(other) == dict:
+        if type(other) is dict:
             return dict.__eq__(self, other)
         # noinspection PyProtectedMember
         if set(self._order) == set(other._order):  # pylint: disable=W0212

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/dktasklib/rule.py

@@ -48,28 +48,26 @@ class BuildRule(object):
     def topsort(self, tasklist):
         """Topological sort
         """
-        # id(t) was originally t.__name__, id(t) means there will be no sharing...
-        tasks = {id(t): t for t in tasklist}
+        permanent = set()
+        temporary = set()
         res = []
 
-        def visit(name, task):
-            if task._temp_mark:
+        def visit(task):
+            name = id(task)
+            if name in temporary:
                 raise ValueError("Circularity", name, res)
-            if not task._perm_mark:
-                task._temp_mark = True
-                for d in task.requires:
-                    visit(d, tasks[d])
-                task._perm_mark = True
-                task._temp_mark = False
-                res.append(name)
+            if name in permanent:
+                return
+            temporary.add(name)
+            for dependency in task.requires:
+                visit(dependency)
+            permanent.add(name)
+            temporary.remove(name)
+            res.append(task)
 
-        while 1:
-            unmarked = set((name, task) for name, task in tasks.items()
-                           if not (task._perm_mark or task._temp_mark))
-            if not unmarked:
-                return [tasks[k] for k in res]
-            name, task = unmarked.pop()
-            visit(name, task)
+        for task in tasklist:
+            visit(task)
+        return res
 
 
 # @task

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/dktasklib/runners.py

@@ -10,18 +10,15 @@ class Result(str):
 
 def run(cmdline, throw=False):
     try:
-        res = Result(
-            subprocess.check_output(
-                cmdline,
-                shell=True
-            )  # .decode('u8')  ## (can't decode since Result is a str)
-        )
+        output = subprocess.check_output(cmdline, shell=True)
+        res = Result(output.decode('u8'))
         res.cmd = cmdline
         return res
     except subprocess.CalledProcessError as e:
         if throw:
             raise
-        res = Result(e.output)
+        output = e.output.decode('u8') if isinstance(e.output, bytes) else e.output
+        res = Result(output)
         res.cmd = cmdline
         res.returncode = e.returncode
         return res

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/dktasklib/upversion.py

@@ -47,13 +47,8 @@ def _replace_version(fname, cur_version, new_version):
     with open(fname, 'rb') as fp:
         txt = fp.read()
 
-    try:
-        cur_version in txt
-        uc = False
-    except UnicodeDecodeError:
-        uc = True
-        txt = txt.decode('u8')
-
+    cur_version = cur_version.encode('u8')
+    new_version = new_version.encode('u8')
     if cur_version not in txt:  # pragma: nocover
         # warnings.warn("Did not find %r in %r" % (cur_version, fname))
         return False
@@ -67,7 +62,7 @@ def _replace_version(fname, cur_version, new_version):
     txt = txt.replace(cur_version, new_version)
 
     with open(fname, 'wb') as fp:
-        fp.write(txt if not uc else txt.encode('u8'))
+        fp.write(txt)
     return 1
 
 

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/dktasklib/urlinliner.py

@@ -5,7 +5,7 @@ from dktasklib.wintask import task
 import base64
 import os
 import re
-import urllib
+from urllib.request import urlopen
 
 
 def inline_data(data, type='image/png', name=""):
@@ -15,7 +15,7 @@ def inline_data(data, type='image/png', name=""):
         print("%s is too big (%d bytes), max is 10KB" % (name, len(data)))
         return name
 
-    encoded = base64.b64encode(data)
+    encoded = base64.b64encode(data).decode('ascii')
     return 'data:{type};base64,{encoded}'.format(
         type=type,
         encoded=encoded.replace('\n', '')
@@ -36,12 +36,12 @@ def inline_file(fname):
 def inline_url(uri):
     """Fetch ``uri`` and inline.
     """
-    fp = urllib.urlopen(uri)
-    return inline_data(
-        fp.read(),
-        type=fp.headers['Content-Type'],
-        name=uri
-    )
+    with urlopen(uri) as fp:
+        return inline_data(
+            fp.read(),
+            type=fp.headers['Content-Type'],
+            name=uri
+        )
 
 
 @task(
@@ -69,7 +69,7 @@ def inline(ctx, fname):
     """
     lines = open(fname).readlines()
     output_fname = os.path.splitext(fname)[0]
-    with open(output_fname, 'wb') as fp:
+    with open(output_fname, 'w') as fp:
         for line in lines:
             if line.startswith('@'):
                 varname, content = line.split(':', 1)
@@ -82,12 +82,12 @@ def inline(ctx, fname):
                     varname=varname,
                     content=data
                 )
-            fp.writelines([line])
+            fp.write(line)
 
 
 @task
 def list_urls(ctx, filename):
     """List all url(..) targets in the filename.
     """
-    for match in re.findall(r'url\((.*?)\)', open(filename, 'rb').read()):
+    for match in re.findall(r'url\((.*?)\)', open(filename).read()):
         print(match)

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/dktasklib/utils.py

@@ -125,7 +125,7 @@ def dest_is_newer_than_source(src, dst):
     if not os.path.exists(dst):
         return False
     if not os.path.exists(src):
-        raise ValueError("Source does not exist: " + src)
+        raise ValueError("Source does not exist: " + str(src))
     return os.path.getmtime(src) < os.path.getmtime(dst)
 
 
@@ -186,12 +186,14 @@ def env(**kw):
     currentvals = {k: os.environ.get(k) for k in kw}
     for k, v in kw.items():
         os.environ[k] = str(v)
-    yield
-    for k in kw:
-        if currentvals[k] is None:
-            os.unsetenv(k)
-        else:
-            os.environ[k] = currentvals[k]
+    try:
+        yield
+    finally:
+        for k in kw:
+            if currentvals[k] is None:
+                os.environ.pop(k, None)
+            else:
+                os.environ[k] = currentvals[k]
 
 
 @contextmanager
@@ -206,9 +208,11 @@ def cd(directory):
 
     """
     cwd = os.getcwd()
-    os.chdir(directory)
-    yield
-    os.chdir(cwd)
+    try:
+        os.chdir(directory)
+        yield
+    finally:
+        os.chdir(cwd)
 
 
 def find_pymodule(dotted_name):

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/dktasklib/version.py

@@ -51,7 +51,8 @@ def get_version(ctx, fname, kind='pkg'):
         return ctx.pkg.version
 
     elif kind == "hash":
-        md5 = fname.dirname() / '.md5'
+        directory = fname.dirname() or Path('.')
+        md5 = directory / '.md5'
         if md5.exists():
             return md5.open().read()
         return hashlib.md5(open(fname, 'rb').read()).hexdigest()
@@ -77,7 +78,7 @@ def copy_to_version(ctx, source, outputdir=None, kind="pkg", force=False):
     """
     # where to place the versioned file..
     source = Path(source)
-    outputdir = Path(outputdir) if outputdir else source.dirname()
+    outputdir = Path(outputdir) if outputdir else source.dirname() or Path('.')
     outputdir.makedirs()
     dst_fname = source.basename()
     if '{version}' not in str(dst_fname):

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/dktasklib/watch.py

@@ -40,7 +40,7 @@ class FileModified(FileSystemEventHandler):
         self.action = action
 
     def on_modified(self, event):
-        if event.src_path != self.fname:
+        if Path(event.src_path).abspath() != self.fname:
             return
         self.action(event)
 
@@ -55,10 +55,11 @@ class DirectoryModified(FileSystemEventHandler):
 
     def on_modified(self, event):
         # print event.src_path, self.path, self.ext
-        if not event.src_path.startswith(self.path):
+        event_path = Path(event.src_path).abspath()
+        if not event_path.startswith(self.path):
             # print '  path different'
             return
-        if self.ext and not event.src_path.endswith(self.ext):
+        if self.ext and not event_path.endswith(self.ext):
             # print '  ext different'
             return
         self.action(event)

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/dktasklib/wintask.py

@@ -1,18 +1,18 @@
 # -*- coding: utf-8 -*-
 import os
 import sys
-import invoke
 
 try:
     from invoke import ctask as _task
 except ImportError:
     from invoke import task as _task
 
-if invoke.__version_info__ < (0, 22):  # pragma: nocover
-    _should_patch = True
-elif invoke.__version_info__ >= (0, 22):
-    _should_patch = False
+# if invoke.__version_info__ < (0, 22):  # pragma: nocover
+#     _should_patch = True
+# elif invoke.__version_info__ >= (0, 22):
+#     _should_patch = False
 
+_should_patch = False
 
 if _should_patch:  # pragma: nocover
     # https://github.com/pyinvoke/invoke/pull/407

{dk-tasklib-3.0.6 → dk_tasklib-3.0.8}/setup.py

@@ -18,7 +18,7 @@ Programming Language :: Python :: 3.5
 Topic :: Software Development :: Libraries
 """
 
-version = '3.0.6'
+version = '3.0.8'
 DIRNAME = os.path.dirname(__file__)
 
 
@@ -29,7 +29,6 @@ setuptools.setup(
         "invoke",
         "PyYAML",
         "dkfileutils>=1.4.2",
-        "pathtools",
         "yamldirs>=1.1.8",
     ],
     author='Bjorn Pettersen',

dk_tasklib-3.0.8/tests/test_clean.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+
+import os
+
+from yamldirs import create_files
+from dktasklib import clean
+
+
+def test_clean(ctx):
+    files = """
+        build:
+            - a
+            - b
+            - c:
+                - d
+                - e
+    """
+    with create_files(files) as directory:
+        clean.clean(ctx.init(), 'c')
+        assert set(os.listdir('build')) == {'a', 'b', 'c'}
+        assert os.listdir('build/c') == []