diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9ca49c6d..0ca01b09 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,6 +36,6 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} repository: nlextract/nlextract - tags: latest,1.5.5 + tags: latest,1.5.6dev # tag_with_ref: true # tag_with_sha: true diff --git a/Dockerfile b/Dockerfile index 42f01015..ed03a97d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/osgeo/gdal:ubuntu-small-3.8.5 +FROM ghcr.io/osgeo/gdal:ubuntu-small-3.9.1 LABEL maintainer="Just van den Broecke " @@ -19,7 +19,7 @@ ENV TZ=${TIMEZONE} \ RUN \ apt-get update && apt-get --no-install-recommends install -y gnupg ca-certificates \ && curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null \ - && sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main" >> /etc/apt/sources.list.d/postgresql.list' \ + && sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ noble-pgdg main" >> /etc/apt/sources.list.d/postgresql.list' \ && apt-get -y update \ && apt-get --no-install-recommends install -y ${DEB_PACKAGES} \ && cp /usr/share/zoneinfo/${TZ} /etc/localtime \ diff --git a/VERSIES b/VERSIES index daf21e99..1211cd19 100644 --- a/VERSIES +++ b/VERSIES @@ -4,13 +4,17 @@ via de link: https://github.com/nlextract/NLExtract/releases. De nieuwste versie staat bovenaan: kies de "real-release" nlextract zip. De rest ligt nog open afhankelijk van wensen gebruikers en natuurlijk eventuele bugs. -v1.6.0 - geplend +v1.5.6 - 8 aug 2024 -Leftovers van vorige versies. Versie nummer nog te bepalen. +Leftovers van vorige versies. -Zie de Milestone voor deeze versie: +Zie de Milestone voor deze versie: https://github.com/nlextract/NLExtract/milestone/19 +vnl upgrades: +- Stetl submodule, +- Dockerfile: Ubuntu 24.04, Python 3.12, GDAL 3.9.1 + v1.5.5 - 25 apr 2024 * Fixes op 1.5.4 diff --git a/bagv2/etl/sql/create-meta.sql b/bagv2/etl/sql/create-meta.sql index fc9256e6..b018c9ae 100644 --- a/bagv2/etl/sql/create-meta.sql +++ b/bagv2/etl/sql/create-meta.sql @@ -14,7 +14,7 @@ CREATE TABLE nlx_bag_info ( INSERT INTO nlx_bag_info (sleutel,waarde) VALUES ('schema_versie', '2.1.0'); INSERT INTO nlx_bag_info (sleutel,waarde) - VALUES ('software_versie', '1.5.5'); + VALUES ('software_versie', '1.5.6dev'); INSERT INTO nlx_bag_info (sleutel,waarde) VALUES ('schema_creatie', to_char(current_timestamp, 'DD-Mon-IYYY HH24:MI:SS')); INSERT INTO nlx_bag_info (sleutel,waarde) diff --git a/doc/source/conf.py b/doc/source/conf.py index 55b06103..9ed3e0b1 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -48,9 +48,9 @@ # built documents. # # The short X.Y version. -version = '1.5.5' +version = '1.5.6dev' # The full version, including alpha/beta/rc tags. -release = '1.5.5' +release = '1.5.6dev' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.