From 5fa75e6d5c6469e4be0e0cf7b283923548b9d8b0 Mon Sep 17 00:00:00 2001 From: MrTango Date: Thu, 8 Feb 2024 19:37:16 +0200 Subject: [PATCH] cleanup --- src/collective/smtpssl/browser/__init__.py | 0 src/collective/smtpssl/browser/configure.zcml | 21 ------------- .../smtpssl/browser/overrides/.gitkeep | 0 .../smtpssl/browser/static/.gitkeep | 0 src/collective/smtpssl/configure.zcml | 1 - .../smtpssl/profiles/default/catalog.xml | 4 --- .../profiles/default/registry/main.xml | 8 ----- .../smtpssl/profiles/default/rolemap.xml | 7 ----- src/collective/smtpssl/testing.py | 24 +++++---------- src/collective/smtpssl/tests/test_robot.py | 30 ------------------- test_plone60.cfg | 26 ++++++++++++++++ tox.ini | 2 +- 12 files changed, 35 insertions(+), 88 deletions(-) delete mode 100644 src/collective/smtpssl/browser/__init__.py delete mode 100644 src/collective/smtpssl/browser/configure.zcml delete mode 100644 src/collective/smtpssl/browser/overrides/.gitkeep delete mode 100644 src/collective/smtpssl/browser/static/.gitkeep delete mode 100644 src/collective/smtpssl/profiles/default/catalog.xml delete mode 100644 src/collective/smtpssl/profiles/default/registry/main.xml delete mode 100644 src/collective/smtpssl/profiles/default/rolemap.xml delete mode 100644 src/collective/smtpssl/tests/test_robot.py diff --git a/src/collective/smtpssl/browser/__init__.py b/src/collective/smtpssl/browser/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/collective/smtpssl/browser/configure.zcml b/src/collective/smtpssl/browser/configure.zcml deleted file mode 100644 index 9100bf5..0000000 --- a/src/collective/smtpssl/browser/configure.zcml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - diff --git a/src/collective/smtpssl/browser/overrides/.gitkeep b/src/collective/smtpssl/browser/overrides/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/src/collective/smtpssl/browser/static/.gitkeep b/src/collective/smtpssl/browser/static/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/src/collective/smtpssl/configure.zcml b/src/collective/smtpssl/configure.zcml index bad1a28..efd51b9 100644 --- a/src/collective/smtpssl/configure.zcml +++ b/src/collective/smtpssl/configure.zcml @@ -17,7 +17,6 @@ - - - - diff --git a/src/collective/smtpssl/profiles/default/registry/main.xml b/src/collective/smtpssl/profiles/default/registry/main.xml deleted file mode 100644 index f2cca4c..0000000 --- a/src/collective/smtpssl/profiles/default/registry/main.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/src/collective/smtpssl/profiles/default/rolemap.xml b/src/collective/smtpssl/profiles/default/rolemap.xml deleted file mode 100644 index 0a24e7e..0000000 --- a/src/collective/smtpssl/profiles/default/rolemap.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/collective/smtpssl/testing.py b/src/collective/smtpssl/testing.py index 2d13259..811c5d8 100644 --- a/src/collective/smtpssl/testing.py +++ b/src/collective/smtpssl/testing.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- -from plone.app.robotframework.testing import REMOTE_LIBRARY_BUNDLE_FIXTURE -from plone.app.testing import applyProfile -from plone.app.testing import FunctionalTesting -from plone.app.testing import IntegrationTesting -from plone.app.testing import PLONE_FIXTURE -from plone.app.testing import PloneSandboxLayer -from plone.testing import z2 - import collective.smtpssl +from plone.app.testing import ( + PLONE_FIXTURE, + FunctionalTesting, + IntegrationTesting, + PloneSandboxLayer, + applyProfile, +) +from plone.testing import z2 class CollectiveSmtpsslLayer(PloneSandboxLayer): @@ -43,11 +43,3 @@ def setUpPloneSite(self, portal): ) -COLLECTIVE_SMTPSSL_ACCEPTANCE_TESTING = FunctionalTesting( - bases=( - COLLECTIVE_SMTPSSL_FIXTURE, - REMOTE_LIBRARY_BUNDLE_FIXTURE, - z2.ZSERVER_FIXTURE, - ), - name='CollectiveSmtpsslLayer:AcceptanceTesting', -) diff --git a/src/collective/smtpssl/tests/test_robot.py b/src/collective/smtpssl/tests/test_robot.py deleted file mode 100644 index 4c5baa9..0000000 --- a/src/collective/smtpssl/tests/test_robot.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -from collective.smtpssl.testing import ( # noqa: E501 - COLLECTIVE_SMTPSSL_ACCEPTANCE_TESTING, -) -from plone.app.testing import ROBOT_TEST_LEVEL -from plone.testing import layered - -import os -import robotsuite -import unittest - - -def test_suite(): - suite = unittest.TestSuite() - current_dir = os.path.abspath(os.path.dirname(__file__)) - robot_dir = os.path.join(current_dir, 'robot') - robot_tests = [ - os.path.join('robot', doc) for doc in os.listdir(robot_dir) - if doc.endswith('.robot') and doc.startswith('test_') - ] - for robot_test in robot_tests: - robottestsuite = robotsuite.RobotTestSuite(robot_test) - robottestsuite.level = ROBOT_TEST_LEVEL - suite.addTests([ - layered( - robottestsuite, - layer=COLLECTIVE_SMTPSSL_ACCEPTANCE_TESTING, - ), - ]) - return suite diff --git a/test_plone60.cfg b/test_plone60.cfg index d56cb6d..4fa189f 100644 --- a/test_plone60.cfg +++ b/test_plone60.cfg @@ -10,3 +10,29 @@ update-versions-file = test_plone60.cfg [versions] createcoverage = 1.5 watchdog = 2.1.6 + +# Added by buildout at 2024-02-08 19:30:43.028322 +build = 1.0.3 +cmarkgfm = 2022.10.27 +coverage = 7.3.2 +i18ndude = 6.1.0 +keyring = 24.3.0 +markdown-it-py = 3.0.0 +mdurl = 0.1.2 +nh3 = 0.2.14 +pkginfo = 1.9.6 +pyproject-hooks = 1.0.0 +readme-renderer = 42.0 +requests-toolbelt = 1.0.0 +rfc3986 = 2.0.0 +rich = 13.7.0 +twine = 4.0.2 +zest.releaser = 9.1.1 + +# Required by: +# keyring==24.3.0 +jaraco.classes = 3.3.0 + +# Required by: +# jaraco.classes==3.3.0 +more-itertools = 10.1.0 diff --git a/tox.ini b/tox.ini index 6a7e0ec..610e670 100644 --- a/tox.ini +++ b/tox.ini @@ -38,7 +38,7 @@ extras = commands = {envbindir}/buildout -q -c {toxinidir}/{env:version_file} buildout:directory={envdir} buildout:develop={toxinidir} bootstrap # {envbindir}/buildout -c {toxinidir}/{env:version_file} buildout:directory={envdir} buildout:develop={toxinidir} annotate - {envbindir}/buildout -n -qq -c {toxinidir}/{env:version_file} buildout:directory={envdir} buildout:develop={toxinidir} install test robot +# {envbindir}/buildout -n -qq -c {toxinidir}/{env:version_file} buildout:directory={envdir} buildout:develop={toxinidir} install test robot coverage run {envbindir}/test -v1 --auto-color {posargs} # coverage run {envbindir}/test -v --all -t robot {posargs}