plonecli 2.4__tar.gz → 3.0b1__tar.gz

{plonecli-2.4 → plonecli-3.0b1}/CHANGES.rst

@@ -1,6 +1,22 @@
 History
 =======
 
+3.0b1 (2026-04-14)
+------------------
+
+- Support only python 3.11 - 3.14
+  [erral]
+
+- Require setuptools < 82.0.0
+  [erral]
+
+
+2.5 (2022-11-03)
+----------------
+
+- Provide a way to pass a mrbob configuration file
+  [erral]
+
 2.4 (2022-10-10)
 ----------------
 

{plonecli-2.4 → plonecli-3.0b1}/PKG-INFO

@@ -1,13 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: plonecli
-Version: 2.4
+Version: 3.0b1
 Summary: A Plone CLI for creating Plone packages
 Home-page: https://github.com/plone/plonecli
 Author: Maik Derstappen
 Author-email: md@derico.de
 License: BSD License
 Keywords: plonecli
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License
@@ -18,23 +17,35 @@ Classifier: Topic :: Software Development :: Quality Assurance
 Classifier: Topic :: Utilities
 Classifier: Environment :: Console
 Classifier: Framework :: Plone
+Classifier: Framework :: Plone :: 6.0
 Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.6
-Provides-Extra: test
-Provides-Extra: dev
 License-File: LICENSE
 License-File: AUTHORS.rst
+Requires-Dist: setuptools<82.0.0
+Requires-Dist: Click>=7.0
+Requires-Dist: click-aliases
+Requires-Dist: mr.bob
+Requires-Dist: bobtemplates.plone>=6.0b15
+Requires-Dist: tox
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: isort>=5.0.0; extra == "test"
+Provides-Extra: dev
+Requires-Dist: tox; extra == "dev"
+Requires-Dist: zest.releaser[recommended]; extra == "dev"
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
 
-.. image:: https://secure.travis-ci.org/plone/plonecli.png?branch=master
-    :target: http://travis-ci.org/plone/plonecli
-
-.. image:: https://coveralls.io/repos/github/plone/plonecli/badge.svg?branch=master
-    :target: https://coveralls.io/github/plone/plonecli?branch=master
-    :alt: Coveralls
+.. image:: https://github.com/plone/plonecli/actions/workflows/python-package.yml/badge.svg
+    :target: https://github.com/plone/plonecli/actions/workflows/python-package.yml
 
 .. image:: https://img.shields.io/pypi/v/plonecli.svg
     :target: https://pypi.python.org/pypi/plonecli/
@@ -43,6 +54,7 @@ License-File: AUTHORS.rst
 .. image:: https://img.shields.io/pypi/pyversions/bobtemplates.plone.svg?style=plastic
     :alt: PyPI - Python Version
 
+
 =========
 Plone CLI
 =========
@@ -204,7 +216,6 @@ Creating A Plone Add-on
       - viewlet
       - vocabulary
       - buildout
-    - theme_package [deprecated] >> Please use the theme_barceloneta subtemplate!
 
     $ plonecli create addon src/collective.todo
 
@@ -331,7 +342,7 @@ Register Your Bobtemplates Package For Plonecli
 
 All mr.bob templates can be registered for plonecli by adding an entry_point to your setup.py.
 
-Here are the entry_points of the bobtemplates.plone package:
+Here are some entry_points of the bobtemplates.plone package:
 
 .. code-block:: python
 
