Merge branch 'master' of https://github.com/openoereb/pyramid_oereb

.github/workflows/ci.yaml

@@ -114,10 +114,10 @@ jobs:
     needs: [lint, gitattributes]
     steps:
     - uses: actions/checkout@master
-    - name: Set up Python 3.8
+    - name: Set up Python 3.11
       uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: 3.11
     - name: Install pypa/build
       run: >-
         python -m

.github/workflows/daily_check.yaml

@@ -55,10 +55,10 @@ jobs:
         env:
           PYTHON_TEST_VERSION: ${{ matrix.python-version }}
         run: make tests
-      - name: Set up Python 3.8
+      - name: Set up Python 3.11
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: 3.11
       - name: Install pypa/build
         run: >-
           python -m

CHANGES.rst

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+2.4.6
+-----
+- Fix error with large of contents and new pdf library (#1813)
+- Fix timestamp for archived PDF (#1815)
+- Library upgrades (SQLAlchemy, geoalchemy2, shapely, psycopg2, pyreproj, pyramid, responses, urllib, pillow, pypdf, jsonschema)
+
 2.4.5
 -----
 - Fix base layer usage in grouped PLRs (#1302)

Dockerfile

@@ -1,7 +1,6 @@
 FROM python:3.11-buster
 
 ENV DEBIAN_FRONTEND=noninteractive
-ENV VIRTUALENV_PYTHON=/usr/bin/python3.8
 
 ARG DEV_PACKAGES="build-essential"
 

Makefile

@@ -328,12 +328,12 @@ tests: ${VENV_ROOT}/requirements-timestamp test-core test-contrib-print_proxy-ma
 .PHONY: docker-tests
 docker-tests:
 	echo "Running tests as user ${LOCAL_UID}:${LOCAL_GID}"
-	docker-compose run --rm -e PGHOST=oereb-db -e UID=${LOCAL_UID} -e GID=${LOCAL_GID} oereb-server make build lint tests
-	docker-compose down
+	docker compose run --rm -e PGHOST=oereb-db -e UID=${LOCAL_UID} -e GID=${LOCAL_GID} oereb-server make build lint tests
+	docker compose down
 
 .PHONY: docker-clean-all
 docker-clean-all:
-	docker-compose run --rm oereb-make clean-all
+	docker compose run --rm oereb-make clean-all
 
 .PHONY: check
 check: git-attributes lint test
@@ -354,10 +354,10 @@ updates: $(PIP_REQUIREMENTS)
 
 .PHONY: serve-dev
 serve-dev: development.ini build
-	docker-compose up -d oereb-db
+	docker compose up -d oereb-db
 	$(VENV_BIN)/pserve $< --reload
 
 .PHONY: serve
 serve: development.ini build
-	docker-compose up -d oereb-db
+	docker compose up -d oereb-db
 	$(VENV_BIN)/pserve $<

README.rst

@@ -25,12 +25,12 @@ Starting the development server
 #. Build run the initial build depending on your OS:
 
    * ``docker network create print-network``
-   * Linux: ``docker-compose run --rm -u $(id -u):$(id -g) oereb-make build``
-   * MAC/Windows: ``docker-compose run --rm oereb-make build``
+   * Linux: ``docker compose run --rm -u $(id -u):$(id -g) oereb-make build``
+   * MAC/Windows: ``docker compose run --rm oereb-make build``
 
-#. ``docker-compose up``
+#. ``docker compose up``
 
-Running ``docker-compose up`` will start the DB (it will automatically import the test/dev data on startup) and start
+Running ``docker compose up`` will start the DB (it will automatically import the test/dev data on startup) and start
 a running instance of the pyramid_oereb DEV server connected to the DB. The project folder is mounted
 to it. So changes take effect.
 
@@ -45,8 +45,8 @@ To run the tests locally:
 The docker way:
 ---------------
   * ``docker network create print-network``
-  * Linux: ``docker-compose run --rm -u $(id -u):$(id -g) oereb-server make build tests``
-  * MAC/Windows: ``docker-compose run --rm oereb-server make build tests``
+  * Linux: ``docker compose run --rm -u $(id -u):$(id -g) oereb-server make build tests``
+  * MAC/Windows: ``docker compose run --rm oereb-server make build tests``
 
 For systems having a local make tool, the following recipe can be used:
 ``make docker-tests``
@@ -59,7 +59,7 @@ Local tests:
 ------------
 For local tests without the complete docker composition you need a running DB.
 You can create one based on the oereb image:
-``docker-compose up -d oereb-db``
+``docker compose up -d oereb-db``
 
 or create an empty postgis DB
 ``docker run -p 5555:5432 --name pg_oereb --rm -it -e POSTGRES_PASSWORD=pw postgis/postgis``
@@ -74,7 +74,7 @@ To run one specfic test:
 
 .. code-block:: bash
 
-  docker-compose exec oereb-server PYTEST_OPTS="-k <name_of_the_test>" make tests
+  docker compose exec oereb-server PYTEST_OPTS="-k <name_of_the_test>" make tests
 
 Troubleshooting
 ---------------
@@ -83,14 +83,14 @@ In this case cleanup can be done like:
 
 .. code-block:: bash
 
-  docker-compose run --rm oereb-make clean-all
+  docker compose run --rm oereb-make clean-all
 
 
 
 Useful ``make`` targets
 =======================
 
-Run the ``make`` targets found in the Makefile either in the ``oereb-server`` container (if using ``docker-compose``) or in your local shell (if running the server locally).
+Run the ``make`` targets found in the Makefile either in the ``oereb-server`` container (if using ``docker compose``) or in your local shell (if running the server locally).
 Some useful targets:
 
 - ``make serve-dev`` to run the application
@@ -113,7 +113,7 @@ There are further make targets to check the validity of federal data:
 Using MapFish-Print
 ===================
 
-To be able to test the OEREB static extract (pdf), you need to run ``pyramid_oereb`` with ``docker-compose`` and to have a running instance of `pyramid_oereb_mfp <https://github.com/openoereb/pyramid_oereb_mfp>`__.
+To be able to test the OEREB static extract (pdf), you need to run ``pyramid_oereb`` with ``docker compose`` and to have a running instance of `pyramid_oereb_mfp <https://github.com/openoereb/pyramid_oereb_mfp>`__.
 The Docker network ``print-network`` is also required and can be created with:
 
 .. code-block:: bash

doc/source/changes.rst

@@ -6,6 +6,14 @@ Changes/Hints for migration
 This chapter will give you hints on how to handle version migration, in particular regarding what you may need
 to adapt in your project configuration, database etc. when upgrading to a new version.
 
+Version 2.4.6
+-------------
+Bug-fix and maintenance release:
+
+* Fix error with large of contents and new pdf library (#1813)
+* Fix timestamp for archived PDF (#1815)
+* Library upgrades (SQLAlchemy, geoalchemy2, shapely, psycopg2, pyreproj, pyramid, responses, urllib, pillow, pypdf, jsonschema)
+
 Version 2.4.5
 -------------
 Bug-fix and maintenance release:

requirements.txt

@@ -1,6 +1,6 @@
 pypdf==3.16.4
 filetype==1.2.0
-geoalchemy2==0.14.1
+geoalchemy2==0.14.2
 pyramid==2.0.2
 pyramid-debugtoolbar==4.10
 qrcode==7.4.2

setup.py

@@ -20,7 +20,7 @@
 
 setup(
     name='pyramid_oereb',
-    version='2.4.5',
+    version='2.4.6',
     description='pyramid_oereb, extension for pyramid web frame work to provide '
             'a basic server part for the oereb project',
     long_description='{readme}\n\n{changes}'.format(readme=README, changes=CHANGES),

tests-requirements.txt

@@ -1,6 +1,6 @@
 jsonschema==4.19.1
 lxml==4.9.3
-pytest==7.4.2
+pytest==7.4.3
 pytest-cov==4.1.0
 pytest-ordering==0.6
 requests-mock==1.11.0