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

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

@@ -1,20 +1,29 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: dk-tasklib
-Version: 3.0.6
+Version: 3.0.9
 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
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 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.9}/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.9}/dk_tasklib.egg-info/PKG-INFO

@@ -1,20 +1,29 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: dk-tasklib
-Version: 3.0.6
+Version: 3.0.9
 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
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 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.9}/dk_tasklib.egg-info/SOURCES.txt

@@ -37,4 +37,27 @@ 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_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_behavior.py
+tests/test_lessc.py
+tests/test_lessc_behavior.py
+tests/test_manage_behavior.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.9/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.9}/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.9/dktasklib/_version.py

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

{dk-tasklib-3.0.6 → dk_tasklib-3.0.9}/dktasklib/clean.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from dktasklib.wintask import task
 
 
@@ -6,5 +5,4 @@ from dktasklib.wintask import task
 def clean(ctx, directory):
     """Remove all contents from build subdirectory `directory`.
     """
-    # ctx.run("rm -rf build/{directory}/*".format(directory=directory), shell=os.environ['COMSPEC'])
     ctx.run("rm -rf build/{directory}/*".format(directory=directory))

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

@@ -1,11 +1,9 @@
-# -*- coding: utf-8 -*-
 import os
 import re
 import invoke
 
 from .executables import exe
 from .utils import fmt
-from past.builtins import basestring
 
 
 default_command_policy = dict(
@@ -14,7 +12,7 @@ default_command_policy = dict(
 )
 
 
-class Command(object):
+class Command:
     def __init__(self, name, argspec="",
                  requirements=(),
                  policy=default_command_policy,
@@ -46,7 +44,6 @@ class Command(object):
     def _kw_to_opts(self, kw):
         res = ""
         for k, v in kw.items():
-            # print 'k,v,res:', k, v, `res`
             if k in self.params:  # skip conversion of parameters to argspec
                 continue
 
@@ -58,12 +55,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.9}/dktasklib/concat.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import print_function
 import os
 import sys
 
@@ -43,8 +41,6 @@ def fix_line_endings(fname, eol=b'\n'):
 def copy(ctx, source, dest, force=False):
     """Copy ``source`` to ``dest``, which can be a file or directory.
     """
-    # print "COPY:", locals()
-    # print "COPY:", ctx.force, ctx.verbose
     if source == dest:
         return dest
 
@@ -54,7 +50,6 @@ def copy(ctx, source, dest, force=False):
     if sys.platform == 'win32':
         if force:
             flags += " /Y"
-        # print 'copy {flags} {source} {dest}'.format(**locals())
         ctx.run('copy {flags} {source} {dest}'.format(**locals()))
     else:  # pragma: nocover
         if force:
@@ -76,23 +71,6 @@ def concat(ctx, dest, *sources, **kw):
                 out.writelines(inp.readlines())
         out.write('\n')
 
-    # flags = ""
-    # if sys.platform == 'win32':
-    #     if force:
-    #         flags += " /Y"
-    #     source = '+'.join(sources)
-    #     source = source.replace('/', '\\')
-    #     ctx.run('copy {flags} {source} {dest}'.format(**locals()))
-    # else:  # pragma: nocover
-    #     if force:
-    #         pass
-    #         # flags += " --force"
-    #     source = ' '.join(sources)
-    #     # print 'cat {flags} {source} > {dest}'.format(**locals())
-    #     ctx.run('cat {flags} {source} > {dest}'.format(**locals()))
-
     fix_line_endings(dest)
-    # if len(line_endings(dest)) > 1:
-    #     fix_line_endings(dest)
 
     return dest

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

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import print_function
 import datetime
 import os
 import sys
@@ -96,7 +94,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 +115,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(
@@ -173,7 +171,6 @@ def build(ctx, clean=False, browse=False, warn=False,
     """
     Build the project's Sphinx docs.
     """
-    # import pdb;pdb.set_trace()
     if not force and not changed(ctx.pkg.docs):
         print("""
         No changes detected in {}, add --force to build docs anyway.

{dk-tasklib-3.0.6 → dk_tasklib-3.0.9}/dktasklib/entry_points/__init__.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 """
 

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

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # Configuration file for the Sphinx documentation builder.
 #
 # This file does only contain a selection of the most common options. For a
@@ -19,14 +17,14 @@ sys.path.insert(0, os.path.abspath('..'))
 
 # -- Project information -----------------------------------------------------
 
-project = u'##{PACKAGE}'
-copyright = u'##{YEAR}, ##{AUTHOR}'
-author = u'##{AUTHOR}'
+project = '##{PACKAGE}'
+copyright = '##{YEAR}, ##{AUTHOR}'
+author = '##{AUTHOR}'
 
 # The short X.Y version
-version = u'##{VERSION}'
+version = '##{VERSION}'
 # The full version, including alpha/beta/rc tags
-release = u'##{VERSION}'
+release = '##{VERSION}'
 
 
 # -- General configuration ---------------------------------------------------
@@ -62,12 +60,12 @@ master_doc = 'index'
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = u'en'
+language = 'en'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path .
-exclude_patterns = [u'_build', 'Thumbs.db', '.DS_Store']
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
@@ -132,8 +130,8 @@ latex_elements = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, '##{PACKAGE}.tex', u'##{PACKAGE} Documentation',
-     u'##{AUTHOR}', 'manual'),
+    (master_doc, '##{PACKAGE}.tex', '##{PACKAGE} Documentation',
+     '##{AUTHOR}', 'manual'),
 ]
 
 
@@ -142,7 +140,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, '##{PACKAGE}', u'##{PACKAGE} Documentation',
+    (master_doc, '##{PACKAGE}', '##{PACKAGE} Documentation',
      [author], 1)
 ]
 
@@ -153,7 +151,7 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, '##{PACKAGE}', u'##{PACKAGE} Documentation',
+    (master_doc, '##{PACKAGE}', '##{PACKAGE} Documentation',
      author, '##{PACKAGE}', 'One line description of project.',
      'Miscellaneous'),
 ]