@@ -339,7 +350,6 @@ Here are the entry_points of the bobtemplates.plone package:
         'mrbob_templates': [
             'plone_addon = bobtemplates.plone.bobregistry:plone_addon',
             'plone_buildout = bobtemplates.plone.bobregistry:plone_buildout',  # NOQA E501
-            'plone_theme_package = bobtemplates.plone.bobregistry:plone_theme_package',  # NOQA E501
             'plone_content_type = bobtemplates.plone.bobregistry:plone_content_type',  # NOQA E501
             'plone_view = bobtemplates.plone.bobregistry:plone_view',
             'plone_viewlet = bobtemplates.plone.bobregistry:plone_viewlet',
@@ -411,6 +421,22 @@ This project is licensed under the BSD license.
 History
 =======
 
+3.0b1 (2026-04-14)
+------------------
+
+- Support only python 3.11 - 3.14
+  [erral]
+
+- Require setuptools < 82.0.0
+  [erral]
+
+
+2.5 (2022-11-03)
+----------------
+
+- Provide a way to pass a mrbob configuration file
+  [erral]
+
 2.4 (2022-10-10)
 ----------------
 
@@ -645,5 +671,3 @@ History
 
 - initital version with list templates support and bobtemplates.plone integration
   [MrTango, tmassman, Gomez]
-
-

{plonecli-2.4 → plonecli-3.0b1}/README.rst

@@ -1,9 +1,5 @@
-.. image:: https://secure.travis-ci.org/plone/plonecli.png?branch=master
-    :target: http://travis-ci.org/plone/plonecli
-
-.. image:: https://coveralls.io/repos/github/plone/plonecli/badge.svg?branch=master
-    :target: https://coveralls.io/github/plone/plonecli?branch=master
-    :alt: Coveralls
+.. image:: https://github.com/plone/plonecli/actions/workflows/python-package.yml/badge.svg
+    :target: https://github.com/plone/plonecli/actions/workflows/python-package.yml
 
 .. image:: https://img.shields.io/pypi/v/plonecli.svg
     :target: https://pypi.python.org/pypi/plonecli/
@@ -12,6 +8,7 @@
 .. image:: https://img.shields.io/pypi/pyversions/bobtemplates.plone.svg?style=plastic
     :alt: PyPI - Python Version
 
+
 =========
 Plone CLI
 =========
@@ -173,7 +170,6 @@ Creating A Plone Add-on
       - viewlet
       - vocabulary
       - buildout
-    - theme_package [deprecated] >> Please use the theme_barceloneta subtemplate!
 
     $ plonecli create addon src/collective.todo
 
@@ -300,7 +296,7 @@ Register Your Bobtemplates Package For Plonecli
 
 All mr.bob templates can be registered for plonecli by adding an entry_point to your setup.py.
 
-Here are the entry_points of the bobtemplates.plone package:
+Here are some entry_points of the bobtemplates.plone package:
 
 .. code-block:: python
 
@@ -308,7 +304,6 @@ Here are the entry_points of the bobtemplates.plone package:
         'mrbob_templates': [
             'plone_addon = bobtemplates.plone.bobregistry:plone_addon',
             'plone_buildout = bobtemplates.plone.bobregistry:plone_buildout',  # NOQA E501
-            'plone_theme_package = bobtemplates.plone.bobregistry:plone_theme_package',  # NOQA E501
             'plone_content_type = bobtemplates.plone.bobregistry:plone_content_type',  # NOQA E501
             'plone_view = bobtemplates.plone.bobregistry:plone_view',
             'plone_viewlet = bobtemplates.plone.bobregistry:plone_viewlet',

{plonecli-2.4 → plonecli-3.0b1}/docs/Makefile

@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
+SPHINXBUILD   = ./venv/bin/sphinx-build
 PAPER         =
 BUILDDIR      = _build
 

{plonecli-2.4 → plonecli-3.0b1}/plonecli/__init__.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 """Top-level package for Plone CLI."""
 
-import pkg_resources
+import importlib.metadata
 
 
 __author__ = """Maik Derstappen"""
 __email__ = "md@derico.de"
-__version__ = pkg_resources.require("plonecli")[0].version
+__version__ = importlib.metadata.version("plonecli")

{plonecli-2.4 → plonecli-3.0b1}/plonecli/cli.py

@@ -3,9 +3,11 @@
 
 from __future__ import absolute_import
 
+import importlib.metadata
+
 from click_aliases import ClickAliasedGroup
 from mrbob.cli import main as mrbobmain
-from pkg_resources import WorkingSet
+
 from plonecli.configure_mrbob import is_venv_disabled
 from plonecli.exceptions import NoSuchValue
 from plonecli.exceptions import NotInPackageError
@@ -58,10 +60,8 @@ def cli(context, list_templates, versions):
     if list_templates:
         click.echo(reg.list_templates())
     if versions:
-        ws = WorkingSet()
-        bobtemplates_dist = ws.by_key["bobtemplates.plone"]
-        bobtemplates_version = bobtemplates_dist.version
-        plonecli_version = ws.by_key["plonecli"].version
+        bobtemplates_version = importlib.metadata.version("bobtemplates.plone")
+        plonecli_version = importlib.metadata.version("plonecli")
         version_str = """Available packages:\n
         plonecli : {0}\n
         bobtemplates.plone: {1}\n""".format(
@@ -73,8 +73,14 @@ def cli(context, list_templates, versions):
 @cli.command()
 @click.argument("template", type=click.STRING, shell_complete=get_templates)
 @click.argument("name")
+@click.option(
+    "-b",
+    "--bobconfig",
+    default=None,
+    help="mrbob configuration file. The default is ~/.mrbob.",
+)
 @click.pass_context
-def create(context, template, name):
+def create(context, template, name, bobconfig):
     """Create a new Plone package"""
     bobtemplate = reg.resolve_template_name(template)
     if bobtemplate is None:
@@ -83,18 +89,29 @@ def create(context, template, name):
         )
     cur_dir = os.getcwd()
     context.obj["target_dir"] = "{0}/{1}".format(cur_dir, name)
+
+    mrbob_args = [bobtemplate, "-O", name]
+    if bobconfig is not None:
+        mrbob_args.extend(["-c", bobconfig])
+
     echo(
-        "\nRUN: mrbob {0} -O {1}".format(bobtemplate, name),
+        "\nRUN: {0}".format(" ".join(mrbob_args)),
         fg="green",
         reverse=True,
     )
-    mrbobmain([bobtemplate, "-O", name])
+    mrbobmain(mrbob_args)
 
 
 @cli.command()
 @click.argument("template", type=click.STRING, shell_complete=get_templates)
+@click.option(
+    "-b",
+    "--bobconfig",
+    default=None,
+    help="mrbob configuration file. The default is ~/.mrbob.",
+)
 @click.pass_context
-def add(context, template):
+def add(context, template, bobconfig):
     """Add features to your existing Plone package"""
     if context.obj.get("target_dir", None) is None:
         raise NotInPackageError(context.command.name)
@@ -103,8 +120,12 @@ def add(context, template):
         raise NoSuchValue(
             context.command.name, template, possibilities=reg.get_templates()
         )
-    echo("\nRUN: mrbob {0}".format(bobtemplate), fg="green", reverse=True)
-    mrbobmain([bobtemplate])
+    mrbob_args = [bobtemplate]
+    if bobconfig is not None:
+        mrbob_args.extend(["-c", bobconfig])
+
+    echo("\nRUN: mrbob {0}".format(" ".join(mrbob_args)), fg="green", reverse=True)
+    mrbobmain(mrbob_args)
 
 
 @cli.command("venv", aliases=["virtualenv"])

{plonecli-2.4 → plonecli-3.0b1}/plonecli/configure_mrbob.py

@@ -52,17 +52,17 @@ def configoverride_warning_post_question(configurator, question, answer):
 
 def mrbob_config_exists(configurator, answer):
     target_directory = home_path
-    file_name = u".mrbob"
+    file_name = ".mrbob"
     file_list = os.listdir(target_directory)
     if file_name not in file_list:
         raise SkipQuestion(
-            u"No existing mrbob config file found, so we skip this question."
+            "No existing mrbob config file found, so we skip this question."
         )
 
 
 def check_git_disabled(configurator, answer):
     if configurator.variables["configure_mrbob.package.git.disabled"]:
-        raise SkipQuestion(u"GIT is disabled, so we skip git related questions.")
+        raise SkipQuestion("GIT is disabled, so we skip git related questions.")
 
 
 def get_mrbob_config_variable(varname, dirname):
@@ -73,7 +73,7 @@ def get_mrbob_config_variable(varname, dirname):
     file_list = os.listdir(dirname)
     if file_name not in file_list:
         return
-    config.readfp(codecs.open(config_path, "r", "utf-8"))
+    config.read_file(codecs.open(config_path, "r", "utf-8"))
     if not config.sections():
         return
     if config.has_option("variables", varname):
@@ -145,7 +145,7 @@ def is_venv_disabled():
 
 
 def generate_mrbob_ini(configurator, directory_path, answers):
-    file_name = u".mrbob"
+    file_name = ".mrbob"
     file_path = directory_path + "/" + file_name
     template = """[mr.bob]
 verbose = False
@@ -166,11 +166,14 @@ package.git.disabled = {4}
         safe_string(answers["package.git.disabled"]),
     )
     if not configurator.variables["configure_mrbob.package.git.disabled"]:
-        template = template + """package.git.init = {0}
+        template = (
+            template
+            + """package.git.init = {0}
 package.git.autocommit = {1}
 """.format(
-            safe_string(answers["package.git.init"]),
-            safe_string(answers["package.git.autocommit"]),
+                safe_string(answers["package.git.init"]),
+                safe_string(answers["package.git.autocommit"]),
+            )
         )
     template = (
         template
@@ -225,6 +228,6 @@ def post_render(configurator, target_directory=None):
         target_directory = configurator.target_directory
     generate_mrbob_ini(configurator, target_directory, mrbob_config)
     echo(
-        u"\nMrbob's settings have been saved to {0}/.mrbob\n".format(target_directory),
+        "\nMrbob's settings have been saved to {0}/.mrbob\n".format(target_directory),
         msg_type="info",
     )

{plonecli-2.4 → plonecli-3.0b1}/plonecli/registry.py

@@ -2,9 +2,8 @@
 
 from __future__ import print_function
 
+import importlib.metadata
 import os
-import pkg_resources
-
 
 try:
     from six.moves.configparser import ConfigParser
@@ -76,7 +75,8 @@ class TemplateRegistry(object):
         self.bob_config = read_bob_config(self.root_folder)
         self.templates = {}
         self.template_infos = {}
-        for entry_point in pkg_resources.iter_entry_points("mrbob_templates"):
+
+        for entry_point in importlib.metadata.entry_points(group="mrbob_templates"):
             template_info_method = entry_point.load()
             self.template_infos[entry_point.name] = template_info_method()
 

{plonecli-2.4 → plonecli-3.0b1}/plonecli.egg-info/PKG-INFO

@@ -1,13 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: plonecli
-Version: 2.4
+Version: 3.0b1
 Summary: A Plone CLI for creating Plone packages
 Home-page: https://github.com/plone/plonecli
 Author: Maik Derstappen
 Author-email: md@derico.de
 License: BSD License
 Keywords: plonecli
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License
@@ -18,23 +17,35 @@ Classifier: Topic :: Software Development :: Quality Assurance
 Classifier: Topic :: Utilities
 Classifier: Environment :: Console
 Classifier: Framework :: Plone
+Classifier: Framework :: Plone :: 6.0
 Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.6
-Provides-Extra: test
-Provides-Extra: dev
 License-File: LICENSE
 License-File: AUTHORS.rst
+Requires-Dist: setuptools<82.0.0
+Requires-Dist: Click>=7.0
+Requires-Dist: click-aliases
+Requires-Dist: mr.bob
+Requires-Dist: bobtemplates.plone>=6.0b15
+Requires-Dist: tox
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: isort>=5.0.0; extra == "test"
+Provides-Extra: dev
+Requires-Dist: tox; extra == "dev"
+Requires-Dist: zest.releaser[recommended]; extra == "dev"
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
 
-.. image:: https://secure.travis-ci.org/plone/plonecli.png?branch=master
-    :target: http://travis-ci.org/plone/plonecli
-
-.. image:: https://coveralls.io/repos/github/plone/plonecli/badge.svg?branch=master
-    :target: https://coveralls.io/github/plone/plonecli?branch=master
-    :alt: Coveralls
+.. image:: https://github.com/plone/plonecli/actions/workflows/python-package.yml/badge.svg
+    :target: https://github.com/plone/plonecli/actions/workflows/python-package.yml
 
 .. image:: https://img.shields.io/pypi/v/plonecli.svg
     :target: https://pypi.python.org/pypi/plonecli/
@@ -43,6 +54,7 @@ License-File: AUTHORS.rst
 .. image:: https://img.shields.io/pypi/pyversions/bobtemplates.plone.svg?style=plastic
     :alt: PyPI - Python Version
 
+
 =========
 Plone CLI
 =========
@@ -204,7 +216,6 @@ Creating A Plone Add-on
       - viewlet
       - vocabulary
       - buildout
-    - theme_package [deprecated] >> Please use the theme_barceloneta subtemplate!
 
     $ plonecli create addon src/collective.todo
 
@@ -331,7 +342,7 @@ Register Your Bobtemplates Package For Plonecli
 
 All mr.bob templates can be registered for plonecli by adding an entry_point to your setup.py.
 
-Here are the entry_points of the bobtemplates.plone package:
+Here are some entry_points of the bobtemplates.plone package:
 
 .. code-block:: python
 
@@ -339,7 +350,6 @@ Here are the entry_points of the bobtemplates.plone package:
         'mrbob_templates': [
             'plone_addon = bobtemplates.plone.bobregistry:plone_addon',
             'plone_buildout = bobtemplates.plone.bobregistry:plone_buildout',  # NOQA E501
-            'plone_theme_package = bobtemplates.plone.bobregistry:plone_theme_package',  # NOQA E501
             'plone_content_type = bobtemplates.plone.bobregistry:plone_content_type',  # NOQA E501
             'plone_view = bobtemplates.plone.bobregistry:plone_view',
             'plone_viewlet = bobtemplates.plone.bobregistry:plone_viewlet',
@@ -411,6 +421,22 @@ This project is licensed under the BSD license.
 History
 =======
 
+3.0b1 (2026-04-14)
+------------------
+
+- Support only python 3.11 - 3.14
+  [erral]
+
+- Require setuptools < 82.0.0
+  [erral]
+
+
+2.5 (2022-11-03)
+----------------
+
+- Provide a way to pass a mrbob configuration file
+  [erral]
+
 2.4 (2022-10-10)
 ----------------
 
@@ -645,5 +671,3 @@ History
 
 - initital version with list templates support and bobtemplates.plone integration
   [MrTango, tmassman, Gomez]
-
-

{plonecli-2.4 → plonecli-3.0b1}/plonecli.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ MANIFEST.in
 README.rst
 plonecli.rst
 plonecli_autocomplete.sh
+requirements.txt
 setup.cfg
 setup.py
 tox.ini

{plonecli-2.4 → plonecli-3.0b1}/plonecli.egg-info/entry_points.txt

@@ -1,3 +1,2 @@
 [console_scripts]
 plonecli = plonecli.cli:cli
-

{plonecli-2.4 → plonecli-3.0b1}/plonecli.egg-info/requires.txt

@@ -1,4 +1,4 @@
-setuptools
+setuptools<82.0.0
 Click>=7.0
 click-aliases
 mr.bob

plonecli-3.0b1/requirements.txt

@@ -0,0 +1,2 @@
+Sphinx
+-e .

{plonecli-2.4 → plonecli-3.0b1}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = plonecli
-version = 2.4
+version = 3.0b1
 description = A Plone CLI for creating Plone packages
 long_description = file: README.rst, CHANGES.rst
 keywords = plone cli bobtemplates mrbob zopeskel development
@@ -19,11 +19,12 @@ classifiers =
 	Topic :: Utilities
 	Environment :: Console
 	Framework :: Plone
+	Framework :: Plone :: 6.0
 	Intended Audience :: Developers
-	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.6
-	Programming Language :: Python :: 3.7
-	Programming Language :: Python :: 3.8
+	Programming Language :: Python :: 3.11
+	Programming Language :: Python :: 3.12
+	Programming Language :: Python :: 3.13
+	Programming Language :: Python :: 3.14
 
 [bumpversion]
 current_version = 0.1.1
@@ -39,7 +40,7 @@ universal = 1
 
 [flake8]
 exclude = docs,tmp,tmpdist,local,lib,build,bin,dist,include,man
-ignore = W503, C812, E501, T001  # E203, E266
+ignore = W503, C812, E501, T001
 max-line-length = 88
 max-complexity = 18
 select = B,C,E,F,W,T4,B
@@ -55,7 +56,7 @@ ignore =
 	.gitattributes
 
 [isort]
-profile = black
+profile = plone
 multi_line_output = 3
 force_alphabetical_sort = True
 force_single_line = True

{plonecli-2.4 → plonecli-3.0b1}/setup.py

@@ -20,7 +20,7 @@ setup(
     include_package_data=True,
     python_requires=">=3.6",
     install_requires=[
-        "setuptools",
+        "setuptools<82.0.0",
         "Click>=7.0",
         "click-aliases",
         "mr.bob",

plonecli-3.0b1/tests/conftest.py

@@ -0,0 +1,11 @@
+import os
+import pytest
+import sys
+
+
+@pytest.fixture(scope="module")
+def plonecli_bin():
+    bin_path = os.path.abspath(os.path.dirname(sys.argv[0]))
+    plonecli_bin = bin_path + "/plonecli"
+    print("plonebin path: " + plonecli_bin)
+    yield plonecli_bin

{plonecli-2.4 → plonecli-3.0b1}/tests/test_plonecli.py

@@ -70,9 +70,11 @@ git_init = y
         context.obj["target_dir"] = os.path.dirname(os.path.abspath("bobtemplate.cfg"))
 
         test_command_result_a = runner.invoke(
-            cli.run_test, args=["--all"], obj=context.obj,
+            cli.run_test,
+            args=["--all"],
+            obj=context.obj,
         )
-        assert u"\nRUN: ./bin/test --all" in test_command_result_a.output
+        assert "\nRUN: ./bin/test --all" in test_command_result_a.output
 
         test_command_result_t_a = runner.invoke(
             cli.run_test,
@@ -80,15 +82,17 @@ git_init = y
             obj=context.obj,
         )
         assert (
-            u"./bin/test --test  src/collective/todo/tests/test_robot.py --all"
+            "./bin/test --test  src/collective/todo/tests/test_robot.py --all"
             in test_command_result_t_a.output
         )  # NOQA: E501
 
         test_command_result_s_a = runner.invoke(
-            cli.run_test, args=["-s collective.todo", "-a"], obj=context.obj,
+            cli.run_test,
+            args=["-s collective.todo", "-a"],
+            obj=context.obj,
         )
         assert (
-            u"./bin/test --package  collective.todo --all"
+            "./bin/test --package  collective.todo --all"
             in test_command_result_s_a.output
         )  # NOQA: E501
 
@@ -98,7 +102,7 @@ git_init = y
             obj=context.obj,
         )
         assert (
-            u"./bin/test --test  src/collective/todo/tests/test_robot.py --package  collective.todo"
+            "./bin/test --test  src/collective/todo/tests/test_robot.py --package  collective.todo"
             in test_command_result_t_s.output
         )  # NOQA: E501
 
@@ -112,7 +116,7 @@ git_init = y
             obj=context.obj,
         )
         assert (
-            u"./bin/test --test  src/collective/todo/tests/test_robot.py --package  collective.todo --all"
+            "./bin/test --test  src/collective/todo/tests/test_robot.py --package  collective.todo --all"
             in test_command_result.output
         )  # NOQA: E501
 
@@ -142,7 +146,7 @@ git_init = y
     with open("bobtemplate.cfg", "w") as f:
         f.write(template)
     result = subprocess.check_output([plonecli_bin, "build"], cwd=target_path)
-    assert u"\nRUN: python3 -m venv venv" in result.decode()
+    assert "\nRUN: python3 -m venv venv" in result.decode()
 
 
 @pytest.mark.skipif(sys.version_info < (3, 7), reason="requires explicitly python3.7")
@@ -171,9 +175,10 @@ python = python3
         f.write(template)
 
     result = subprocess.check_output(
-        [plonecli_bin, "build", "-p", "python3"], cwd=target_path,
+        [plonecli_bin, "build", "-p", "python3"],
+        cwd=target_path,
     )
-    assert u"\nRUN: python3 -m venv venv" in result.decode()
+    assert "\nRUN: python3 -m venv venv" in result.decode()
 
 
 @pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3")
@@ -203,32 +208,3 @@ python = python3
 
     result = subprocess.check_output([plonecli_bin, "build"], cwd=target_path)
     assert "\nRUN: python3 -m venv venv" in result.decode()
-
-
-@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3")
-def test_plonecli_build_target_py27(tmpdir, plonecli_bin):
-    target_path = tmpdir.strpath
-    os.chdir(target_path)
-    template = """
-setuptools==40.8.0
-zc.buildout==2.13.1
-"""
-    with open("requirements.txt", "w") as f:
-        f.write(template)
-
-    template = """[buildout]
-parts =
-"""
-    with open("buildout.cfg", "w") as f:
-        f.write(template)
-
-    template = """[main]
-version = 5.2.2
-template = plone_addon
-python = python2.7
-"""
-    with open("bobtemplate.cfg", "w") as f:
-        f.write(template)
-
-    result = subprocess.check_output([plonecli_bin, "build"], cwd=target_path)
-    assert "\nRUN: virtualenv -p python2.7 venv" in result.decode()

{plonecli-2.4 → plonecli-3.0b1}/tests/test_registry.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 """Tests for `plonecli` package."""
 
@@ -16,14 +15,14 @@ def test_list_templates(tmpdir):
     os.chdir(tmpdir.strpath)
     reg = TemplateRegistry()
     template_str = reg.list_templates()
-    assert '- buildout' in template_str
-    assert '- addon' in template_str
-    assert '- theme' in template_str
-    assert '- content_type' in template_str
+    assert "- buildout" in template_str
+    assert "- addon" in template_str
+    assert "- theme" in template_str
+    assert "- content_type" in template_str
 
 
 def test_get_package_root(tmpdir):
-    target_dir = tmpdir.strpath + '/collective.foo'
+    target_dir = tmpdir.strpath + "/collective.foo"
     os.mkdir(target_dir)
 
     package_root = get_package_root()
@@ -34,7 +33,7 @@ def test_get_package_root(tmpdir):
 check=True
 
 """
-    with open(os.path.join(target_dir + '/bobtemplate.cfg'), 'w') as f:
+    with open(os.path.join(target_dir + "/bobtemplate.cfg"), "w") as f:
         f.write(template)
 
     package_root = get_package_root()
@@ -48,7 +47,7 @@ check=True
 template=plone_addon
 version=5.1-latest
 """
-    with open(os.path.join(target_dir + '/bobtemplate.cfg'), 'w') as f:
+    with open(os.path.join(target_dir + "/bobtemplate.cfg"), "w") as f:
         f.write(template)
 
     package_root = get_package_root()
@@ -56,7 +55,7 @@ version=5.1-latest
 
 
 def test_bob_config(tmpdir):
-    target_dir = tmpdir.strpath + '/collective.foo'
+    target_dir = tmpdir.strpath + "/collective.foo"
     os.mkdir(target_dir)
     os.chdir(target_dir)
     template = """[main]
@@ -64,16 +63,15 @@ template=plone_addon
 version=5.1-latest
 python=python2.7
 """
-    with open(os.path.join(target_dir + '/bobtemplate.cfg'), 'w') as f:
+    with open(os.path.join(target_dir + "/bobtemplate.cfg"), "w") as f:
         f.write(template)
     reg = TemplateRegistry()
     bob_config = read_bob_config(reg.root_folder)
-    assert bob_config.python == 'python2.7'
+    assert bob_config.python == "python2.7"
 
 
 def test_get_subtemplates(tmpdir):
-    """ test get_templates inside of a package
-    """
+    """test get_templates inside of a package"""
     template = """[check-manifest]
 check=True
 
@@ -81,33 +79,30 @@ check=True
 template=plone_addon
 version=5.1-latest
 """
-    target_dir = tmpdir.strpath + '/collective.foo'
+    target_dir = tmpdir.strpath + "/collective.foo"
     os.mkdir(target_dir)
-    with open(os.path.join(target_dir + '/bobtemplate.cfg'), 'w') as f:
+    with open(os.path.join(target_dir + "/bobtemplate.cfg"), "w") as f:
         f.write(template)
     os.chdir(target_dir)
     reg = TemplateRegistry()
     templates = reg.get_templates()
-    assert 'content_type' in templates
-    assert 'theme' in templates
-    assert 'vocabulary' in templates
+    assert "content_type" in templates
+    assert "theme" in templates
+    assert "vocabulary" in templates
 
 
 def test_get_templates(tmpdir):
-    """ test get_templates outside of a package
-    """
+    """test get_templates outside of a package"""
     os.chdir(tmpdir.strpath)
     reg = TemplateRegistry()
     templates = reg.get_templates()
-    assert 'addon' in templates
-    assert 'theme_package' in templates
-    assert 'buildout' in templates
+    assert "addon" in templates
+    assert "buildout" in templates
 
 
 def test_resolve_template_name(tmpdir):
-    """ test resolving template names from plonecli alias
-    """
-    plonecli_alias = 'addon'
+    """test resolving template names from plonecli alias"""
+    plonecli_alias = "addon"
     reg = TemplateRegistry()
     template_name = reg.resolve_template_name(plonecli_alias)
-    assert 'bobtemplates.plone:addon' == template_name
+    assert "bobtemplates.plone:addon" == template_name

{plonecli-2.4 → plonecli-3.0b1}/tox.ini

@@ -1,16 +1,17 @@
 [tox]
 envlist =
-    {py36,py37,py38},
-    {lint-py36,lint-py37,lint-py38},
+    {py311,py312,py313,py314},
+    {lint-py311,lint-py312,lint-py313,lint-py314},
     coverage-report,
 
 skip_missing_interpreters = True
 
 [travis]
 python =
-    3.6: py36
-    3.7: py37
-    3.8: py38
+    3.11: py311
+    3.12: py312
+    3.13: py313
+    3.14: py314
 
 
 [testenv]
@@ -19,9 +20,10 @@ extras =
     test
 
 basepython:
-    py36: python3.6
-    py37: python3.7
-    py38: python3.8
+    py311: python3.11
+    py312: python3.12
+    py313: python3.13
+    py314: python3.14
 #    pypy: pypy
 
 commands =
@@ -46,12 +48,12 @@ deps =
     pytest-mock
     pytest-html
 
-whitelist_externals =
+allowlist_externals =
     mkdir
 
 [testenv:coverage-report]
 usedevelop = True
-basepython = python3.7
+basepython = python3.13
 deps =
     coverage
 
@@ -68,7 +70,7 @@ commands =
     coverage xml
 
 [testenv:isort-apply]
-basepython = python3.7
+basepython = python3.13
 deps =
     isort
 
@@ -76,7 +78,7 @@ commands =
     isort {toxinidir}/plonecli setup.py tests
 
 [testenv:autopep8]
-basepython = python3.7
+basepython = python3.13
 skip_install = true
 deps =
     autopep8
@@ -107,7 +109,6 @@ deps =
     flake8-quotes
     flake8-string-format
     flake8-todo
-    flake8_strict
 
 commands =
     mkdir -p {toxinidir}/_build/reports/flake8
@@ -118,22 +119,29 @@ commands =
 whitelist_externals =
     mkdir
 
-[testenv:lint-py36]
-basepython = python3.6
+[testenv:lint-py311]
+basepython = python3.11
+skip_install = true
+deps = {[lint]deps}
+commands = {[lint]commands}
+whitelist_externals = {[lint]whitelist_externals}
+
+[testenv:lint-py312]
+basepython = python3.12
 skip_install = true
 deps = {[lint]deps}
 commands = {[lint]commands}
 whitelist_externals = {[lint]whitelist_externals}
 
-[testenv:lint-py37]
-basepython = python3.7
+[testenv:lint-py313]
+basepython = python3.13
 skip_install = true
 deps = {[lint]deps}
 commands = {[lint]commands}
 whitelist_externals = {[lint]whitelist_externals}
 
-[testenv:lint-py38]
-basepython = python3.8
+[testenv:lint-py314]
+basepython = python3.14
 skip_install = true
 deps = {[lint]deps}
 commands = {[lint]commands}

plonecli-2.4/tests/conftest.py

@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import os
-import pytest
-import sys
-
-
-@pytest.fixture(scope='module')
-def plonecli_bin():
-    bin_path = os.path.abspath(os.path.dirname(sys.argv[0]))
-    plonecli_bin = bin_path + '/plonecli'
-    print('plonebin path: ' + plonecli_bin)
-    yield plonecli_bin