Merge branch 'feature/upgrade_testing'

CHANGES.txt

@@ -4,7 +4,9 @@ Change History
 2.0.3 - unreleased
 ------------------
 
-- No changes yet.
+- Upgrade to ``pytest>=6``.
+- Replace ``pytest-pep8`` with ``pytest-flake8``; fix or silence flake8 warnings/errors
+  in existing code (mostly tests and migrations).
 
 2.0.2 - 2020-06-22
 ------------------

kotti/__init__.py

@@ -1,3 +1,5 @@
+import os.path
+
 import pkg_resources
 from pyramid.authentication import AuthTktAuthenticationPolicy
 from pyramid.authorization import ACLAuthorizationPolicy
@@ -167,7 +169,6 @@ def get_settings():
 
 
 def _resolve_dotted(d, keys=conf_dotted):
-
     resolved = d.copy()
 
     for key in keys:
@@ -281,7 +282,10 @@ def includeme(config):
     ]:
         config.override_asset(to_override="kotti", override_with=override)
 
-    config.add_translation_dirs("kotti:locale")
+    config.add_translation_dirs(f"{os.path.dirname(__file__)}/locale")
+    # used to be
+    # config.add_translation_dirs("kotti:locale")
+    # which fails with recent pytest (works in non testing though)
 
     workflow = settings["kotti.use_workflow"]
     if workflow.lower() not in FALSE_VALUES:

kotti/alembic/env.py

@@ -25,7 +25,7 @@ def run_migrations_online():
     try:
         context.run_migrations()
         mark_changed(DBSession())
-    except:
+    except:  # noqa: E722
         traceback.print_exc()
         transaction.abort()
     else:

kotti/alembic/versions/413fa5fcc581_add_filedepot.py

@@ -75,7 +75,7 @@ def process(thing):
     update = files.update().where(files.c.id == bindparam('nodeid')).\
         values({files.c.data: bindparam('data')})
 
-    def chunks(l, n):
+    def chunks(l, n):  # noqa: E741
         for i in range(0, len(l), n):
             yield l[i:i + n]
 

kotti/migrate.py

@@ -107,7 +107,7 @@ def _make_script_dir(alembic_cfg: Config) -> ScriptDirectoryWithDefaultEnvPy:
 
 def get_locations() -> List[str]:
     conf_str = get_settings()["kotti.alembic_dirs"]
-    return [l.strip() for l in conf_str.split() if l.strip()]
+    return [line.strip() for line in conf_str.split() if line.strip()]
 
 
 def stamp_head(location: str = DEFAULT_LOCATION, revision: None = None) -> None:
@@ -170,7 +170,7 @@ def upgrade_all():
 
 
 def list_all():
-    pkg_envs = [PackageEnvironment(l) for l in get_locations()]
+    pkg_envs = [PackageEnvironment(location) for location in get_locations()]
     for pkg_env in pkg_envs:
         print(f"{pkg_env.pkg_name}:")
 

kotti/tests/test_httpexceptions.py

@@ -8,7 +8,7 @@ def test_404_anon(webtest, root):
 
 
 @pytest.mark.user("admin")
-def test_404_anon(webtest, root):
+def test_404_admin(webtest, root):
 
     resp = webtest.app.get("/non-existent", status=404)
     assert "Not Found" in resp.text

kotti/views/cache.py

@@ -113,7 +113,7 @@ def set_cache_headers(event):
         # noinspection PyBroadException
         try:
             caching_policy = caching_policy_chooser(context, request, response)
-        except:
+        except:  # noqa: E722
             # We don't want to screw up the response if the
             # caching_policy_chooser raises an exception.
             logger.exception(f"{caching_policy_chooser} raised an exception.")

kotti/views/util.py

@@ -354,14 +354,15 @@ def edit_links(self):
         if not hasattr(self.context, "type_info"):
             return []
         return [
-            l
-            for l in self.context.type_info.edit_links
-            if l.visible(self.context, self.request)
+            link
+            for link in self.context.type_info.edit_links
+            if link.visible(self.context, self.request)
         ]
 
     @reify
     def site_setup_links(self):
-        return [l for l in CONTROL_PANEL_LINKS if l.visible(self.root, self.request)]
+        return [link for link in CONTROL_PANEL_LINKS
+                if link.visible(self.root, self.request)]
 
     @staticmethod
     def sanitize(html, sanitizer="default"):

pytest.ini

@@ -8,16 +8,15 @@ addopts =
     --capture=no
     --strict
     --tb=native
-    --travis-fold=auto
-    --doctest-glob='*.txt'
-    --doctest-modules
-    --pep8
+    --flake8
     --cov=kotti
     --cov-report=term-missing
     kotti/
 python_files = test_*.py
-pep8ignore = E122 E123 E125 E128 E203 E251 E501 E711 E713 E714 E402 W503
-pep8maxlinelength = 88
+flake8-ignore =
+    *.py E122 E123 E125 E128 E203 E251 E501 E711 E713 E714 E402 F821 W503
+    tests/*.py F841
+flake8-max-line-length = 88
 markers =
     user: mark test to be run as the given user
     slow: mark test to be run only with --runslow option

setup.py

@@ -67,14 +67,11 @@
     'WebTest',
     'mock',
     'Pillow',  # thumbnail filter in depot tween tests
-    'py>=1.4.29',
     'pyquery',
-    'pytest>=4.6,<5',  # see #563
+    'pytest>=6',
     'pytest-cov',
-    'pytest-pep8>=1.0.6',
-    'pytest-travis-fold',
+    'pytest-flake8',
     'pytest-virtualenv',
-    # 'pytest-xdist',  # currently causes Travis to fail
     'tox',
     'zope.testbrowser>=5.0.0',
     ]