From 1348f7f9ee423435acf09f5c436bd5d0e5e12907 Mon Sep 17 00:00:00 2001 From: Elvis Pranskevichus Date: Fri, 4 Oct 2024 16:23:35 -0700 Subject: [PATCH] Bump to 3.4.3 (#4) --- .github/workflows/tests.yml | 2 +- MANIFEST.toml | 2 +- README.md | 2 +- postgis | 2 +- postgis.edgeql | 6 +++--- scripts/gen_ext_postgis.py | 2 +- scripts/postgis.template.edgeql | 6 +++--- tests/test_edgeql_postgis.py | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 27bfe3e..e542976 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -74,7 +74,7 @@ jobs: - name: Build extension package run: | make -j8 PYTHON=$EDBDIR/python3 EDBFLAGS=--no-devmode PG_CONFIG=/usr/bin/pg_config - unzip -l postgis--3.4.2.zip + unzip -l postgis--3.4.3.zip - name: Install extension package run: | diff --git a/MANIFEST.toml b/MANIFEST.toml index be9f63d..fdfb3e9 100644 --- a/MANIFEST.toml +++ b/MANIFEST.toml @@ -1,4 +1,4 @@ name = "postgis" -version = "3.4.2" +version = "3.4.3" files = ["postgis.edgeql"] postgres_files = "pg" diff --git a/README.md b/README.md index 8be8c01..4d8c058 100644 --- a/README.md +++ b/README.md @@ -5,5 +5,5 @@ from inside an edgedb development venv. To build, install, and test into a dev env: - ``make`` -- ``edb load-ext postgis--3.4.2.zip`` +- ``edb load-ext postgis--3.4.3.zip`` - ``edb test tests/test_edgeql_postgis.py`` diff --git a/postgis b/postgis index c19ce56..e365945 160000 --- a/postgis +++ b/postgis @@ -1 +1 @@ -Subproject commit c19ce56ca8982635026ba605f5b2fdce3622bb4a +Subproject commit e36594574671877ca6178c944e6d430f87f310bf diff --git a/postgis.edgeql b/postgis.edgeql index eb9f099..7defcc3 100644 --- a/postgis.edgeql +++ b/postgis.edgeql @@ -17,9 +17,9 @@ # -create extension package postgis version '3.4.2' { +create extension package postgis version '3.4.3' { set ext_module := "ext::postgis"; - set sql_extensions := ["postgis >=3.4.2,<4.0.0"]; + set sql_extensions := ["postgis >=3.4.0,<4.0.0"]; set sql_setup_script := $$ -- Make it possible to have `!=`, `?!=`, and `not in` for geometry @@ -3739,4 +3739,4 @@ create extension package postgis version '3.4.2' { using sql function 'st_coverageunion'; }; -}; \ No newline at end of file +}; diff --git a/scripts/gen_ext_postgis.py b/scripts/gen_ext_postgis.py index e341e7d..f3a0a08 100644 --- a/scripts/gen_ext_postgis.py +++ b/scripts/gen_ext_postgis.py @@ -403,7 +403,7 @@ def parse_postgis_extension( for fpath in root.glob('postgis*.sql'): name = fpath.name # We might scan more postgis extension files - if name in {'postgis--3.4.2.sql'}: + if name in {'postgis--3.4.3.sql'}: with open(fpath, mode='rt') as f: sql_query = ''.join( line for line in f.readlines() diff --git a/scripts/postgis.template.edgeql b/scripts/postgis.template.edgeql index 3555381..3db9438 100644 --- a/scripts/postgis.template.edgeql +++ b/scripts/postgis.template.edgeql @@ -17,9 +17,9 @@ # -create extension package postgis version '3.4.2' { +create extension package postgis version '3.4.3' { set ext_module := "ext::postgis"; - set sql_extensions := ["postgis >=3.4.2,<4.0.0"]; + set sql_extensions := ["postgis >=3.4.3,<4.0.0"]; set sql_setup_script := $$ -- Make it possible to have `!=`, `?!=`, and `not in` for geometry @@ -295,4 +295,4 @@ create extension package postgis version '3.4.2' { ### REFLECT: FUNCTIONS ### REFLECT: AGGREGATES -}; \ No newline at end of file +}; diff --git a/tests/test_edgeql_postgis.py b/tests/test_edgeql_postgis.py index df11faf..3878b50 100644 --- a/tests/test_edgeql_postgis.py +++ b/tests/test_edgeql_postgis.py @@ -124,7 +124,7 @@ def get_setup_script(cls): with open(os.path.join(root, 'edb/lib/ext/postgis.edgeql')) as f: contents = f.read() to_add = ''' - drop extension package postgis version '3.4.2'; + drop extension package postgis version '3.4.3'; ''' + contents splice = '__internal_testmode := true;' res = res.replace(splice, splice + to_add)