From 52325c3d4deb899e9861c738aa46193efb69c105 Mon Sep 17 00:00:00 2001 From: Guillaume REMY Date: Wed, 17 Jan 2024 13:16:30 +0100 Subject: [PATCH 01/62] Use ST_DWithin instead of ST_Distance for performance reasons --- .../data_sources/interlis_2_3/sources/plr.py | 25 +++++++++------ .../data_sources/standard/sources/plr.py | 32 +++++++++++++------ .../sources/test_plr.py | 23 +++++++------ 3 files changed, 49 insertions(+), 31 deletions(-) diff --git a/pyramid_oereb/contrib/data_sources/interlis_2_3/sources/plr.py b/pyramid_oereb/contrib/data_sources/interlis_2_3/sources/plr.py index c26858199f..0306a86b29 100644 --- a/pyramid_oereb/contrib/data_sources/interlis_2_3/sources/plr.py +++ b/pyramid_oereb/contrib/data_sources/interlis_2_3/sources/plr.py @@ -8,6 +8,7 @@ GeometryCollection from sqlalchemy import or_ from sqlalchemy.orm import selectinload +from geoalchemy2.functions import ST_DWithin from pyramid_oereb import Config from pyramid_oereb.core import b64 @@ -433,15 +434,21 @@ def collect_related_geometries_by_real_estate(self, session, real_estate): else: query = session.query(self._model_).filter( or_( - self._model_.point.ST_Distance( - from_shape(real_estate.limit, srid=Config.get('srid')) - ) < self._tolerances.get('ALL', self._tolerances.get('Point', 0)), - self._model_.line.ST_Distance( - from_shape(real_estate.limit, srid=Config.get('srid')) - ) < self._tolerances.get('ALL', self._tolerances.get('LineString', 0)), - self._model_.surface.ST_Distance( - from_shape(real_estate.limit, srid=Config.get('srid')) - ) < self._tolerances.get('ALL', self._tolerances.get('Polygon', 0)) + ST_DWithin( + self._model_.point, + from_shape(real_estate.limit, srid=Config.get('srid')), + self._tolerances.get('ALL', self._tolerances.get('Point', 0)) + ), + ST_DWithin( + self._model_.line, + from_shape(real_estate.limit, srid=Config.get('srid')), + self._tolerances.get('ALL', self._tolerances.get('LineString', 0)) + ), + ST_DWithin( + self._model_.surface, + from_shape(real_estate.limit, srid=Config.get('srid')), + self._tolerances.get('ALL', self._tolerances.get('Polygon', 0)) + ) )) return query.distinct(self._model_.public_law_restriction_id).options( selectinload(self.models.Geometry.public_law_restriction) diff --git a/pyramid_oereb/contrib/data_sources/standard/sources/plr.py b/pyramid_oereb/contrib/data_sources/standard/sources/plr.py index 15c7422857..1155a37dff 100644 --- a/pyramid_oereb/contrib/data_sources/standard/sources/plr.py +++ b/pyramid_oereb/contrib/data_sources/standard/sources/plr.py @@ -3,6 +3,7 @@ import importlib from geoalchemy2.shape import to_shape, from_shape +from geoalchemy2.functions import ST_DWithin, ST_Intersects from shapely.geometry import Point, LineString, Polygon, MultiPoint, MultiLineString, MultiPolygon, \ GeometryCollection from sqlalchemy import text, or_ @@ -523,7 +524,7 @@ def extract_geometry_collection_db(db_path, real_estate_geometry, tolerances=Non ] clause_blocks = [ text(f'ST_Intersects({extract}, {geometry_string})') if tolerance is None - else text(f'ST_Distance({extract}, {geometry_string}) < {tolerance}') + else text(f'ST_DWithin({extract}, {geometry_string}, {round(tolerance, 3)})') for extract, tolerance in zip([extract_point, extract_line, extract_polygon], tolerance_extracts) ] return or_(*clause_blocks) @@ -560,17 +561,28 @@ def handle_collection(self, session, geometry_to_check): else: # The PLR is not problematic at all cause we do not have a collection type here if (self._tolerances is not None) and ('ALL' in self._tolerances): - query = session.query(self._model_).filter(self._model_.geom.ST_Distance( - from_shape(geometry_to_check, srid=Config.get('srid')) - ) < self._tolerances['ALL']) + query = session.query(self._model_).filter( + ST_DWithin( + self._model_.geom, + from_shape(geometry_to_check, srid=Config.get('srid')), + self._tolerances['ALL'] + ) + ) elif (self._tolerances is not None) and (geometry_to_check.geom_type in self._tolerances): - query = session.query(self._model_).filter(self._model_.geom.ST_Distance( - from_shape(geometry_to_check, srid=Config.get('srid')) - ) < self._tolerances[geometry_to_check.geom_type]) + query = session.query(self._model_).filter( + ST_DWithin( + self._model_.geom, + from_shape(geometry_to_check, srid=Config.get('srid')), + self._tolerances[geometry_to_check.geom_type] + ) + ) else: - query = session.query(self._model_).filter(self._model_.geom.ST_Intersects( - from_shape(geometry_to_check, srid=Config.get('srid')) - )) + query = session.query(self._model_).filter( + ST_Intersects( + self._model_.geom, + from_shape(geometry_to_check, srid=Config.get('srid')) + ) + ) return query def collect_related_geometries_by_real_estate(self, session, real_estate): diff --git a/tests/contrib.data_sources.standard/sources/test_plr.py b/tests/contrib.data_sources.standard/sources/test_plr.py index a8e280e0ec..80f176d28f 100644 --- a/tests/contrib.data_sources.standard/sources/test_plr.py +++ b/tests/contrib.data_sources.standard/sources/test_plr.py @@ -1,4 +1,5 @@ import datetime +import math import pytest from unittest.mock import patch @@ -820,28 +821,26 @@ def test_handle_collection_tolerance(tolerances, with_collection, config_config, # check results for 8 combinations of with_collection + tolerances from sqlalchemy.sql.annotation import AnnotatedColumn - from sqlalchemy.sql.elements import BinaryExpression, BooleanClauseList, TextClause - from geoalchemy2.functions import ST_Intersects, ST_Distance, ST_GeomFromWKB + from sqlalchemy.sql.elements import BooleanClauseList, TextClause, BindParameter + from geoalchemy2.functions import ST_Intersects, ST_DWithin, ST_GeomFromWKB if with_collection: assert type(query.received_clause) is BooleanClauseList for clause in query.received_clause.clauses: assert type(clause) is TextClause if tolerances: - assert 'ST_Distance' in clause.text + assert 'ST_DWithin' in clause.text else: assert 'ST_Intersects' in clause.text else: if tolerances: - assert type(query.received_clause) is BinaryExpression - test_clause = query.received_clause.left - assert type(test_clause) is ST_Distance - query.received_clause.right.value == 0.1 + assert type(query.received_clause) is ST_DWithin + assert {type(el) for el in query.received_clause.clause_expr.element.clauses} == {AnnotatedColumn, ST_GeomFromWKB, BindParameter} + assert math.isclose(query.received_clause.clauses.clauses[2].value, 0.1, rel_tol=1e-9) else: - test_clause = query.received_clause - assert type(test_clause) is ST_Intersects - assert { - type(el) for el in test_clause.clause_expr.element.clauses - } == {AnnotatedColumn, ST_GeomFromWKB} + assert type(query.received_clause) is ST_Intersects + assert {type(el) for el in query.received_clause.clause_expr.element.clauses} == {AnnotatedColumn, ST_GeomFromWKB} + + @pytest.mark.parametrize('geom,length,geom_type', [ From 5f3af154eecaefdf46180722f62f43606be6d0fb Mon Sep 17 00:00:00 2001 From: Guillaume REMY Date: Thu, 18 Jan 2024 13:53:02 +0100 Subject: [PATCH 02/62] remove unnecessary rounding of tolerance --- pyramid_oereb/contrib/data_sources/standard/sources/plr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyramid_oereb/contrib/data_sources/standard/sources/plr.py b/pyramid_oereb/contrib/data_sources/standard/sources/plr.py index 1155a37dff..729c2c882c 100644 --- a/pyramid_oereb/contrib/data_sources/standard/sources/plr.py +++ b/pyramid_oereb/contrib/data_sources/standard/sources/plr.py @@ -524,7 +524,7 @@ def extract_geometry_collection_db(db_path, real_estate_geometry, tolerances=Non ] clause_blocks = [ text(f'ST_Intersects({extract}, {geometry_string})') if tolerance is None - else text(f'ST_DWithin({extract}, {geometry_string}, {round(tolerance, 3)})') + else text(f'ST_DWithin({extract}, {geometry_string}, {tolerance})') for extract, tolerance in zip([extract_point, extract_line, extract_polygon], tolerance_extracts) ] return or_(*clause_blocks) From abdc84a2cffc5a7ca0e27c241418e669ef869519 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 13:07:38 +0100 Subject: [PATCH 03/62] Update dependency pypdf to v4 (#1931) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1aac089986..97eab14db5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -pypdf==3.17.4 +pypdf==4.0.0 filetype==1.2.0 geoalchemy2==0.14.3 pyramid==2.0.2 From 3cb759b2c7307148615dc0c153511ca7194db35f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 06:43:25 +0100 Subject: [PATCH 04/62] Update dependency pyramid-debugtoolbar to v4.11 (#1933) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 97eab14db5..2253937b53 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ pypdf==4.0.0 filetype==1.2.0 geoalchemy2==0.14.3 pyramid==2.0.2 -pyramid-debugtoolbar==4.10 +pyramid-debugtoolbar==4.11 qrcode==7.4.2 image==1.5.33 shapely==2.0.2 From cc0c1353cb848d238503a57d0241b9a5ab5faead Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 06:43:52 +0100 Subject: [PATCH 05/62] Update dependency pytest to v8 (#1934) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- tests-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests-requirements.txt b/tests-requirements.txt index 1b22d80d3c..a57712dc83 100644 --- a/tests-requirements.txt +++ b/tests-requirements.txt @@ -1,6 +1,6 @@ jsonschema==4.21.1 lxml==5.1.0 -pytest==7.4.4 +pytest==8.0.0 pytest-cov==4.1.0 pytest-ordering==0.6 requests-mock==1.11.0 From 840f04bc6f2fa228eb3100cddbaff2f85a5cbcca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 06:44:10 +0100 Subject: [PATCH 06/62] Update dependency pypdf to v4.0.1 (#1935) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2253937b53..aeb7f2582e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -pypdf==4.0.0 +pypdf==4.0.1 filetype==1.2.0 geoalchemy2==0.14.3 pyramid==2.0.2 From 8eb432e01031c643c38270c247276a822c3a727e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 30 Jan 2024 19:18:33 +0100 Subject: [PATCH 07/62] Update dependency urllib3 to v2.2.0 (#1936) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index aeb7f2582e..555d318a02 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ image==1.5.33 shapely==2.0.2 SQLAlchemy==2.0.25 pyaml-env==1.2.1 -urllib3==2.1.0 +urllib3==2.2.0 waitress==2.1.2 pyreproj==3.0.0 mako-render==0.1.0 From 4b68440241a763e626d9296120a9d4efe978c169 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 06:21:42 +0100 Subject: [PATCH 08/62] Update codecov/codecov-action action to v4 (#1937) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 008d975a69..8872f9b4a7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -63,7 +63,7 @@ jobs: - name: Run tests for Python ${{ matrix.python-version }} run: make tests - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} env_vars: OS,PYTHON From f0cb7e04021bd07c9295e7333db1dceb2cb4226f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 4 Feb 2024 16:13:51 +0100 Subject: [PATCH 09/62] Update dependency pyramid-debugtoolbar to v4.12 (#1938) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 555d318a02..047976d0c8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ pypdf==4.0.1 filetype==1.2.0 geoalchemy2==0.14.3 pyramid==2.0.2 -pyramid-debugtoolbar==4.11 +pyramid-debugtoolbar==4.12 qrcode==7.4.2 image==1.5.33 shapely==2.0.2 From 2768e6e9b47e6ca6611cd2f6bdf9d82e0bb31d34 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 08:18:55 +0100 Subject: [PATCH 10/62] Update dependency pyramid-debugtoolbar to v4.12.1 (#1940) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 047976d0c8..c1f4898270 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ pypdf==4.0.1 filetype==1.2.0 geoalchemy2==0.14.3 pyramid==2.0.2 -pyramid-debugtoolbar==4.12 +pyramid-debugtoolbar==4.12.1 qrcode==7.4.2 image==1.5.33 shapely==2.0.2 From 7de897d53f5c2fa5d978887064bbdf0c8a787569 Mon Sep 17 00:00:00 2001 From: Anne Maier Date: Mon, 12 Feb 2024 08:27:53 +0100 Subject: [PATCH 11/62] linting test_plr --- .../contrib.data_sources.standard/sources/test_plr.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/contrib.data_sources.standard/sources/test_plr.py b/tests/contrib.data_sources.standard/sources/test_plr.py index 80f176d28f..33fe945136 100644 --- a/tests/contrib.data_sources.standard/sources/test_plr.py +++ b/tests/contrib.data_sources.standard/sources/test_plr.py @@ -834,13 +834,15 @@ def test_handle_collection_tolerance(tolerances, with_collection, config_config, else: if tolerances: assert type(query.received_clause) is ST_DWithin - assert {type(el) for el in query.received_clause.clause_expr.element.clauses} == {AnnotatedColumn, ST_GeomFromWKB, BindParameter} + assert { + type(el) for el in query.received_clause.clause_expr.element.clauses + } == {AnnotatedColumn, ST_GeomFromWKB, BindParameter} assert math.isclose(query.received_clause.clauses.clauses[2].value, 0.1, rel_tol=1e-9) else: assert type(query.received_clause) is ST_Intersects - assert {type(el) for el in query.received_clause.clause_expr.element.clauses} == {AnnotatedColumn, ST_GeomFromWKB} - - + assert { + type(el) for el in query.received_clause.clause_expr.element.clauses + } == {AnnotatedColumn, ST_GeomFromWKB} @pytest.mark.parametrize('geom,length,geom_type', [ From 8fe215e34b20191d64e1f0d56de3ffaf87795494 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 08:50:47 +0100 Subject: [PATCH 12/62] Update dependency SQLAlchemy to v2.0.26 (#1942) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c1f4898270..098b6d2809 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ pyramid-debugtoolbar==4.12.1 qrcode==7.4.2 image==1.5.33 shapely==2.0.2 -SQLAlchemy==2.0.25 +SQLAlchemy==2.0.26 pyaml-env==1.2.1 urllib3==2.2.0 waitress==2.1.2 From f80e12660ed6803b8a88114d969ea7c92795178b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 08:51:05 +0100 Subject: [PATCH 13/62] Update dependency geoalchemy2 to v0.14.4 (#1941) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 098b6d2809..ac1a0f0a0f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ pypdf==4.0.1 filetype==1.2.0 -geoalchemy2==0.14.3 +geoalchemy2==0.14.4 pyramid==2.0.2 pyramid-debugtoolbar==4.12.1 qrcode==7.4.2 From d4cc3f5e8bb62e98e34dc0d88baf95400207ae91 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 08:55:58 +0100 Subject: [PATCH 14/62] Update dependency waitress to v3 (#1939) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ac1a0f0a0f..8fb05d77a3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ shapely==2.0.2 SQLAlchemy==2.0.26 pyaml-env==1.2.1 urllib3==2.2.0 -waitress==2.1.2 +waitress==3.0.0 pyreproj==3.0.0 mako-render==0.1.0 requests==2.31.0 From ce3241ee806f020784eaf122bc2617cccb100202 Mon Sep 17 00:00:00 2001 From: Wolfgang Kaltz Date: Mon, 12 Feb 2024 14:25:13 +0100 Subject: [PATCH 15/62] New release --- CHANGES.rst | 5 +++++ doc/source/changes.rst | 7 +++++++ setup.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index ee72c69aff..c8946d4ae8 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,11 @@ Changelog ========= +2.5.0 +----- +- Use ST_DWithin instead of ST_Distance for performance reasons (#1930) +- Library upgrades (SQLAlchemy, geoalchemy2, urllib3, pypdf) + 2.4.8 ----- - Support new Oereblex API version (via geolink-formatter 2.0.5) diff --git a/doc/source/changes.rst b/doc/source/changes.rst index 9f3b3edf73..f5c6a9ad72 100644 --- a/doc/source/changes.rst +++ b/doc/source/changes.rst @@ -6,6 +6,13 @@ 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.5.0 +------------- +Performance optimization release: + +* Use ST_DWithin instead of ST_Distance for performance reasons (#1930) +* Library upgrades (SQLAlchemy, geoalchemy2, urllib3, pypdf) + Version 2.4.8 ------------- Maintenance release: diff --git a/setup.py b/setup.py index 4b6ba3143a..b087cd804a 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ setup( name='pyramid_oereb', - version='2.4.8', + version='2.5.0', 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), From fb18188969c24cb6adb222048e44bde9a2bbf1a8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 14 Feb 2024 07:36:22 +0100 Subject: [PATCH 16/62] Update dependency SQLAlchemy to v2.0.27 (#1943) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8fb05d77a3..d2fed3a4a3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ pyramid-debugtoolbar==4.12.1 qrcode==7.4.2 image==1.5.33 shapely==2.0.2 -SQLAlchemy==2.0.26 +SQLAlchemy==2.0.27 pyaml-env==1.2.1 urllib3==2.2.0 waitress==3.0.0 From 1aefeed74d9f5905e9d9a1d49f5322172d37772e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 14 Feb 2024 07:36:36 +0100 Subject: [PATCH 17/62] Update dependency responses to v0.25.0 (#1944) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- tests-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests-requirements.txt b/tests-requirements.txt index a57712dc83..a8b91d2dcb 100644 --- a/tests-requirements.txt +++ b/tests-requirements.txt @@ -4,6 +4,6 @@ pytest==8.0.0 pytest-cov==4.1.0 pytest-ordering==0.6 requests-mock==1.11.0 -responses==0.24.1 +responses==0.25.0 webtest==3.0.0 pillow==10.2.0 From 6ade535d5e6295057def54c7c3ec64efbb13ebda Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 07:38:40 +0100 Subject: [PATCH 18/62] Update dependency shapely to v2.0.3 (#1945) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d2fed3a4a3..67276ce97a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ pyramid==2.0.2 pyramid-debugtoolbar==4.12.1 qrcode==7.4.2 image==1.5.33 -shapely==2.0.2 +shapely==2.0.3 SQLAlchemy==2.0.27 pyaml-env==1.2.1 urllib3==2.2.0 From ca651b6c3a213d564787d72c09966cb6b672b02c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 07:38:55 +0100 Subject: [PATCH 19/62] Update dependency pytest to v8.0.1 (#1946) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- tests-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests-requirements.txt b/tests-requirements.txt index a8b91d2dcb..2dfb629cd1 100644 --- a/tests-requirements.txt +++ b/tests-requirements.txt @@ -1,6 +1,6 @@ jsonschema==4.21.1 lxml==5.1.0 -pytest==8.0.0 +pytest==8.0.1 pytest-cov==4.1.0 pytest-ordering==0.6 requests-mock==1.11.0 From 79b4c932499d4c71d99dfaa7190591f48b69d125 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 07:39:13 +0100 Subject: [PATCH 20/62] Update dependency urllib3 to v2.2.1 (#1947) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 67276ce97a..5a9e70294a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ image==1.5.33 shapely==2.0.3 SQLAlchemy==2.0.27 pyaml-env==1.2.1 -urllib3==2.2.0 +urllib3==2.2.1 waitress==3.0.0 pyreproj==3.0.0 mako-render==0.1.0 From 172c2517cae69f6101d1221a83871dfff430ebcd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 07:39:27 +0100 Subject: [PATCH 21/62] Update dependency pypdf to v4.0.2 (#1948) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5a9e70294a..4a08e9345e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -pypdf==4.0.1 +pypdf==4.0.2 filetype==1.2.0 geoalchemy2==0.14.4 pyramid==2.0.2 From 552d76c4aa6a58cbad859a9f84057f3fef34f73d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 07:31:20 +0100 Subject: [PATCH 22/62] Update dependency pytest to v8.0.2 (#1950) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- tests-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests-requirements.txt b/tests-requirements.txt index 2dfb629cd1..8b0f836c62 100644 --- a/tests-requirements.txt +++ b/tests-requirements.txt @@ -1,6 +1,6 @@ jsonschema==4.21.1 lxml==5.1.0 -pytest==8.0.1 +pytest==8.0.2 pytest-cov==4.1.0 pytest-ordering==0.6 requests-mock==1.11.0 From 3336c6bf5ea3395f943e43bea053eccb65790cb3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 07:02:44 +0100 Subject: [PATCH 23/62] Update dependency geoalchemy2 to v0.14.6 (#1951) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4a08e9345e..5bbd10098a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ pypdf==4.0.2 filetype==1.2.0 -geoalchemy2==0.14.4 +geoalchemy2==0.14.6 pyramid==2.0.2 pyramid-debugtoolbar==4.12.1 qrcode==7.4.2 From a1a8db12d9192e9abb10a243fc44b030485a0e8e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 3 Mar 2024 19:46:03 +0100 Subject: [PATCH 24/62] Update dependency pypdf to v4.1.0 (#1952) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5bbd10098a..8f7d4b8083 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -pypdf==4.0.2 +pypdf==4.1.0 filetype==1.2.0 geoalchemy2==0.14.6 pyramid==2.0.2 From 76018990030765b175c3e00ec0b037a56dce9b0f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 07:56:25 +0100 Subject: [PATCH 25/62] Update dependency pytest to v8.1.0 (#1953) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- tests-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests-requirements.txt b/tests-requirements.txt index 8b0f836c62..695643976c 100644 --- a/tests-requirements.txt +++ b/tests-requirements.txt @@ -1,6 +1,6 @@ jsonschema==4.21.1 lxml==5.1.0 -pytest==8.0.2 +pytest==8.1.0 pytest-cov==4.1.0 pytest-ordering==0.6 requests-mock==1.11.0 From 4d39096b9bb451dd13600260d6105e472ab159ea Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 05:37:06 +0100 Subject: [PATCH 26/62] Update dependency SQLAlchemy to v2.0.28 (#1954) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8f7d4b8083..8d7388c0e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ pyramid-debugtoolbar==4.12.1 qrcode==7.4.2 image==1.5.33 shapely==2.0.3 -SQLAlchemy==2.0.27 +SQLAlchemy==2.0.28 pyaml-env==1.2.1 urllib3==2.2.1 waitress==3.0.0 From c034c2338880f7312f42253a2265b69c816b05ac Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 10 Mar 2024 05:42:01 +0100 Subject: [PATCH 27/62] Update dependency pytest to v8.1.1 (#1955) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- tests-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests-requirements.txt b/tests-requirements.txt index 695643976c..2698f038f1 100644 --- a/tests-requirements.txt +++ b/tests-requirements.txt @@ -1,6 +1,6 @@ jsonschema==4.21.1 lxml==5.1.0 -pytest==8.1.0 +pytest==8.1.1 pytest-cov==4.1.0 pytest-ordering==0.6 requests-mock==1.11.0 From 7b7898661cb83320167033fed67b16ca234fb0e0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 07:25:58 +0100 Subject: [PATCH 28/62] Update dependency SQLAlchemy to v2.0.29 (#1957) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8d7388c0e0..c4ad6cd0ed 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ pyramid-debugtoolbar==4.12.1 qrcode==7.4.2 image==1.5.33 shapely==2.0.3 -SQLAlchemy==2.0.28 +SQLAlchemy==2.0.29 pyaml-env==1.2.1 urllib3==2.2.1 waitress==3.0.0 From 3baa77f6df9b2ee28f3454e2bb1bbbaa86f03878 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 07:26:20 +0100 Subject: [PATCH 29/62] Update dependency pytest-cov to v5 (#1958) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- tests-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests-requirements.txt b/tests-requirements.txt index 2698f038f1..4a41d98fe7 100644 --- a/tests-requirements.txt +++ b/tests-requirements.txt @@ -1,7 +1,7 @@ jsonschema==4.21.1 lxml==5.1.0 pytest==8.1.1 -pytest-cov==4.1.0 +pytest-cov==5.0.0 pytest-ordering==0.6 requests-mock==1.11.0 responses==0.25.0 From 04f22e2d5538291ce72f78e7c31f9e44cc921c94 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 07:31:48 +0100 Subject: [PATCH 30/62] Update dependency requests-mock to v1.12.0 (#1959) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- tests-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests-requirements.txt b/tests-requirements.txt index 4a41d98fe7..0b8cc9e3d1 100644 --- a/tests-requirements.txt +++ b/tests-requirements.txt @@ -3,7 +3,7 @@ lxml==5.1.0 pytest==8.1.1 pytest-cov==5.0.0 pytest-ordering==0.6 -requests-mock==1.11.0 +requests-mock==1.12.0 responses==0.25.0 webtest==3.0.0 pillow==10.2.0 From cbf7f513d9f1a12a12402d8e98b28ed2cd56b950 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 08:44:28 +0200 Subject: [PATCH 31/62] Update dependency geoalchemy2 to v0.14.7 (#1962) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c4ad6cd0ed..a19b78a8e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ pypdf==4.1.0 filetype==1.2.0 -geoalchemy2==0.14.6 +geoalchemy2==0.14.7 pyramid==2.0.2 pyramid-debugtoolbar==4.12.1 qrcode==7.4.2 From 91de2c8902f917efad9dd41bfb5c1b3668c4b2c7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 08:44:42 +0200 Subject: [PATCH 32/62] Update dependency requests-mock to v1.12.1 (#1960) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- tests-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests-requirements.txt b/tests-requirements.txt index 0b8cc9e3d1..6e64e4268b 100644 --- a/tests-requirements.txt +++ b/tests-requirements.txt @@ -3,7 +3,7 @@ lxml==5.1.0 pytest==8.1.1 pytest-cov==5.0.0 pytest-ordering==0.6 -requests-mock==1.12.0 +requests-mock==1.12.1 responses==0.25.0 webtest==3.0.0 pillow==10.2.0 From c984ff636dfadc8278f8cd58df4a93e90af429f0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 08:44:58 +0200 Subject: [PATCH 33/62] Update dependency lxml to v5.2.0 (#1961) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- tests-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests-requirements.txt b/tests-requirements.txt index 6e64e4268b..9b09d45737 100644 --- a/tests-requirements.txt +++ b/tests-requirements.txt @@ -1,5 +1,5 @@ jsonschema==4.21.1 -lxml==5.1.0 +lxml==5.2.0 pytest==8.1.1 pytest-cov==5.0.0 pytest-ordering==0.6 From cf9ce9a5b19c480fc973b653cf8b0c4bdb6f2dd4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 14:49:34 +0200 Subject: [PATCH 34/62] Update dependency pillow to v10.3.0 (#1963) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- tests-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests-requirements.txt b/tests-requirements.txt index 9b09d45737..492944d357 100644 --- a/tests-requirements.txt +++ b/tests-requirements.txt @@ -6,4 +6,4 @@ pytest-ordering==0.6 requests-mock==1.12.1 responses==0.25.0 webtest==3.0.0 -pillow==10.2.0 +pillow==10.3.0 From 35842c0acc2437201823dc4e08aaa78d6829bf90 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 07:09:00 +0200 Subject: [PATCH 35/62] Update dependency lxml to v5.2.1 (#1964) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- tests-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests-requirements.txt b/tests-requirements.txt index 492944d357..9ed65a2edc 100644 --- a/tests-requirements.txt +++ b/tests-requirements.txt @@ -1,5 +1,5 @@ jsonschema==4.21.1 -lxml==5.2.0 +lxml==5.2.1 pytest==8.1.1 pytest-cov==5.0.0 pytest-ordering==0.6 From 858e8cd4be47a037234c5294233239af0cf73240 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 08:52:43 +0200 Subject: [PATCH 36/62] Update dependency pypdf to v4.2.0 (#1965) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a19b78a8e0..8307c18bfe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -pypdf==4.1.0 +pypdf==4.2.0 filetype==1.2.0 geoalchemy2==0.14.7 pyramid==2.0.2 From 62f8cdc833f2720bb8fb6e67491b8350ddcd9aaa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 08:53:09 +0200 Subject: [PATCH 37/62] Update dependency c2c.template to v2.4.0 (#1966) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index cf271f9afc..72a9bfed23 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -5,6 +5,6 @@ Sphinx==7.2.6 sphinx_rtd_theme==2.0.0 psycopg2==2.9.9 mccabe==0.7.0 -c2c.template==2.3.0 +c2c.template==2.4.0 yappi -e . From 00c5eae4accd1aafafd0be1e92b9df8d900e92da Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 14:24:49 +0200 Subject: [PATCH 38/62] Update dependency c2c.template to v2.4.1 (#1967) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 72a9bfed23..5ad2ac02e7 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -5,6 +5,6 @@ Sphinx==7.2.6 sphinx_rtd_theme==2.0.0 psycopg2==2.9.9 mccabe==0.7.0 -c2c.template==2.4.0 +c2c.template==2.4.1 yappi -e . From 72b551e0f5ba898efdc338bcb154c42e2bc62e1d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 08:08:42 +0200 Subject: [PATCH 39/62] Update dependency c2cwsgiutils to v6.0.8 (#1968) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8307c18bfe..398d08f829 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,4 +15,4 @@ mako-render==0.1.0 requests==2.31.0 geolink-formatter==2.0.5 pyconizer==0.1.4 -c2cwsgiutils[standard]==6.0.7 +c2cwsgiutils[standard]==6.0.8 From d23cd62bd3bb8d5b4a127f0b58f105ffff4292f4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 07:21:31 +0200 Subject: [PATCH 40/62] Update dependency c2c.template to v2.4.2 (#1969) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 5ad2ac02e7..c8faa0331b 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -5,6 +5,6 @@ Sphinx==7.2.6 sphinx_rtd_theme==2.0.0 psycopg2==2.9.9 mccabe==0.7.0 -c2c.template==2.4.1 +c2c.template==2.4.2 yappi -e . From a967e98b03ac5be5550a02bdede0f79770ac2341 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 07:39:06 +0200 Subject: [PATCH 41/62] Update dependency shapely to v2.0.4 (#1970) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 398d08f829..c44dc56510 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ pyramid==2.0.2 pyramid-debugtoolbar==4.12.1 qrcode==7.4.2 image==1.5.33 -shapely==2.0.3 +shapely==2.0.4 SQLAlchemy==2.0.29 pyaml-env==1.2.1 urllib3==2.2.1 From fa719a209f276ad784a957bcfb6bea183a275afd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 07:39:24 +0200 Subject: [PATCH 42/62] Update dependency Sphinx to v7.3.4 (#1971) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index c8faa0331b..900c8e54c9 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,7 +1,7 @@ flake8==7.0.0 pyflakes==3.2.0 pycodestyle==2.11.1 -Sphinx==7.2.6 +Sphinx==7.3.4 sphinx_rtd_theme==2.0.0 psycopg2==2.9.9 mccabe==0.7.0 From cd09fa35c81a3fdb5eb6058ee163b9ff62a95750 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 07:55:46 +0200 Subject: [PATCH 43/62] Update dependency Sphinx to v7.3.5 (#1972) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 900c8e54c9..fccd999100 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,7 +1,7 @@ flake8==7.0.0 pyflakes==3.2.0 pycodestyle==2.11.1 -Sphinx==7.3.4 +Sphinx==7.3.5 sphinx_rtd_theme==2.0.0 psycopg2==2.9.9 mccabe==0.7.0 From 7223fdb47627e76b4163c737bc3ac3d04965f1e8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 08:23:33 +0200 Subject: [PATCH 44/62] Update dependency Sphinx to v7.3.6 (#1975) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index fccd999100..667f03f265 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,7 +1,7 @@ flake8==7.0.0 pyflakes==3.2.0 pycodestyle==2.11.1 -Sphinx==7.3.5 +Sphinx==7.3.6 sphinx_rtd_theme==2.0.0 psycopg2==2.9.9 mccabe==0.7.0 From a224f067ea0344e3189028009ce228b1cd45e2ff Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 08:24:39 +0200 Subject: [PATCH 45/62] Update JamesIves/github-pages-deploy-action action to v4.6.0 (#1974) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8872f9b4a7..55b25d34c0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -102,7 +102,7 @@ jobs: sudo apt-get install libpq-dev make doc-html - name: Deploy 🚀 - uses: JamesIves/github-pages-deploy-action@v4.5.0 + uses: JamesIves/github-pages-deploy-action@v4.6.0 with: branch: gh-pages # The branch the action should deploy to. folder: doc/build/html # The folder the action should deploy. From 7673e0df42c73b9d3c6f614c26707a30538999bd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 11:04:21 +0200 Subject: [PATCH 46/62] Update dependency Sphinx to v7.3.7 (#1976) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 667f03f265..c58cbb779d 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,7 +1,7 @@ flake8==7.0.0 pyflakes==3.2.0 pycodestyle==2.11.1 -Sphinx==7.3.6 +Sphinx==7.3.7 sphinx_rtd_theme==2.0.0 psycopg2==2.9.9 mccabe==0.7.0 From 27623cd299a204fcd0a21e0cf88be6cb52c915d0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 08:16:18 +0200 Subject: [PATCH 47/62] Update actions/checkout digest to 1d96c77 (#1977) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 10 +++++----- .github/workflows/daily_check.yaml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 55b25d34c0..7e16bba388 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,7 +7,7 @@ jobs: name: Check style (lint) runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install libpq-dev @@ -18,7 +18,7 @@ jobs: name: Check style (git-attributes) runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install libpq-dev @@ -51,7 +51,7 @@ jobs: - '3.10' - '3.11' steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 - name: Set up Python v${{ matrix.python-version }} uses: actions/setup-python@v5 with: @@ -77,7 +77,7 @@ jobs: name: Check federal data definitions runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install xsltproc @@ -94,7 +94,7 @@ jobs: if: github.ref == 'refs/heads/master' runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 - name: Make documentation run: | sudo rm /etc/apt/sources.list.d/*.list diff --git a/.github/workflows/daily_check.yaml b/.github/workflows/daily_check.yaml index 991de87987..0e089d8319 100644 --- a/.github/workflows/daily_check.yaml +++ b/.github/workflows/daily_check.yaml @@ -8,7 +8,7 @@ jobs: name: Check federal data definitions runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install xsltproc @@ -46,7 +46,7 @@ jobs: - python3.10 - python3.11 steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install libpq-dev From 85053eba033388460241c58649923d073dfdd761 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 07:13:41 +0200 Subject: [PATCH 48/62] Update dependency geoalchemy2 to v0.15.0 (#1978) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c44dc56510..fcfcc37297 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ pypdf==4.2.0 filetype==1.2.0 -geoalchemy2==0.14.7 +geoalchemy2==0.15.0 pyramid==2.0.2 pyramid-debugtoolbar==4.12.1 qrcode==7.4.2 From 117120a01d106f31384825366a8066ebd9a203c7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 07:07:43 +0200 Subject: [PATCH 49/62] Update actions/checkout digest to 0ad4b8f (#1979) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 10 +++++----- .github/workflows/daily_check.yaml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7e16bba388..631e174c53 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,7 +7,7 @@ jobs: name: Check style (lint) runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install libpq-dev @@ -18,7 +18,7 @@ jobs: name: Check style (git-attributes) runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install libpq-dev @@ -51,7 +51,7 @@ jobs: - '3.10' - '3.11' steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - name: Set up Python v${{ matrix.python-version }} uses: actions/setup-python@v5 with: @@ -77,7 +77,7 @@ jobs: name: Check federal data definitions runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install xsltproc @@ -94,7 +94,7 @@ jobs: if: github.ref == 'refs/heads/master' runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - name: Make documentation run: | sudo rm /etc/apt/sources.list.d/*.list diff --git a/.github/workflows/daily_check.yaml b/.github/workflows/daily_check.yaml index 0e089d8319..2644e8b67c 100644 --- a/.github/workflows/daily_check.yaml +++ b/.github/workflows/daily_check.yaml @@ -8,7 +8,7 @@ jobs: name: Check federal data definitions runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install xsltproc @@ -46,7 +46,7 @@ jobs: - python3.10 - python3.11 steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install libpq-dev From 345cc698d98545b1ca8b2715192d0b96a1f51122 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 07:33:09 +0200 Subject: [PATCH 50/62] Update dependency pytest to v8.2.0 (#1980) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- tests-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests-requirements.txt b/tests-requirements.txt index 9ed65a2edc..b101d8bf83 100644 --- a/tests-requirements.txt +++ b/tests-requirements.txt @@ -1,6 +1,6 @@ jsonschema==4.21.1 lxml==5.2.1 -pytest==8.1.1 +pytest==8.2.0 pytest-cov==5.0.0 pytest-ordering==0.6 requests-mock==1.12.1 From 0b2dcea3fdab64c8910794b7eca877a90f114c55 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 07:13:58 +0200 Subject: [PATCH 51/62] Update dependency jsonschema to v4.22.0 (#1981) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- tests-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests-requirements.txt b/tests-requirements.txt index b101d8bf83..5f3a33b32a 100644 --- a/tests-requirements.txt +++ b/tests-requirements.txt @@ -1,4 +1,4 @@ -jsonschema==4.21.1 +jsonschema==4.22.0 lxml==5.2.1 pytest==8.2.0 pytest-cov==5.0.0 From 7d43d5740cef14672e3cbe42dae35ca2584ab1fe Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 07:48:31 +0200 Subject: [PATCH 52/62] Update dependency geoalchemy2 to v0.15.1 (#1982) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fcfcc37297..a3c46ab3e5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ pypdf==4.2.0 filetype==1.2.0 -geoalchemy2==0.15.0 +geoalchemy2==0.15.1 pyramid==2.0.2 pyramid-debugtoolbar==4.12.1 qrcode==7.4.2 From e675187a4ad0486da2b18e1862e47b66eae0f7b3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 07:15:46 +0200 Subject: [PATCH 53/62] Update dependency SQLAlchemy to v2.0.30 (#1983) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a3c46ab3e5..f721c743f6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ pyramid-debugtoolbar==4.12.1 qrcode==7.4.2 image==1.5.33 shapely==2.0.4 -SQLAlchemy==2.0.29 +SQLAlchemy==2.0.30 pyaml-env==1.2.1 urllib3==2.2.1 waitress==3.0.0 From 87aaa3f3167f4fb18dbe7c1ee36941c562d7bdce Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 06:39:51 +0200 Subject: [PATCH 54/62] Update dependency requests to v2.32.1 (#1989) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f721c743f6..5d44f1bc3f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ urllib3==2.2.1 waitress==3.0.0 pyreproj==3.0.0 mako-render==0.1.0 -requests==2.31.0 +requests==2.32.1 geolink-formatter==2.0.5 pyconizer==0.1.4 c2cwsgiutils[standard]==6.0.8 From 5a4cf3ab49e65810885726bd8ec1445fe0d10691 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 06:41:38 +0200 Subject: [PATCH 55/62] Update dependency pytest to v8.2.1 (#1987) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- tests-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests-requirements.txt b/tests-requirements.txt index 5f3a33b32a..2d1c08bb35 100644 --- a/tests-requirements.txt +++ b/tests-requirements.txt @@ -1,6 +1,6 @@ jsonschema==4.22.0 lxml==5.2.1 -pytest==8.2.0 +pytest==8.2.1 pytest-cov==5.0.0 pytest-ordering==0.6 requests-mock==1.12.1 From d7a5a0ed14bfd85994649b11a71bec5b4646eb47 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 06:41:54 +0200 Subject: [PATCH 56/62] Update actions/checkout digest to a5ac7e5 (#1988) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 10 +++++----- .github/workflows/daily_check.yaml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 631e174c53..a8b3195f6f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,7 +7,7 @@ jobs: name: Check style (lint) runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install libpq-dev @@ -18,7 +18,7 @@ jobs: name: Check style (git-attributes) runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install libpq-dev @@ -51,7 +51,7 @@ jobs: - '3.10' - '3.11' steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - name: Set up Python v${{ matrix.python-version }} uses: actions/setup-python@v5 with: @@ -77,7 +77,7 @@ jobs: name: Check federal data definitions runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install xsltproc @@ -94,7 +94,7 @@ jobs: if: github.ref == 'refs/heads/master' runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - name: Make documentation run: | sudo rm /etc/apt/sources.list.d/*.list diff --git a/.github/workflows/daily_check.yaml b/.github/workflows/daily_check.yaml index 2644e8b67c..b823dd1dd6 100644 --- a/.github/workflows/daily_check.yaml +++ b/.github/workflows/daily_check.yaml @@ -8,7 +8,7 @@ jobs: name: Check federal data definitions runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install xsltproc @@ -46,7 +46,7 @@ jobs: - python3.10 - python3.11 steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install libpq-dev From decccd229ea5f8f328f3bbd058a6c73c8d012db1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 06:42:11 +0200 Subject: [PATCH 57/62] Update JamesIves/github-pages-deploy-action action to v4.6.1 (#1986) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a8b3195f6f..25743ac61a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -102,7 +102,7 @@ jobs: sudo apt-get install libpq-dev make doc-html - name: Deploy 🚀 - uses: JamesIves/github-pages-deploy-action@v4.6.0 + uses: JamesIves/github-pages-deploy-action@v4.6.1 with: branch: gh-pages # The branch the action should deploy to. folder: doc/build/html # The folder the action should deploy. From f5cd8deba3d2ca09aab91ef7d51f801bbc690849 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 06:47:59 +0200 Subject: [PATCH 58/62] Update dependency lxml to v5.2.2 (#1985) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- tests-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests-requirements.txt b/tests-requirements.txt index 2d1c08bb35..107728dc79 100644 --- a/tests-requirements.txt +++ b/tests-requirements.txt @@ -1,5 +1,5 @@ jsonschema==4.22.0 -lxml==5.2.1 +lxml==5.2.2 pytest==8.2.1 pytest-cov==5.0.0 pytest-ordering==0.6 From f88c164fb1dadbff15ef8ca56205bef1f605e0c9 Mon Sep 17 00:00:00 2001 From: Wolfgang Kaltz Date: Fri, 24 May 2024 08:34:49 +0200 Subject: [PATCH 59/62] Add Python 3.12 support (#1973) * Add Python 3.12 support * added tests/__init__.py * #1973 migrate from setup.py to pyproject.toml * #1973 move editable install within Makefile to cope with coverage --------- Co-authored-by: Dominik Frey --- .dockerignore | 6 +- .github/workflows/ci.yaml | 17 +-- .github/workflows/daily_check.yaml | 9 +- Dockerfile | 4 +- MANIFEST.in | 2 +- Makefile | 15 ++- dev-requirements.txt | 10 -- pyproject.toml | 117 ++++++++++++++++++ pytest.ini | 3 - requirements.txt | 18 --- setup.cfg | 6 - setup.py | 65 ---------- tests-requirements.txt | 9 -- .../test_mapfish_print.py | 4 +- 14 files changed, 147 insertions(+), 138 deletions(-) delete mode 100644 dev-requirements.txt create mode 100644 pyproject.toml delete mode 100644 pytest.ini delete mode 100644 requirements.txt delete mode 100644 setup.cfg delete mode 100644 setup.py delete mode 100644 tests-requirements.txt diff --git a/.dockerignore b/.dockerignore index 829aadd5e9..d263cf713f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,14 +1,10 @@ * !pyramid_oereb -!requirements.txt -!setup.py !README.rst !CHANGES.rst !docker !logo_*.jpg !tests !MANIFEST.in -!pytest.ini !.coveragerc -!tests-requirements.txt -!dev-requirements.txt +!pyproject.toml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 25743ac61a..8d7b80344e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,7 +7,7 @@ jobs: name: Check style (lint) runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install libpq-dev @@ -18,7 +18,7 @@ jobs: name: Check style (git-attributes) runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install libpq-dev @@ -50,8 +50,9 @@ jobs: - '3.9' - '3.10' - '3.11' + - '3.12' steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Set up Python v${{ matrix.python-version }} uses: actions/setup-python@v5 with: @@ -77,7 +78,7 @@ jobs: name: Check federal data definitions runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install xsltproc @@ -94,7 +95,7 @@ jobs: if: github.ref == 'refs/heads/master' runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Make documentation run: | sudo rm /etc/apt/sources.list.d/*.list @@ -102,7 +103,7 @@ jobs: sudo apt-get install libpq-dev make doc-html - name: Deploy 🚀 - uses: JamesIves/github-pages-deploy-action@v4.6.1 + uses: JamesIves/github-pages-deploy-action@v4.5.0 with: branch: gh-pages # The branch the action should deploy to. folder: doc/build/html # The folder the action should deploy. @@ -113,10 +114,10 @@ jobs: needs: [lint, gitattributes] steps: - uses: actions/checkout@master - - name: Set up Python 3.11 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: 3.12 - name: Install pypa/build run: >- python -m diff --git a/.github/workflows/daily_check.yaml b/.github/workflows/daily_check.yaml index b823dd1dd6..0ea149dcc4 100644 --- a/.github/workflows/daily_check.yaml +++ b/.github/workflows/daily_check.yaml @@ -8,7 +8,7 @@ jobs: name: Check federal data definitions runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install xsltproc @@ -45,8 +45,9 @@ jobs: - python3.9 - python3.10 - python3.11 + - python3.12 steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install libpq-dev @@ -54,10 +55,10 @@ jobs: env: PYTHON_TEST_VERSION: ${{ matrix.python-version }} run: make tests - - name: Set up Python 3.11 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: 3.12 - name: Install pypa/build run: >- python -m diff --git a/Dockerfile b/Dockerfile index 097322c836..2c571d878b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11-bullseye +FROM python:3.12.3-bullseye ENV DEBIAN_FRONTEND=noninteractive @@ -26,7 +26,5 @@ COPY . /workspace/ WORKDIR /workspace -RUN pip install -r requirements.txt -r tests-requirements.txt -r dev-requirements.txt - # keep container running until killed - For DEV use only CMD [ "pserve", "development.ini", "--reload"] diff --git a/MANIFEST.in b/MANIFEST.in index 563c9bf690..7180208abe 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ -include README.rst CHANGES.rst requirements.txt +include README.rst CHANGES.rst recursive-include pyramid_oereb/standard *.mako recursive-include pyramid_oereb/standard *.xml recursive-include pyramid_oereb/core/renderer *.xml diff --git a/Makefile b/Makefile index 2b469c717e..f4c088c1b8 100644 --- a/Makefile +++ b/Makefile @@ -64,9 +64,10 @@ ${VENV_ROOT}/timestamp: python3 -m venv ${VENV_ROOT} touch $@ -${VENV_ROOT}/requirements-timestamp: ${VENV_ROOT}/timestamp setup.py requirements.txt tests-requirements.txt dev-requirements.txt +${VENV_ROOT}/requirements-timestamp: ${VENV_ROOT}/timestamp pyproject.toml $(VENV_BIN)/$(PIP_COMMAND) install --upgrade pip wheel - $(VENV_BIN)/$(PIP_COMMAND) install -r requirements.txt -r tests-requirements.txt -r dev-requirements.txt + $(VENV_BIN)/$(PIP_COMMAND) install .[recommend] .[testing] .[dev] + $(VENV_BIN)/$(PIP_COMMAND) install --editable . touch $@ ########## @@ -260,8 +261,7 @@ clean_dev_db_scripts: .PHONY: install install: ${VENV_ROOT}/requirements-timestamp -$(DEV_CREATE_MAIN_TABLES_SCRIPT) $(DEV_CREATE_STANDARD_TABLES_SCRIPT) $(DEV_CREATE_OEREBLEX_TABLES_SCRIPT) $(DEV_CREATE_STANDARD_YML_SCRIPT): setup.py $(BUILD_DEPS) - $(VENV_BIN)/python $< develop +$(DEV_CREATE_MAIN_TABLES_SCRIPT) $(DEV_CREATE_STANDARD_TABLES_SCRIPT) $(DEV_CREATE_OEREBLEX_TABLES_SCRIPT) $(DEV_CREATE_STANDARD_YML_SCRIPT): pyproject.toml $(BUILD_DEPS) development.ini: install $(VENV_BIN)/mako-render --var pyramid_oereb_port=$(PYRAMID_OEREB_PORT) --var pyramid_stats_url=$(STATS_URL) development.ini.mako > development.ini @@ -273,14 +273,20 @@ build: install $(DEV_CREATE_MAIN_TABLES_SCRIPT) $(DEV_CREATE_STANDARD_TABLES_SCR clean: clean_fed_data clean_dev_db_scripts rm -f $(DEV_CONFIGURATION_YML) rm -f coverage.core.xml + rm -f coverage.core_adapter.xml rm -f coverage.contrib-data_sources-standard.xml rm -f coverage.contrib-data_sources-interlis.xml + rm -f coverage.contrib-data_sources-oereblex.xml + rm -f coverage.contrib-data_sources-swisstopo.xml rm -f coverage.contrib-print_proxy-mapfish_print.xml rm -f coverage.contrib-stats.xml + rm -f .coverage + rm -rf tmp .PHONY: clean-all clean-all: clean rm -rf ${VENV_ROOT} + rm -rf build rm -f development.ini rm -rf $(PACKAGE).egg-info @@ -310,6 +316,7 @@ test-core_adapter: ${VENV_ROOT}/requirements-timestamp .PHONY: test-contrib-print_proxy-mapfish_print test-contrib-print_proxy-mapfish_print: ${VENV_ROOT}/requirements-timestamp + mkdir ./tmp $(VENV_BIN)/py.test -vv $(PYTEST_OPTS) --cov-config .coveragerc.contrib-print_proxy-mapfish_print --cov $(PACKAGE) --cov-report xml:coverage.contrib-print_proxy-mapfish_print.xml tests/contrib.print_proxy.mapfish_print .PHONY: test-contrib-data_sources-standard diff --git a/dev-requirements.txt b/dev-requirements.txt deleted file mode 100644 index c58cbb779d..0000000000 --- a/dev-requirements.txt +++ /dev/null @@ -1,10 +0,0 @@ -flake8==7.0.0 -pyflakes==3.2.0 -pycodestyle==2.11.1 -Sphinx==7.3.7 -sphinx_rtd_theme==2.0.0 -psycopg2==2.9.9 -mccabe==0.7.0 -c2c.template==2.4.2 -yappi --e . diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000000..c8eb1776e9 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,117 @@ +[build-system] +requires = [ + "setuptools >= 69.5.1", + "wheel" +] +build-backend = "setuptools.build_meta" + +[project] +name = "pyramid_oereb" +version = "2.5.0" +description = "pyramid_oereb, extension for pyramid web frame work to provide a basic server part for the oereb project" + +classifiers=[ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Framework :: Pyramid", + "Topic :: Internet :: WWW/HTTP", + "Topic :: Internet :: WWW/HTTP :: WSGI :: Application" + ] +license = {file = "LICENSE.txt"} +authors = [ + {name = "François Voisard", email = "francois.voisard@ne.ch"}, +] +keywords = ["pyramid oereb"] +readme = "README.rst" + +[project.urls] +Repository = "https://github.com/openoereb/pyramid_oereb" +Changelog = "https://github.com/openoereb/pyramid_oereb/blob/master/CHANGES.rst" + +[project.optional-dependencies] +# Dependencies listed in "recommend" must be included in "no-version" without explicit version number +recommend = [ + "pypdf==4.2.0", + "filetype==1.2.0", + "geoalchemy2==0.15.1", + "pyramid==2.0.2", + "pyramid-debugtoolbar==4.12.1", + "qrcode==7.4.2", + "image==1.5.33", + "shapely==2.0.4", + "SQLAlchemy==2.0.30", + "pyaml-env==1.2.1", + "urllib3==2.2.1", + "waitress==3.0.0", + "pyreproj==3.0.0", + "mako-render==0.1.0", + "requests==2.32.1", + "geolink-formatter==2.0.5", + "pyconizer==0.1.4", + "c2cwsgiutils[standard]==6.0.8"] +no-version = [ + "pypdf", + "filetype", + "geoalchemy2", + "pyramid", + "pyramid-debugtoolbar", + "qrcode", + "image", + "shapely", + "SQLAlchemy", + "pyaml-env", + "urllib3", + "waitress", + "pyreproj", + "mako-render", + "requests", + "geolink-formatter", + "pyconizer", + "c2cwsgiutils[standard]"] +testing = [ + "jsonschema==4.22.0", + "lxml==5.2.2", + "pytest==8.2.1", + "pytest-cov==5.0.0", + "pytest-ordering==0.6", + "requests-mock==1.12.1", + "responses==0.25.0", + "webtest==3.0.0", + "pillow==10.3.0"] +dev = [ + "flake8==7.0.0", + "Flake8-pyproject==1.2.3", + "pyflakes==3.2.0", + "pycodestyle==2.11.1", + "Sphinx==7.3.7", + "sphinx_rtd_theme==2.0.0", + "psycopg2==2.9.9", + "mccabe==0.7.0", + "c2c.template==2.4.2", + "yappi"] + +[tool.setuptools.packages.find] + +[project.entry-points."paste.app_factory"] +main = "pyramid_oereb:main" + +[project.scripts] +create_standard_tables = "pyramid_oereb.contrib.data_sources.standard.create_tables:create_standard_tables" +create_oereblex_tables = "pyramid_oereb.contrib.data_sources.oereblex.create_tables:create_oereblex_tables" +create_main_schema_tables = "pyramid_oereb.contrib.data_sources.create_tables:create_main_schema_tables" +create_example_yaml = "dev.config.create_yaml:create_yaml" +create_theme_tables = "pyramid_oereb.contrib.data_sources.create_tables:create_theme_tables" +create_legend_entries = "pyramid_oereb.contrib.data_sources.standard.load_legend_entries:run" +create_stats_tables = "pyramid_oereb.contrib.stats.scripts.create_stats_tables:create_stats_tables" + +[tool.flake8] +exclude = [".venv", "tests/init_db.py"] +max-line-length = 110 + +[tool.pytest.ini_options] +testpaths = ["tests"] +python_files = ["test_*.py"] diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index 27eec68ed7..0000000000 --- a/pytest.ini +++ /dev/null @@ -1,3 +0,0 @@ -[pytest] -testpaths = tests -python_files = test_*.py diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 5d44f1bc3f..0000000000 --- a/requirements.txt +++ /dev/null @@ -1,18 +0,0 @@ -pypdf==4.2.0 -filetype==1.2.0 -geoalchemy2==0.15.1 -pyramid==2.0.2 -pyramid-debugtoolbar==4.12.1 -qrcode==7.4.2 -image==1.5.33 -shapely==2.0.4 -SQLAlchemy==2.0.30 -pyaml-env==1.2.1 -urllib3==2.2.1 -waitress==3.0.0 -pyreproj==3.0.0 -mako-render==0.1.0 -requests==2.32.1 -geolink-formatter==2.0.5 -pyconizer==0.1.4 -c2cwsgiutils[standard]==6.0.8 diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index da3ec25f07..0000000000 --- a/setup.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[bdist_wheel] -universal = 1 - -[flake8] -exclude = .venv tests/init_db.py -max-line-length = 110 diff --git a/setup.py b/setup.py deleted file mode 100644 index b087cd804a..0000000000 --- a/setup.py +++ /dev/null @@ -1,65 +0,0 @@ -# -*- coding: utf-8 -*- - -import os -import re -from setuptools import setup, find_packages - -HERE = os.path.abspath(os.path.dirname(__file__)) -with open(os.path.join(HERE, 'README.rst')) as f: - README = f.read() -with open(os.path.join(HERE, 'CHANGES.rst')) as f: - CHANGES = f.read() -with open('requirements.txt') as f: - re_ = a = re.compile(r'(.+)==') - recommend = f.read().splitlines() -requires = [re_.match(r).group(1) for r in recommend] - -with open('tests-requirements.txt') as f: - re_ = a = re.compile(r'(.+)==') - tests_require = f.read().splitlines() - -setup( - name='pyramid_oereb', - version='2.5.0', - 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), - long_description_content_type='text/x-rst', - classifiers=[ - "Development Status :: 5 - Production/Stable", - "Intended Audience :: Developers", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Framework :: Pyramid", - "Topic :: Internet :: WWW/HTTP", - "Topic :: Internet :: WWW/HTTP :: WSGI :: Application" - ], - license='BSD 2', - author='François Voisard', - author_email='francois.voisard@ne.ch', - url='https://github.com/openoereb/pyramid_oereb', - keywords='pyramid oereb', - packages=find_packages(), - include_package_data=True, - zip_safe=False, - extras_require={ - 'recommend': recommend, - 'no-version': requires, - 'testing': tests_require - }, - entry_points={ - 'paste.app_factory': [ - 'main = pyramid_oereb:main' - ], - 'console_scripts': [ - 'create_standard_tables = pyramid_oereb.contrib.data_sources.standard.create_tables:create_standard_tables', # noqa: E501 - 'create_oereblex_tables = pyramid_oereb.contrib.data_sources.oereblex.create_tables:create_oereblex_tables', # noqa: E501 - 'create_main_schema_tables = pyramid_oereb.contrib.data_sources.create_tables:create_main_schema_tables', # noqa: E501 - 'create_example_yaml = dev.config.create_yaml:create_yaml', - 'create_theme_tables = pyramid_oereb.contrib.data_sources.create_tables:create_theme_tables', - 'create_legend_entries = pyramid_oereb.contrib.data_sources.standard.load_legend_entries:run', - 'create_stats_tables = pyramid_oereb.contrib.stats.scripts.create_stats_tables:create_stats_tables' # noqa: E501 - ] - } -) diff --git a/tests-requirements.txt b/tests-requirements.txt deleted file mode 100644 index 107728dc79..0000000000 --- a/tests-requirements.txt +++ /dev/null @@ -1,9 +0,0 @@ -jsonschema==4.22.0 -lxml==5.2.2 -pytest==8.2.1 -pytest-cov==5.0.0 -pytest-ordering==0.6 -requests-mock==1.12.1 -responses==0.25.0 -webtest==3.0.0 -pillow==10.3.0 diff --git a/tests/contrib.print_proxy.mapfish_print/test_mapfish_print.py b/tests/contrib.print_proxy.mapfish_print/test_mapfish_print.py index 9dc4a0a4df..92ec3ac9e9 100644 --- a/tests/contrib.print_proxy.mapfish_print/test_mapfish_print.py +++ b/tests/contrib.print_proxy.mapfish_print/test_mapfish_print.py @@ -738,7 +738,7 @@ def test_archive_pdf(DummyRenderInfo): 'CreationDate': '2023-08-21T13:48:07' } renderer.set_global_datetime(extract['CreationDate']) - path_and_filename = renderer.archive_pdf_file('/tmp', bytes(), extract) + path_and_filename = renderer.archive_pdf_file('./tmp', bytes(), extract) partial_filename = str('_') + extract['RealEstate_EGRID'] + '.pdf' assert partial_filename in path_and_filename assert os.path.isfile(path_and_filename) @@ -752,7 +752,7 @@ def test_archive_pdf_identdn(DummyRenderInfo): 'CreationDate': '2023-08-21T13:48:07' } renderer.set_global_datetime(extract['CreationDate']) - path_and_filename = renderer.archive_pdf_file('/tmp', bytes(), extract) + path_and_filename = renderer.archive_pdf_file('./tmp', bytes(), extract) partial_filename = extract['RealEstate_IdentDN'] + str('_') + extract['RealEstate_Number'] + '.pdf' assert partial_filename in path_and_filename assert os.path.isfile(path_and_filename) From 67f14c823edde2a15a3eda68a4f5d180c974d6a3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 08:39:19 +0200 Subject: [PATCH 60/62] Update actions/checkout digest to a5ac7e5 (#1991) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 10 +++++----- .github/workflows/daily_check.yaml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8d7b80344e..a054fdcea2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,7 +7,7 @@ jobs: name: Check style (lint) runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install libpq-dev @@ -18,7 +18,7 @@ jobs: name: Check style (git-attributes) runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install libpq-dev @@ -52,7 +52,7 @@ jobs: - '3.11' - '3.12' steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - name: Set up Python v${{ matrix.python-version }} uses: actions/setup-python@v5 with: @@ -78,7 +78,7 @@ jobs: name: Check federal data definitions runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install xsltproc @@ -95,7 +95,7 @@ jobs: if: github.ref == 'refs/heads/master' runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - name: Make documentation run: | sudo rm /etc/apt/sources.list.d/*.list diff --git a/.github/workflows/daily_check.yaml b/.github/workflows/daily_check.yaml index 0ea149dcc4..c1bd4c9fdd 100644 --- a/.github/workflows/daily_check.yaml +++ b/.github/workflows/daily_check.yaml @@ -8,7 +8,7 @@ jobs: name: Check federal data definitions runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install xsltproc @@ -47,7 +47,7 @@ jobs: - python3.11 - python3.12 steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - run: sudo rm /etc/apt/sources.list.d/*.list - run: sudo apt update - run: sudo apt-get install libpq-dev From e5836ac1a14a036281d9665c4179689c1d953654 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 08:39:52 +0200 Subject: [PATCH 61/62] Update dependency recommend/requests to v2.32.2 (#1992) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c8eb1776e9..f9f50cc2c5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,7 +49,7 @@ recommend = [ "waitress==3.0.0", "pyreproj==3.0.0", "mako-render==0.1.0", - "requests==2.32.1", + "requests==2.32.2", "geolink-formatter==2.0.5", "pyconizer==0.1.4", "c2cwsgiutils[standard]==6.0.8"] From c13f3b830ce6545ed8ed1261fc3b7c44a2da69ad Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 08:47:42 +0200 Subject: [PATCH 62/62] Update JamesIves/github-pages-deploy-action action to v4.6.1 (#1993) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a054fdcea2..8e4a771671 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -103,7 +103,7 @@ jobs: sudo apt-get install libpq-dev make doc-html - name: Deploy 🚀 - uses: JamesIves/github-pages-deploy-action@v4.5.0 + uses: JamesIves/github-pages-deploy-action@v4.6.1 with: branch: gh-pages # The branch the action should deploy to. folder: doc/build/html # The folder the action should deploy.