diff --git a/CHANGES.rst b/CHANGES.rst index 3271c0acae..ff8aae5a52 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -9,6 +9,11 @@ master ------ - Support Oereblex API version 1.2.5 via geolink-formatter 2.0.6 (#2081) +2.5.5 +------------- +* Library upgrades (pillow, pytest, webtest, waitress, codecov/codecov-action, geoalchemy, JamesIves/github-pages-deploy-action, urllib3) +* Reset Python Docker Tag to 3.12.5 + 2.5.4 ----- - New parameter default_toc_length to define a default table of content pages number (#2042) diff --git a/dev/database/structure/80_oereb_fed_test.sql b/dev/database/structure/80_oereb_fed_test.sql index 403ef1556b..2729a97f9c 100644 --- a/dev/database/structure/80_oereb_fed_test.sql +++ b/dev/database/structure/80_oereb_fed_test.sql @@ -2971,8 +2971,8 @@ OeREBKRM_V2_0.Dokumente.Dokument.Typ typ dokument \N -- COPY contaminated_civil_aviation_sites.t_ili2db_basket (t_id, dataset, topic, t_ili_tid, attachmentkey, domains) FROM stdin; -2 1 OeREBKRM_V2_0.Dokumente \N OeREBKRM_V2_0_Gesetze_20210414.xml-2 -81 80 OeREBKRMtrsfr_V2_0.Transferstruktur \N interlis.xtf-81 +2 1 OeREBKRM_V2_0.Dokumente \N OeREBKRM_V2_0_Gesetze_20210414.xml-2 +81 80 OeREBKRMtrsfr_V2_0.Transferstruktur \N interlis.xtf-81 \. @@ -3820,9 +3820,9 @@ OeREBKRM_V2_0.Dokumente.Dokument.Typ typ dokument \N -- COPY oerebkrmkvs_v2_0.t_ili2db_basket (t_id, dataset, topic, t_ili_tid, attachmentkey, domains) FROM stdin; -2 1 OeREBKRM_V2_0.Dokumente \N OeREBKRM_V2_0_Gesetze_20210414.xml-2 -81 80 OeREBKRMkvs_V2_0.Thema \N OeREBKRM_V2_0_Themen_20210915.xml-81 -179 178 OeREBKRMkvs_V2_0.Konfiguration \N OeREBKRM_V2_0_Logos_20210915.xml-179 +2 1 OeREBKRM_V2_0.Dokumente \N OeREBKRM_V2_0_Gesetze_20210414.xml-2 +81 80 OeREBKRMkvs_V2_0.Thema \N OeREBKRM_V2_0_Themen_20210915.xml-81 +179 178 OeREBKRMkvs_V2_0.Konfiguration \N OeREBKRM_V2_0_Logos_20210915.xml-179 \. @@ -6245,4 +6245,3 @@ ALTER TABLE ONLY oerebkrmkvs_v2_0.themaref -- -- PostgreSQL database dump complete -- - diff --git a/dev/sample_data/ch.disclaimer.json b/dev/sample_data/ch.disclaimer.json index 9d933b2718..a200184b62 100644 --- a/dev/sample_data/ch.disclaimer.json +++ b/dev/sample_data/ch.disclaimer.json @@ -33,4 +33,3 @@ "extract_index": 20 } ] - diff --git a/dev/sample_data/ch.document_type.json b/dev/sample_data/ch.document_type.json index 87603960e8..1c0140c1e2 100644 --- a/dev/sample_data/ch.document_type.json +++ b/dev/sample_data/ch.document_type.json @@ -31,4 +31,3 @@ } } ] - diff --git a/dev/sample_data/ch.general_information.json b/dev/sample_data/ch.general_information.json index 25f38769f5..9351becb38 100644 --- a/dev/sample_data/ch.general_information.json +++ b/dev/sample_data/ch.general_information.json @@ -16,4 +16,3 @@ "extract_index": 0 } ] - diff --git a/dev/sample_data/ch.glossary.json b/dev/sample_data/ch.glossary.json index 9543713210..ddac8e3ebb 100644 --- a/dev/sample_data/ch.glossary.json +++ b/dev/sample_data/ch.glossary.json @@ -497,4 +497,3 @@ } } ] - diff --git a/dev/sample_data/ch.law_responsible_offices.json b/dev/sample_data/ch.law_responsible_offices.json index 92b551e400..f5b7045089 100644 --- a/dev/sample_data/ch.law_responsible_offices.json +++ b/dev/sample_data/ch.law_responsible_offices.json @@ -19,4 +19,3 @@ "uid": "CHE263297189" } ] - diff --git a/dev/sample_data/ch.law_status.json b/dev/sample_data/ch.law_status.json index a96377258f..00291840cd 100644 --- a/dev/sample_data/ch.law_status.json +++ b/dev/sample_data/ch.law_status.json @@ -31,4 +31,3 @@ } } ] - diff --git a/dev/sample_data/ch.laws.json b/dev/sample_data/ch.laws.json index 03378c7347..a40f7ca604 100644 --- a/dev/sample_data/ch.laws.json +++ b/dev/sample_data/ch.laws.json @@ -491,4 +491,3 @@ "office_id": "ch.admin.bk" } ] - diff --git a/dev/sample_data/ch.logo.json b/dev/sample_data/ch.logo.json index 18ed4973dd..5db36b4af6 100644 --- a/dev/sample_data/ch.logo.json +++ b/dev/sample_data/ch.logo.json @@ -20,4 +20,3 @@ } } ] - diff --git a/dev/sample_data/ch.real_estate_type.json b/dev/sample_data/ch.real_estate_type.json index b7e07f0e51..de912371d1 100644 --- a/dev/sample_data/ch.real_estate_type.json +++ b/dev/sample_data/ch.real_estate_type.json @@ -61,4 +61,3 @@ } } ] - diff --git a/dev/sample_data/ch.themes.json b/dev/sample_data/ch.themes.json index 86c164777b..7a97d4ca45 100644 --- a/dev/sample_data/ch.themes.json +++ b/dev/sample_data/ch.themes.json @@ -287,4 +287,3 @@ } } ] - diff --git a/dev/sample_data/ch.themes_docs.json b/dev/sample_data/ch.themes_docs.json index d27aa711f6..64233e1667 100644 --- a/dev/sample_data/ch.themes_docs.json +++ b/dev/sample_data/ch.themes_docs.json @@ -181,4 +181,3 @@ "article_numbers": null } ] - diff --git a/doc/source/changes.rst b/doc/source/changes.rst index 940fc55b50..c3d1fd916f 100644 --- a/doc/source/changes.rst +++ b/doc/source/changes.rst @@ -10,6 +10,13 @@ master ------ - Support of Oereblex API version 1.2.5 via geolink-formatter 2.0.6 added (#2081). The oereblex schema version that is used to download oereblex xmls can be set in the file pyramid_oereb.yaml. +Version 2.5.5 +------------- +Maintenance release: + +* Library upgrades (pillow, pytest, webtest, waitress, codecov/codecov-action, geoalchemy, JamesIves/github-pages-deploy-action, urllib3) +* Reset Python Docker Tag to 3.12.5 + Version 2.5.4 ------------- Feature and maintenance release: diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 217383326f..e3ce61e15f 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -6,11 +6,11 @@ Configuration You are looking at a highly configurable piece of software. To get a good understanding of the server it is recommended to read this part carefully. -The specifications of the oereb data model, the web services, the data extracts and the print layout +The specifications of the oereb data model, the web services, the data extracts and the print layout by the Swiss Confederation are very precise `OEREB specifications -`__ . Code development was guided -by the exact implementation of the specifications and the user requirements. Using this pyramid plugin, -you will get a running server providing all the services defined by the federal specifications. +`__ . Code development was guided +by the exact implementation of the specifications and the user requirements. Using this pyramid plugin, +you will get a running server providing all the services defined by the federal specifications. The binding of cantonal and federal data to the server is done by the configuration options. This section describes the different possibilities to adapt the application to work with various data structures or @@ -40,7 +40,7 @@ Interlis 2.3 OeREBKRM Transfer Model All the federal data sets are provided in this data structure. So this is the schema and table model you want to use for all the federal topics unless you want to transform the data to a specific database structure. -If your cantonal data is also stored based on this model, then you probably want to use this structure +If your cantonal data is also stored based on this model, then you probably want to use this structure for all topics to homogenize your database content. The `Ili2pg Oereb Data Import Manual `__ explains how to use the ili2pg tool to create the corresponding schema and how to import the XML data. @@ -51,7 +51,7 @@ OEREBlex Topic Model This third model is usefull if you maintain your legal documents using the OEREBlex application and you have a specific cantonal model for your data. It is similar to the pyramid_oereb standard model, but all -the document related tables are omitted. Instead the documents are linked by the geolink attribute. +the document related tables are omitted. Instead the documents are linked by the geolink attribute. .. _configuration-additional-topics: @@ -62,7 +62,7 @@ If you like to add one or more additional topics based on the *pyramid_oereb sta you can use the internal command below creating an SQL script to establish the topic schema. But before creating any new topic structure you have to add its configuration. Open the configuration file -(pyramid_oereb.yml) and copy the section from one of the existing **standard** topics which usually +(pyramid_oereb.yml) and copy the section from one of the existing **standard** topics which usually looks like this: .. code-block:: yaml @@ -111,7 +111,7 @@ looks like this: transfer_code: Hinweis extract_code: Hint -Apply the necessary modifications/replacements for the new topic. This should at least be the schema name, +Apply the necessary modifications/replacements for the new topic. This should at least be the schema name, code, geometry type and of course the models property within the source parameters: Make sure that this source class is `pyramid_oereb.contrib.data_sources.*standard*.sources.plr.DatabaseSource` and not interlis_2_3. - The same goes for the model_factory and the get_symbol element. It should be set to @@ -124,10 +124,10 @@ Once the configuration set, run the following command: .. code-block:: shell - create_standard_tables -c -T [flag used to skip schema creation] + create_standard_tables -c -T [flag used to skip schema creation] --sql-file= -w [to over-write existing sql instead of append] -The first parameter ``-c or --configuration=YAML`` is the path to your YAML configuration file. +The first parameter ``-c or --configuration=YAML`` is the path to your YAML configuration file. By default it's *pyramid_oereb.yml* The second optional parameter ``-s or --section=SECTION`` allows you to specify the section containing @@ -135,7 +135,7 @@ the configuration part to use. Default is *pyramid_oereb*. The parameter ``-T or --tables-only`` skips the schema creation and creates only the tables. -The option ``--sql-file=SQL_FILE`` generates an SQL file containing the schema and table creation +The option ``--sql-file=SQL_FILE`` generates an SQL file containing the schema and table creation commands. *SQL_FILE* should be the name or the absolute path of the file. E.g: my_sql_script.sql If your yaml file uses the c2ctemplate style (starting with vars) you need to add the @@ -143,7 +143,7 @@ If your yaml file uses the c2ctemplate style (starting with vars) you need to ad The option ``-w or --over-write`` allows you to overwrite an existing sql file. Default is append. -Now you have set up an empty additional topic in your database and you can proceed with deploying +Now you have set up an empty additional topic in your database and you can proceed with deploying your data into it. Add additional interlis topics @@ -213,7 +213,7 @@ and not standard. - The same goes for the model_factory and the get_symbol eleme *interlis_2_3*. Also define the language of the data and if it's a federal (true) or cantonal topic (false). You also want to -define that it is *NOT* the standard structure (false) and what lookup codes are used for the law_status +define that it is *NOT* the standard structure (false) and what lookup codes are used for the law_status and document types. Add an OEREBLex Topic diff --git a/doc/source/contrib/contributing.rst b/doc/source/contrib/contributing.rst index 9c80aabf31..1e05e0c73a 100644 --- a/doc/source/contrib/contributing.rst +++ b/doc/source/contrib/contributing.rst @@ -87,8 +87,8 @@ NOTE - http://localhost:6543/oereb/versions/json - http://localhost:6543/oereb/capabilities/json - - http://localhost:6543/oereb/getegrid/json/?XY=2608883,1261844 - - http://localhost:6543/oereb/extract/reduced/xml/CH113928077734 + - http://localhost:6543/oereb/getegrid/json?EN=2608883,1261844 + - http://localhost:6543/oereb/extract/xml?EGRID=CH113928077734 ...on Windows ~~~~~~~~~~~~~ @@ -313,12 +313,14 @@ Browser requests Once your application has started as describe above, you can try your oereb server as follows. In your browser, check the following URL: -* http://localhost:6543/oereb/versions -* http://localhost:6543/oereb/capabilities + +* http://localhost:6543/oereb/versions/json +* http://localhost:6543/oereb/capabilities/json Now try the following requests; these are based on sample data: -* http://localhost:6543/oereb/getegrid/xml/?XY=2608883,1261844 -* http://localhost:6543/oereb/extract/reduced/xml/CH113928077734 + +* http://localhost:6543/oereb/getegrid/xml?EN=2608883,1261844 +* http://localhost:6543/oereb/extract/xml?EGRID=CH113928077734 Test suite ~~~~~~~~~~ diff --git a/doc/source/contrib/data_sources/oereblex/index.rst b/doc/source/contrib/data_sources/oereblex/index.rst index 6e0835218a..e3e588d72e 100644 --- a/doc/source/contrib/data_sources/oereblex/index.rst +++ b/doc/source/contrib/data_sources/oereblex/index.rst @@ -1,7 +1,7 @@ .. _contrib-data-sources-oereblex: ÖREBlex -======= +======== .. toctree:: diff --git a/doc/source/contrib/data_sources/oereblex/index.rst.mako b/doc/source/contrib/data_sources/oereblex/index.rst.mako index 6e0835218a..e3e588d72e 100644 --- a/doc/source/contrib/data_sources/oereblex/index.rst.mako +++ b/doc/source/contrib/data_sources/oereblex/index.rst.mako @@ -1,7 +1,7 @@ .. _contrib-data-sources-oereblex: ÖREBlex -======= +======== .. toctree:: diff --git a/doc/source/contrib/data_sources/standard/sources.rst b/doc/source/contrib/data_sources/standard/sources.rst index 6331327bfe..7a084855bb 100644 --- a/doc/source/contrib/data_sources/standard/sources.rst +++ b/doc/source/contrib/data_sources/standard/sources.rst @@ -325,4 +325,3 @@ Sources :show-inheritance: .. automethod:: __init__ - diff --git a/doc/source/contrib/print_proxy/xml2pdf.rst b/doc/source/contrib/print_proxy/xml2pdf.rst index a4ba133243..24dce94308 100644 --- a/doc/source/contrib/print_proxy/xml2pdf.rst +++ b/doc/source/contrib/print_proxy/xml2pdf.rst @@ -36,4 +36,3 @@ as an example, or use the ``create_standard_yaml`` script to regenerate your con :inherited-members: .. automethod:: __init__ - diff --git a/doc/source/installation.rst b/doc/source/installation.rst index dd26ae172d..d36f7f531b 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -117,8 +117,8 @@ Installation steps 1. Add package .............. -Add ``pyramid_oereb`` to the list of requirements in your application's ``setup.py``. -In your ``setup.py``, you should depend on ``pyramid_oereb[recommend]`` to get the recommended versions of +Add ``pyramid_oereb`` to the list of requirements in your application's ``setup.py`` or ``pyproject.toml``. +In your ``setup.py`` or ``pyproject.toml``, you should depend on ``pyramid_oereb[recommend]`` to get the recommended versions of the dependencies of ``pyramid_oereb``, or ``pyramid_oereb[no-version]`` to get the dependencies of ``pyramid_oereb`` without specifying which versions of these dependencies shall be used. You shouldn't just depend on ``pyramid_oereb`` because this will not take into account the dependencies of ``pyramid_oereb``. diff --git a/pyramid_oereb/core/renderer/extract/templates/xml/localized_image.xml b/pyramid_oereb/core/renderer/extract/templates/xml/localized_image.xml index abde6daef1..ca90fa667f 100644 --- a/pyramid_oereb/core/renderer/extract/templates/xml/localized_image.xml +++ b/pyramid_oereb/core/renderer/extract/templates/xml/localized_image.xml @@ -6,4 +6,3 @@ ${localized_image.get('Language') | x} ${localized_image.get('Image') | x} - diff --git a/tests/contrib.print_proxy.mapfish_print/resources/test_bad_config.yml b/tests/contrib.print_proxy.mapfish_print/resources/test_bad_config.yml index 435e45ef3d..d054b0a7d4 100644 --- a/tests/contrib.print_proxy.mapfish_print/resources/test_bad_config.yml +++ b/tests/contrib.print_proxy.mapfish_print/resources/test_bad_config.yml @@ -4,4 +4,3 @@ pyramid_oereb: wms_url_params: - TRANSPARENT: 'true' - OTHERCUSTOM: 'myvalue' - diff --git a/tests/contrib.print_proxy.mapfish_print/resources/test_extract.json b/tests/contrib.print_proxy.mapfish_print/resources/test_extract.json index 8b96e90219..194dde2eaa 100644 --- a/tests/contrib.print_proxy.mapfish_print/resources/test_extract.json +++ b/tests/contrib.print_proxy.mapfish_print/resources/test_extract.json @@ -3874,7 +3874,6 @@ } ] }, - { "LegendText": [ { diff --git a/tests/resources/sample_data/document_type.json b/tests/resources/sample_data/document_type.json index 87603960e8..1c0140c1e2 100644 --- a/tests/resources/sample_data/document_type.json +++ b/tests/resources/sample_data/document_type.json @@ -31,4 +31,3 @@ } } ] - diff --git a/tests/resources/sample_data/law_status.json b/tests/resources/sample_data/law_status.json index a96377258f..00291840cd 100644 --- a/tests/resources/sample_data/law_status.json +++ b/tests/resources/sample_data/law_status.json @@ -31,4 +31,3 @@ } } ] -