Changeset 17307 for main/waeup.kofa/trunk

Timestamp:

20 Jan 2023, 10:58:52 (2 years ago)

Author:

uli

Message:

Upgrade more build tools (pip/buildout).

With the upgraded Paste tools (last commit), we can use modernly packaged
eggs and can use newer versions of zc.buildout and pip. This does not only
ease the build process but is also necessary to get everything
Python3-compatible.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• Dockerfile (modified) (2 diffs)
• versions.cfg (modified) (3 diffs)

main/waeup.kofa/trunk/CHANGES.txt

@@ -5 +5 @@
 =======================
 
-* No changes yet
+* Upgrade packages for helper tools to Python3-compatible versions. Requires
+  new buildout run. Might require removal of existing eggs.
+
 
 1.8.1 (2023-01-16)
 ==================
+
 
 * Upgrade `dolmen.beaker` dependency. Removes other outdated crypto

main/waeup.kofa/trunk/Dockerfile

@@ -31 +31 @@
 
 # we can work with official PyPI sources...
-RUN /home/kofa/py27/bin/pip download --no-binary --no-deps waeup.kofa==${KOFA_VERSION}
+# RUN /home/kofa/py27/bin/pip download --no-binary --no-deps waeup.kofa==${KOFA_VERSION}
 ## ...OR with local kofa sources (create a source pkg with `python setup.py sdist`)
 ## Please keep one of the two lines above and below commented out.
-# COPY --chown=kofa:kofa dist/waeup.kofa-${KOFA_VERSION}.tar.gz /home/kofa
+COPY --chown=kofa:kofa dist/waeup.kofa-${KOFA_VERSION}.tar.gz /home/kofa
 RUN tar -xzf waeup.kofa-${KOFA_VERSION}.tar.gz
 RUN rm waeup.kofa-${KOFA_VERSION}.tar.gz
@@ -49 +49 @@
 RUN xmlstarlet edit -L -P -S -N x="http://namespaces.zope.org/browser" --update "//x:beakerSession/@validate_key" --value "val_"`pwgen -s -1 16` etc/site.zcml.in
 
-# pin down `pip` and `setuptools` - just to ensure we have a fixed set of versions
-RUN /home/kofa/py27/bin/pip install --upgrade pip==20.3.4
+# upgrade/pin down build helpers and run the build process
+RUN /home/kofa/py27/bin/pip install --upgrade pip zc.buildout
 RUN /home/kofa/py27/bin/pip install --upgrade --force-reinstall setuptools==44.1.1
-# pin down `zc.buildout` - versions >= 3 make entry-points of installed eggs
-# invisible for `pgk_resources`
-RUN /home/kofa/py27/bin/pip install "zc.buildout<3"
 RUN /home/kofa/py27/bin/buildout
 

main/waeup.kofa/trunk/versions.cfg

@@ -54 +54 @@
 RestrictedPython = 3.5.2
 rwproperty = 1.0
-setuptools = 19.2
 six = 1.10.0
 snowballstemmer = 1.2.1
@@ -72 +71 @@
 z3c.testsetup = 0.6.1
 zc.async = 1.5.4
-zc.buildout = 2.5.0
 zc.catalog = 1.4.5
 zc.dict = 1.2.1
@@ -155 +153 @@
 zope.xmlpickle = 3.4.0
 
+
 # packages that skipped py2 support in newer versions
 PasteDeploy = 2.1.1
+setuptools = 44.1.1
+
 
 # Packages already at newest version (supporting py2 and py3)
 Paste = 3.5.2
 PasteScript = 3.3.0
+zc.buildout = 3.0.1