diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ad8249edc2..2512c550a6 100644 --- a/.github/workflows/ci.yaml +++ b/.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 diff --git a/.github/workflows/daily_check.yaml b/.github/workflows/daily_check.yaml index 028d166ab7..c390ba5dee 100644 --- a/.github/workflows/daily_check.yaml +++ b/.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 diff --git a/CHANGES.rst b/CHANGES.rst index bdd3594dac..bcbb38b30b 100644 --- a/CHANGES.rst +++ b/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) diff --git a/Dockerfile b/Dockerfile index 8e6e758079..da352fa5bd 100644 --- a/Dockerfile +++ b/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" diff --git a/Makefile b/Makefile index 618cf45ea0..b64ea11e8c 100644 --- a/Makefile +++ b/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 $< diff --git a/README.rst b/README.rst index ae3340d78c..13d09039e7 100644 --- a/README.rst +++ b/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 " make tests + docker compose exec oereb-server PYTEST_OPTS="-k " 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 `__. +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 `__. The Docker network ``print-network`` is also required and can be created with: .. code-block:: bash diff --git a/doc/source/changes.rst b/doc/source/changes.rst index d45fc37a12..a9983d4cff 100644 --- a/doc/source/changes.rst +++ b/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: diff --git a/requirements.txt b/requirements.txt index c80483d38e..74a7737c7a 100644 --- a/requirements.txt +++ b/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 diff --git a/setup.py b/setup.py index faf8945a63..710d74b66f 100644 --- a/setup.py +++ b/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), diff --git a/tests-requirements.txt b/tests-requirements.txt index c0caa266af..dbee33f69c 100644 --- a/tests-requirements.txt +++ b/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