Remove unused dependencies, update buildout infrastructure.

.github/workflows/main.yml

@@ -41,14 +41,10 @@ jobs:
           sudo locale-gen en_US.UTF-8 nl_NL@euro
           python -m venv .
           bin/pip install -r requirements.txt
-          bin/buildout -c .github.cfg
+          bin/buildout install test createcoverage
       - name: Pre commit
         uses: pre-commit/[email protected]
         if: ${{ matrix.config[1] == '3.8' }}
-      - name: Code Analysis
-        run: |
-          bin/code-analysis
-        if: ${{ matrix.config[1] == '3.8' }}
       - name: Test
         run: |
           bin/coverage run bin/test -s euphorie

.gitignore

@@ -40,3 +40,6 @@ lib64
 share/
 pyvenv.cfg
 /src/euphorie/client/resources/oira/script/patternslib-*
+
+# Ignore pyenv config
+.python-version

buildout.cfg

@@ -28,3 +28,16 @@ zcml-additional =
 environment-vars =
     PREFER_Z3C_PT 1
     zope_i18n_compile_mo_files 1
+
+
+[test]
+recipe = collective.xmltestreport
+defaults = ['--auto-color', '--auto-progress', '-s', 'euphorie']
+eggs =
+    Euphorie [tests]
+    Pillow
+
+
+[createcoverage]
+recipe = zc.recipe.egg
+eggs = createcoverage

devel.cfg

@@ -2,7 +2,6 @@
 extends = buildout.cfg
 parts +=
     test
-    code-analysis
     createcoverage
     pythontools
     sphinx
@@ -27,30 +26,6 @@ environment-vars +=
     CHAMELEON_DEBUG 1
 
 
-[test]
-recipe = collective.xmltestreport
-defaults = ['--auto-color', '--auto-progress', '-s', 'euphorie']
-eggs =
-    Euphorie [tests]
-    Pillow
-
-
-[code-analysis]
-recipe = plone.recipe.codeanalysis
-directory = ${buildout:directory}/src/euphorie
-flake8-exclude = bootstrap.py,bootstrap-buildout.py,docs,*.egg.,omelette
-flake8-max-line-length = 88
-flake8-ignore = E203,W503,W504,Q000,C812,C901,T000
-return-status-codes = True
-pre-commit-hook = False
-pre-push-hook = False
-
-
-[createcoverage]
-recipe = zc.recipe.egg
-eggs = createcoverage
-
-
 [pythontools]
 recipe = zc.recipe.egg
 interpreter = pythontools
@@ -72,9 +47,4 @@ scripts =
 
 [versions]
 createcoverage = 1.5
-flake8 = 6.0.0
-mccabe = 0.7.0
-plone.recipe.codeanalysis = 3.0.1
-pycodestyle = 2.10.0
-pyflakes = 3.0.1
 repoze.sphinx.autointerface = 0.8

docs/changes.rst

@@ -4,6 +4,12 @@ Changelog
 14.3.2 (unreleased)
 -------------------
 
+- Update buildout infrastructure.
+  [thet]
+
+- Remove unused dependencies and update outdated ones.
+  [thet]
+
 - Survey navigation: When survey is archived or otherwise disabled the report,
   training and status menu items should still be active.
   [thet]

setup.py

@@ -38,13 +38,12 @@
         "SQLAlchemy >=1.2.999999",
         "alembic",
         "anytree",
-        "decorator",
-        "py-bcrypt",
+        "bcrypt",
         "ftw.upgrade",
         "htmllaundry",
         "lxml",
         "markdownify",
-        "path.py",
+        "path",
         "plone.app.dexterity [relations]",
         "plone.app.folder",
         "plone.app.imagecropping < 3",
@@ -58,7 +57,6 @@
         "plone.namedfile[blobs]",
         "plone.api",
         "python-docx",
-        "repoze.formapi",
         "setuptools",
         "sh",
         "user_agents",

versions.cfg

@@ -2,38 +2,35 @@
 extends = https://dist.plone.org/release/5.2.11/versions.cfg
 
 [versions]
+Mako = 1.2.4
 NuPlone = 2.1.4
-
-alembic = 1.4.3
-Products.membrane = 5.0.3
-SQLAlchemy = 1.3.22
-plone.app.imagecropping = 2.2.3
-
-# Version 3+ fails with: AttributeError: 'Cell' object has no attribute 'set_explicit_value'
-openpyxl = 2.6.4
-
-# automatically picked
 anytree = 2.8.0
+bcrypt = 4.0.1
+createcoverage = 1.5
 et-xmlfile = 1.1.0
 ftw.upgrade = 3.3.1
 htmllaundry = 2.2
 inflection = 0.5.1
-jdcal = 1.4.1
-Mako = 1.2.4
 markdownify = 0.11.6
 path = 16.6.0
 path.py = 12.5.0
-psutil = 5.9.4
+plone.app.imagecropping = 2.2.3
 psycopg2-binary = 2.9.5
-py-bcrypt = 0.4
 python-docx = 0.8.11
-python-editor = 1.0.4
-repoze.formapi = 0.6.1
-sh = 1.14.3
 tarjan = 0.2.3.2
 ua-parser = 0.16.1
 user-agents = 2.2.0
 z3c.ptcompat = 2.3.0
 z3c.saconfig = 0.16.0
 z3c.schema = 1.2.0
+
+# Need upgrade work
+alembic = 1.4.3
+# Version 3+ fails with: AttributeError: 'Cell' object has no attribute 'set_explicit_value'
+openpyxl = 2.6.4
+SQLAlchemy = 1.3.24
+
+# Upgrade when Python 3.8+ only
+Products.membrane = 5.0.3
+sh = 1.14.3
 zope.sqlalchemy = 1.6