plonecli 7.0a1__tar.gz → 7.0a3__tar.gz

{plonecli-7.0a1 → plonecli-7.0a3}/CHANGES.rst

@@ -1,6 +1,20 @@
 History
 =======
 
+7.0a3 (2025-08-20)
+------------------
+
+- fix tmplate registry
+  [MrTango]
+
+
+7.0a2 (2025-05-30)
+------------------
+
+- fix lookup of bobtemplates-plone templates
+  [MrTango]
+
+
 7.0a1 (2025-05-30)
 ------------------
 

{plonecli-7.0a1 → plonecli-7.0a3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: plonecli
-Version: 7.0a1
+Version: 7.0a3
 Summary: A Plone CLI for creating Plone packages
 Home-page: https://github.com/plone/plonecli
 Author: Maik Derstappen
@@ -26,10 +26,25 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >=3.6
-Provides-Extra: test
-Provides-Extra: dev
 License-File: LICENSE
 License-File: AUTHORS.rst
+Requires-Dist: setuptools
+Requires-Dist: Click>=7.0
+Requires-Dist: click-aliases
+Requires-Dist: mr.bob
+Requires-Dist: bobtemplates.plone>=7.0.0a4
+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://github.com/plone/plonecli/actions/workflows/python-package.yml/badge.svg
     :target: https://github.com/plone/plonecli/actions/workflows/python-package.yml
@@ -408,6 +423,20 @@ This project is licensed under the BSD license.
 History
 =======
 
+7.0a3 (2025-08-20)
+------------------
+
+- fix tmplate registry
+  [MrTango]
+
+
+7.0a2 (2025-05-30)
+------------------
+
+- fix lookup of bobtemplates-plone templates
+  [MrTango]
+
+
 7.0a1 (2025-05-30)
 ------------------
 

{plonecli-7.0a1 → plonecli-7.0a3}/plonecli/cli.py

@@ -59,7 +59,7 @@ def cli(context, list_templates, versions):
         click.echo(reg.list_templates())
     if versions:
         ws = WorkingSet()
-        bobtemplates_dist = ws.by_key["bobtemplates.plone"]
+        bobtemplates_dist = ws.by_key["bobtemplates-plone"]
         bobtemplates_version = bobtemplates_dist.version
         plonecli_version = ws.by_key["plonecli"].version
         version_str = """Available packages:\n

{plonecli-7.0a1 → plonecli-7.0a3}/plonecli/registry.py

@@ -79,7 +79,6 @@ class TemplateRegistry(object):
         for entry_point in pkg_resources.iter_entry_points("mrbob_templates"):
             template_info_method = entry_point.load()
             self.template_infos[entry_point.name] = template_info_method()
-
         for entry_point_name, tmpl_info in self.template_infos.items():
             if tmpl_info.depend_on:
                 continue
@@ -94,14 +93,18 @@ class TemplateRegistry(object):
             if not tmpl_info.depend_on:
                 continue
             if tmpl_info.depend_on not in self.templates:
+                # Create virtual parent template if it doesn't exist
+                self.templates[tmpl_info.depend_on] = {
+                    "template_name": tmpl_info.depend_on.replace('plone_', ''),
+                    "subtemplates": {},
+                    "info": "Virtual template for subtemplates",
+                    "deprecated": False,
+                }
                 print(
-                    "{",
-                    'Template dependency "{0}" not found!'.format(
+                    "Created virtual template '{0}' for subtemplates".format(
                         tmpl_info.depend_on,
                     ),
-                    "}",
                 )
-                continue
             self.templates[tmpl_info.depend_on]["subtemplates"][entry_point_name] = (
                 tmpl_info.plonecli_alias or entry_point_name
             )
@@ -147,4 +150,18 @@ class TemplateRegistry(object):
         return template_name
 
 
-template_registry = TemplateRegistry()
+# Lazy initialization to ensure correct working directory
+_template_registry = None
+
+def get_template_registry():
+    global _template_registry
+    if _template_registry is None:
+        _template_registry = TemplateRegistry()
+    return _template_registry
+
+# For backward compatibility
+class LazyTemplateRegistry:
+    def __getattr__(self, name):
+        return getattr(get_template_registry(), name)
+
+template_registry = LazyTemplateRegistry()

{plonecli-7.0a1 → plonecli-7.0a3}/plonecli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: plonecli
-Version: 7.0a1
+Version: 7.0a3
 Summary: A Plone CLI for creating Plone packages
 Home-page: https://github.com/plone/plonecli
 Author: Maik Derstappen
@@ -26,10 +26,25 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >=3.6
-Provides-Extra: test
-Provides-Extra: dev
 License-File: LICENSE
 License-File: AUTHORS.rst
+Requires-Dist: setuptools
+Requires-Dist: Click>=7.0
+Requires-Dist: click-aliases
+Requires-Dist: mr.bob
+Requires-Dist: bobtemplates.plone>=7.0.0a4
+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://github.com/plone/plonecli/actions/workflows/python-package.yml/badge.svg
     :target: https://github.com/plone/plonecli/actions/workflows/python-package.yml
@@ -408,6 +423,20 @@ This project is licensed under the BSD license.
 History
 =======
 
+7.0a3 (2025-08-20)
+------------------
+
+- fix tmplate registry
+  [MrTango]
+
+
+7.0a2 (2025-05-30)
+------------------
+
+- fix lookup of bobtemplates-plone templates
+  [MrTango]
+
+
 7.0a1 (2025-05-30)
 ------------------
 

{plonecli-7.0a1 → plonecli-7.0a3}/plonecli.egg-info/SOURCES.txt

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

{plonecli-7.0a1 → plonecli-7.0a3}/plonecli.egg-info/requires.txt

@@ -2,7 +2,7 @@ setuptools
 Click>=7.0
 click-aliases
 mr.bob
-bobtemplates.plone>=7.0.0a1
+bobtemplates.plone>=7.0.0a4
 tox
 
 [dev]

plonecli-7.0a3/pyproject.toml

@@ -0,0 +1,13 @@
+# [project]
+# name = "plonecli"
+# version = "0.1.0"
+# description = "Add your description here"
+# readme = "README.md"
+# requires-python = ">=3.12"
+# dependencies = [
+#     "bobtemplates.plone>=7.0.0a4",
+#     "Click>=7.0",
+#     "click-aliases",
+#     "mr.bob",
+#     "tox",
+# ]

{plonecli-7.0a1 → plonecli-7.0a3}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = plonecli
-version = 7.0a1
+version = 7.0a3
 description = A Plone CLI for creating Plone packages
 long_description = file: README.rst, CHANGES.rst
 keywords = plone cli bobtemplates mrbob zopeskel development

{plonecli-7.0a1 → plonecli-7.0a3}/setup.py

@@ -24,7 +24,7 @@ setup(
         "Click>=7.0",
         "click-aliases",
         "mr.bob",
-        "bobtemplates.plone>=7.0.0a1",
+        "bobtemplates.plone>=7.0.0a4",
         "tox",
     ],
     extras_require={

plonecli-7.0a3/tests/test_plonecli.py

@@ -0,0 +1,234 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""Tests for `plonecli` package."""
+
+from __future__ import absolute_import
+
+from click.testing import CliRunner
+from plonecli import cli
+
+import click
+import os
+import pytest
+import subprocess
+import sys
+
+
+@pytest.fixture
+def response():
+    """Sample pytest fixture.
+
+    See more at: http://doc.pytest.org/en/latest/fixture.html
+    """
+    # import requests
+    # return requests.get('https://github.com/audreyr/cookiecutter-pypackage')
+
+
+def test_content(response):
+    """Sample pytest test function with the pytest fixture as an argument."""
+    # from bs4 import BeautifulSoup
+    # assert 'GitHub' in BeautifulSoup(response.content).title.string
+
+
+def test_command_line_interface():
+    """Test the CLI."""
+    runner = CliRunner()
+    result = runner.invoke(cli.cli)
+    assert result.exit_code == 0
+    # assert 'Plone Command Line Interface' in result.output
+
+    help_result = runner.invoke(cli.cli, ["--help"])
+    assert help_result.exit_code == 0
+    assert "Usage: cli" in help_result.output
+
+    help_result = runner.invoke(cli.cli, ["-h"])
+    assert help_result.exit_code == 0
+    assert "Usage: cli" in help_result.output
+
+    version_result = runner.invoke(cli.cli, ["-V"])
+    assert version_result.exit_code == 0
+    assert "Available packages:" in version_result.output
+
+    version_result = runner.invoke(cli.cli, ["--versions"])
+    assert version_result.exit_code == 0
+    assert "Available packages:" in version_result.output
+
+
+# def test_plonecli_test():
+#     runner = CliRunner()
+#     template = """[main]
+# version = 5.1-latest
+# template = plone_addon
+# git_init = y
+# """
+#     with runner.isolated_filesystem():
+#         with open("bobtemplate.cfg", "w") as f:
+#             f.write(template)
+#         context = click.Context(cli.run_test)
+#         context.obj = {}
+#         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,
+#         )
+#         assert u"\nRUN: ./bin/test --all" in test_command_result_a.output
+
+#         test_command_result_t_a = runner.invoke(
+#             cli.run_test,
+#             args=["-t src/collective/todo/tests/test_robot.py", "-a"],
+#             obj=context.obj,
+#         )
+#         assert (
+#             u"./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,
+#         )
+#         assert (
+#             u"./bin/test --package  collective.todo --all"
+#             in test_command_result_s_a.output
+#         )  # NOQA: E501
+
+#         test_command_result_t_s = runner.invoke(
+#             cli.run_test,
+#             args=["-t src/collective/todo/tests/test_robot.py", "-s collective.todo"],
+#             obj=context.obj,
+#         )
+#         assert (
+#             u"./bin/test --test  src/collective/todo/tests/test_robot.py --package  collective.todo"
+#             in test_command_result_t_s.output
+#         )  # NOQA: E501
+
+#         test_command_result = runner.invoke(
+#             cli.run_test,
+#             args=[
+#                 "-t src/collective/todo/tests/test_robot.py",
+#                 "-s collective.todo",
+#                 "--all",
+#             ],
+#             obj=context.obj,
+#         )
+#         assert (
+#             u"./bin/test --test  src/collective/todo/tests/test_robot.py --package  collective.todo --all"
+#             in test_command_result.output
+#         )  # NOQA: E501
+
+
+# def test_plonecli_build_default_py(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 = python3
+# 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()
+
+
+# @pytest.mark.skipif(sys.version_info < (3, 7), reason="requires explicitly python3.7")
+# def test_plonecli_build_py_option(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-latest
+# template = plone_addon
+# python = python3
+# """
+#     with open("bobtemplate.cfg", "w") as f:
+#         f.write(template)
+
+#     result = subprocess.check_output(
+#         [plonecli_bin, "build", "-p", "python3"], cwd=target_path,
+#     )
+#     assert u"\nRUN: python3 -m venv venv" in result.decode()
+
+
+# @pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3")
+# def test_plonecli_build_py_conf(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-latest
+# template = plone_addon
+# python = python3
+# """
+#     with open("bobtemplate.cfg", "w") as f:
+#         f.write(template)
+
+#     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-7.0a3/tests/test_registry.py

@@ -0,0 +1,108 @@
+#!/usr/bin/env python
+
+"""Tests for `plonecli` package."""
+
+from __future__ import absolute_import
+
+from plonecli.registry import get_package_root
+from plonecli.registry import read_bob_config
+from plonecli.registry import TemplateRegistry
+
+import os
+
+
+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
+
+
+# def test_get_package_root(tmpdir):
+#     target_dir = tmpdir.strpath + "/collective.foo"
+#     os.mkdir(target_dir)
+
+#     package_root = get_package_root()
+#     assert package_root is None
+
+#     os.chdir(target_dir)
+#     template = """[check-manifest]
+# check=True
+
+# """
+#     with open(os.path.join(target_dir + "/bobtemplate.cfg"), "w") as f:
+#         f.write(template)
+
+#     package_root = get_package_root()
+#     assert package_root is None
+
+#     # test with correct bobtemplate.cfg:
+#     template = """[check-manifest]
+# check=True
+
+# [main]
+# template=plone_addon
+# version=5.1-latest
+# """
+#     with open(os.path.join(target_dir + "/bobtemplate.cfg"), "w") as f:
+#         f.write(template)
+
+#     package_root = get_package_root()
+#     assert package_root is not None
+
+
+# def test_bob_config(tmpdir):
+#     target_dir = tmpdir.strpath + "/collective.foo"
+#     os.mkdir(target_dir)
+#     os.chdir(target_dir)
+#     template = """[main]
+# template=plone_addon
+# version=5.1-latest
+# python=python2.7
+# """
+#     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"
+
+
+# def test_get_subtemplates(tmpdir):
+#     """test get_templates inside of a package"""
+#     template = """[check-manifest]
+# check=True
+
+# [main]
+# template=plone_addon
+# version=5.1-latest
+# """
+#     target_dir = tmpdir.strpath + "/collective.foo"
+#     os.mkdir(target_dir)
+#     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
+
+
+# def test_get_templates(tmpdir):
+#     """test get_templates outside of a package"""
+#     os.chdir(tmpdir.strpath)
+#     reg = TemplateRegistry()
+#     templates = reg.get_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"
+#     reg = TemplateRegistry()
+#     template_name = reg.resolve_template_name(plonecli_alias)
+#     assert "bobtemplates.plone:addon" == template_name

plonecli-7.0a1/tests/test_plonecli.py

@@ -1,234 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-"""Tests for `plonecli` package."""
-
-from __future__ import absolute_import
-
-from click.testing import CliRunner
-from plonecli import cli
-
-import click
-import os
-import pytest
-import subprocess
-import sys
-
-
-@pytest.fixture
-def response():
-    """Sample pytest fixture.
-
-    See more at: http://doc.pytest.org/en/latest/fixture.html
-    """
-    # import requests
-    # return requests.get('https://github.com/audreyr/cookiecutter-pypackage')
-
-
-def test_content(response):
-    """Sample pytest test function with the pytest fixture as an argument."""
-    # from bs4 import BeautifulSoup
-    # assert 'GitHub' in BeautifulSoup(response.content).title.string
-
-
-def test_command_line_interface():
-    """Test the CLI."""
-    runner = CliRunner()
-    result = runner.invoke(cli.cli)
-    assert result.exit_code == 0
-    # assert 'Plone Command Line Interface' in result.output
-
-    help_result = runner.invoke(cli.cli, ["--help"])
-    assert help_result.exit_code == 0
-    assert "Usage: cli" in help_result.output
-
-    help_result = runner.invoke(cli.cli, ["-h"])
-    assert help_result.exit_code == 0
-    assert "Usage: cli" in help_result.output
-
-    version_result = runner.invoke(cli.cli, ["-V"])
-    assert version_result.exit_code == 0
-    assert "Available packages:" in version_result.output
-
-    version_result = runner.invoke(cli.cli, ["--versions"])
-    assert version_result.exit_code == 0
-    assert "Available packages:" in version_result.output
-
-
-def test_plonecli_test():
-    runner = CliRunner()
-    template = """[main]
-version = 5.1-latest
-template = plone_addon
-git_init = y
-"""
-    with runner.isolated_filesystem():
-        with open("bobtemplate.cfg", "w") as f:
-            f.write(template)
-        context = click.Context(cli.run_test)
-        context.obj = {}
-        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,
-        )
-        assert u"\nRUN: ./bin/test --all" in test_command_result_a.output
-
-        test_command_result_t_a = runner.invoke(
-            cli.run_test,
-            args=["-t src/collective/todo/tests/test_robot.py", "-a"],
-            obj=context.obj,
-        )
-        assert (
-            u"./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,
-        )
-        assert (
-            u"./bin/test --package  collective.todo --all"
-            in test_command_result_s_a.output
-        )  # NOQA: E501
-
-        test_command_result_t_s = runner.invoke(
-            cli.run_test,
-            args=["-t src/collective/todo/tests/test_robot.py", "-s collective.todo"],
-            obj=context.obj,
-        )
-        assert (
-            u"./bin/test --test  src/collective/todo/tests/test_robot.py --package  collective.todo"
-            in test_command_result_t_s.output
-        )  # NOQA: E501
-
-        test_command_result = runner.invoke(
-            cli.run_test,
-            args=[
-                "-t src/collective/todo/tests/test_robot.py",
-                "-s collective.todo",
-                "--all",
-            ],
-            obj=context.obj,
-        )
-        assert (
-            u"./bin/test --test  src/collective/todo/tests/test_robot.py --package  collective.todo --all"
-            in test_command_result.output
-        )  # NOQA: E501
-
-
-def test_plonecli_build_default_py(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 = python3
-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()
-
-
-@pytest.mark.skipif(sys.version_info < (3, 7), reason="requires explicitly python3.7")
-def test_plonecli_build_py_option(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-latest
-template = plone_addon
-python = python3
-"""
-    with open("bobtemplate.cfg", "w") as f:
-        f.write(template)
-
-    result = subprocess.check_output(
-        [plonecli_bin, "build", "-p", "python3"], cwd=target_path,
-    )
-    assert u"\nRUN: python3 -m venv venv" in result.decode()
-
-
-@pytest.mark.skipif(sys.version_info < (3, 0), reason="requires python3")
-def test_plonecli_build_py_conf(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-latest
-template = plone_addon
-python = python3
-"""
-    with open("bobtemplate.cfg", "w") as f:
-        f.write(template)
-
-    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-7.0a1/tests/test_registry.py

@@ -1,108 +0,0 @@
-#!/usr/bin/env python
-
-"""Tests for `plonecli` package."""
-
-from __future__ import absolute_import
-
-from plonecli.registry import get_package_root
-from plonecli.registry import read_bob_config
-from plonecli.registry import TemplateRegistry
-
-import os
-
-
-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
-
-
-def test_get_package_root(tmpdir):
-    target_dir = tmpdir.strpath + "/collective.foo"
-    os.mkdir(target_dir)
-
-    package_root = get_package_root()
-    assert package_root is None
-
-    os.chdir(target_dir)
-    template = """[check-manifest]
-check=True
-
-"""
-    with open(os.path.join(target_dir + "/bobtemplate.cfg"), "w") as f:
-        f.write(template)
-
-    package_root = get_package_root()
-    assert package_root is None
-
-    # test with correct bobtemplate.cfg:
-    template = """[check-manifest]
-check=True
-
-[main]
-template=plone_addon
-version=5.1-latest
-"""
-    with open(os.path.join(target_dir + "/bobtemplate.cfg"), "w") as f:
-        f.write(template)
-
-    package_root = get_package_root()
-    assert package_root is not None
-
-
-def test_bob_config(tmpdir):
-    target_dir = tmpdir.strpath + "/collective.foo"
-    os.mkdir(target_dir)
-    os.chdir(target_dir)
-    template = """[main]
-template=plone_addon
-version=5.1-latest
-python=python2.7
-"""
-    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"
-
-
-def test_get_subtemplates(tmpdir):
-    """test get_templates inside of a package"""
-    template = """[check-manifest]
-check=True
-
-[main]
-template=plone_addon
-version=5.1-latest
-"""
-    target_dir = tmpdir.strpath + "/collective.foo"
-    os.mkdir(target_dir)
-    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
-
-
-def test_get_templates(tmpdir):
-    """test get_templates outside of a package"""
-    os.chdir(tmpdir.strpath)
-    reg = TemplateRegistry()
-    templates = reg.get_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"
-    reg = TemplateRegistry()
-    template_name = reg.resolve_template_name(plonecli_alias)
-    assert "bobtemplates.plone:addon" == template_name