Merge pull request #150 from plone/remove-portal-properties-tool

Remove portal properties tool from tests

Author: jensens

.editorconfig

@@ -13,7 +13,8 @@
 root = true
 
 
-[*]  # For All Files
+[*]
+# Default settings for all files.
 # Unix-style newlines with a newline ending every file
 end_of_line = lf
 insert_final_newline = true
@@ -33,7 +34,8 @@ indent_size = 4
 # 2 space indentation
 indent_size = 2
 
-[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss}]  # Frontend development
+[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss}]
+# Frontend development
 # 2 space indentation
 indent_size = 2
 max_line_length = 80

.github/workflows/meta.yml

@@ -57,6 +57,13 @@ jobs:
 # os_dependencies = "git libxml2 libxslt"
 ##
 
+##
+# To test against a specific matrix of python versions
+# when running tests jobs, add in .meta.toml:
+# [github]
+# py_versions = "['3.12', '3.11']"
+##
+
 
 ##
 # Specify additional jobs in .meta.toml:

.meta.toml

@@ -3,7 +3,7 @@
 # See the inline comments on how to expand/tweak this configuration file
 [meta]
 template = "default"
-commit-id = "6e36bcc4"
+commit-id = "a89af8f2"
 
 [pyproject]
 dependencies_mappings = [

dependabot.yml

@@ -0,0 +1,11 @@
+# Generated from:
+# https://github.com/plone/meta/tree/main/config/default
+# See the inline comments on how to expand/tweak this configuration file
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"

news/125.tests

@@ -0,0 +1,2 @@
+Remove unused ``portal_properties`` code from tests.
+[maurits]

plone/app/querystring/tests/testQueryParser.py

@@ -84,15 +84,6 @@ def getPortalObject(self):
         return MockObject(uid="00000000000000000", path="/%s" % MOCK_SITE_ID)
 
 
-class MockNavtreeProperties:
-    def getProperty(self, name, default=""):
-        return ""
-
-
-class MockSiteProperties:
-    navtree_properties = MockNavtreeProperties()
-
-
 @implementer(INavigationRoot, IPloneSiteRoot)
 class MockSite:
     def __init__(self, portal_membership=None):
@@ -104,7 +95,6 @@ def __init__(self, portal_membership=None):
         sm.registerUtility(portal_membership, IMembershipTool)
         self.portal_url = MockPortalUrl()
         sm.registerUtility(self.portal_url, IURLTool)
-        self.portal_properties = MockSiteProperties()
 
     def getPhysicalPath(self):
         return ["", MOCK_SITE_ID]

pyproject.toml

@@ -71,7 +71,7 @@ target-version = ["py38"]
 ##
 
 [tool.codespell]
-ignore-words-list = "discreet,"
+ignore-words-list = "discreet,assertin,"
 skip = "*.po,"
 ##
 # Add extra configuration options in .meta.toml:
@@ -134,20 +134,27 @@ python-dateutil = ['dateutil']
 [tool.check-manifest]
 ignore = [
     ".editorconfig",
+    ".flake8",
     ".meta.toml",
     ".pre-commit-config.yaml",
-    "tox.ini",
-    ".flake8",
+    "dependabot.yml",
     "mx.ini",
+    "tox.ini",
 
 ]
+
 ##
 # Add extra configuration options in .meta.toml:
 #  [pyproject]
 #  check_manifest_ignores = """
 #      "*.map.js",
 #      "*.pyc",
 #  """
+#  check_manifest_extra_lines = """
+#  ignore-bad-ideas = [
+#      "some/test/file/PKG-INFO",
+#  ]
+#  """
 ##
 
 

tox.ini

@@ -109,7 +109,7 @@ set_env =
 deps =
     zope.testrunner
     -c https://dist.plone.org/release/6.0-dev/constraints.txt
-    
+
 ##
 # Specify additional deps in .meta.toml:
 #  [tox]
@@ -152,11 +152,12 @@ deps =
     coverage
     zope.testrunner
     -c https://dist.plone.org/release/6.0-dev/constraints.txt
-    
+
 commands =
     coverage run --branch --source plone.app.querystring {envbindir}/zope-testrunner --quiet --all --test-path={toxinidir} -s plone.app.querystring {posargs}
     coverage report -m --format markdown
     coverage xml
+    coverage html
 extras =
     test
 
@@ -169,7 +170,7 @@ deps =
     build
     towncrier
     -c https://dist.plone.org/release/6.0-dev/constraints.txt
-    
+
 commands =
     # fake version to not have to install the package
     # we build the change log as news entries might break
@@ -182,6 +183,9 @@ commands =
 description = ensure there are no cyclic dependencies
 use_develop = true
 skip_install = false
+# Here we must always constrain the package deps to what is already installed,
+# otherwise we simply get the latest from PyPI, which may not work.
+constrain_package_deps = true
 set_env =
 
 ##
@@ -197,7 +201,7 @@ deps =
     pipdeptree
     pipforester
     -c https://dist.plone.org/release/6.0-dev/constraints.txt
-    
+
 commands =
     # Generate the full dependency tree
     sh -c 'pipdeptree -j > forest.json'