@@ -164,7 +162,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.9}/dktasklib/entry_points/dktasklibcmd.py

@@ -1,8 +1,5 @@
-# -*- coding: utf-8 -*-
-
 """Commands installed by setup.py
 """
-from __future__ import print_function
 # pragma: nocover
 import argparse
 import datetime
@@ -49,6 +46,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 +62,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.9}/dktasklib/entry_points/pytemplate.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from string import Template
 
 
@@ -7,9 +6,11 @@ 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().__init__(t.replace('$', '$$').replace('##{', '${'))
 
     def substitute(self, *args, **kw):
-        return super(PyTemplate, self).substitute(
+        return super().substitute(
             **{k.upper(): v for k, v in kw.items()}
         )

{dk-tasklib-3.0.6 → dk_tasklib-3.0.9}/dktasklib/entry_points/taskbase.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Base version of package/tasks.py, created by version ##{VERSION} of
 
@@ -25,7 +24,6 @@ will fit your use case.
 
 """
 # pragma: nocover
-from __future__ import print_function
 import os
 import warnings
 
@@ -35,7 +33,6 @@ from dktasklib.wintask import task
 from invoke import Collection
 
 from dktasklib import docs as doctools
-from dktasklib import jstools
 from dktasklib import lessc
 from dktasklib import version, upversion
 from dktasklib.manage import collectstatic
@@ -58,12 +55,6 @@ DJANGO_SETTINGS_MODULE = ''
 # there should be a mypkg/mypkg/less/mypkg.less file that imports any other
 # needed sources
 
-# .jsx (es6 source)
-# ------------------
-# list any .jsx files here. Only filename.jsx (don't include the path).
-# The files should reside in mypkg/mypkg/js/ directory.
-JSX_FILENAMES = []
-
 # ============================================================================
 # autodoc is in a separate process, so can't use settings.configure().
 HAVE_SETTINGS = bool(DJANGO_SETTINGS_MODULE)
@@ -76,23 +67,10 @@ WARN_ABOUT_SETTINGS = not bool(DJANGO_SETTINGS_MODULE)
 
 
 @task
-def build_js(ctx, force=False):
-    """Build all javascript files.
-    """
-    for fname in JSX_FILENAMES:
-        jstools.babel(
-            ctx,
-            '{pkg.source_js}/' + fname,
-            '{pkg.django_static}/{pkg.name}/js/' + fname + '.js',
-            force=force
-        )
-
-
-@task
-def build(ctx, less=False, docs=False, js=False, force=False):
+def build(ctx, less=False, docs=False, force=False):
     """Build everything and collectstatic.
     """
-    specified = any([less, docs, js])
+    specified = any([less, docs])
     buildall = not specified
 
     if buildall or less:
@@ -118,9 +96,6 @@ def build(ctx, less=False, docs=False, js=False, force=False):
             )
         doctools.build(ctx, force=force)
 
-    if buildall or js:
-        build_js(ctx, force)
-
     if HAVE_SETTINGS and (force or changed(ctx.pkg.django_static)):
         collectstatic(ctx, DJANGO_SETTINGS_MODULE, force=force)
 
@@ -134,10 +109,6 @@ def watch(ctx):
         path='{pkg.source_less}', ext='.less',
         action=lambda e: build(ctx, less=True)
     )
-    watcher.watch_directory(
-        path='{pkg.source_js}', ext='.jsx',
-        action=lambda e: build(ctx, js=True)
-    )
     watcher.watch_directory(
         path='{pkg.docs}', ext='.rst',
         action=lambda e: build(ctx, docs=True)
@@ -149,7 +120,6 @@ def watch(ctx):
 ns = Collection(
     build,
     watch,
-    build_js,
     lessc,
     doctools,
     version, upversion,

{dk-tasklib-3.0.6 → dk_tasklib-3.0.9}/dktasklib/environment.py

@@ -3,7 +3,7 @@ Global state.
 """
 
 
-class Environment(object):
+class Environment:
     def __call__(self, ctx):
         return ctx
 

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

@@ -1,4 +1,3 @@
-# from functools import wraps
 import sys
 import warnings
 
@@ -16,7 +15,7 @@ class MissingCommand(Exception):
 
 
 # noinspection PyShadowingNames
-class Executables(object):
+class Executables:
     """Class for finding executables on the host system.
     """
     def __init__(self):
@@ -80,11 +79,10 @@ class Executables(object):
             pip = get_executable('pip')
             cmd = pip + ' install wheel[signatures]'
             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')
@@ -97,7 +95,6 @@ class Executables(object):
             pip = get_executable('pip')
             cmd = pip + ' install twine'
             if win32:
-                # self.ctx.run(cmd, echo=True)
                 runners.run(cmd)
                 exepath = get_executable(exename)
             else:
@@ -123,7 +120,6 @@ class Executables(object):
         npminstall = "npm install -g browserify --no-color"
         if not exepath:
             if win32:
-                # self.ctx.run(npminstall, echo=False, encoding="utf-8")
                 self.ctx.run(npminstall, echo=True, encoding="utf-8")
                 exepath = get_executable(exename)
             else:
@@ -154,18 +150,6 @@ class Executables(object):
                 raise MissingCommand("Missing babel (%s)" % npminstall)
         return exepath
 
-    # def find_babel(self):
-    #     exename = 'babel'
-    #     exepath = get_executable(exename)
-    #     npminstall = "npm install -g babel --no-color"
-    #     if not exepath:
-    #         if win32:
-    #             self.ctx.run(npminstall, echo=False, encoding="utf-8")
-    #             exepath = get_executable(exename)
-    #         else:
-    #             raise MissingCommand("Missing babel (%s)" % npminstall)
-    #     return exepath
-
     def find_nodejs(self):  # pragma: nocover
         """Find :program:`node`.
         """
@@ -213,9 +197,4 @@ def requires(*deps):
         except MissingCommand as e:
             warnings.warn(str(e))
         return fn
-        # @wraps(fn)
-        # def _inner(*args, **kwargs):
-        #     exe.require(*deps)
-        #     return fn(*args, **kwargs)
-        # return _inner
     return _wrapper

{dk-tasklib-3.0.6 → dk_tasklib-3.0.9}/dktasklib/help.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from dktasklib.wintask import task