diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3e22f4b..898e764 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -39,6 +39,9 @@
+
+
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 457295a..7a009cf 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,8 @@
+
+
+
diff --git a/.idea/prettier.xml b/.idea/prettier.xml
new file mode 100644
index 0000000..9ef476f
--- /dev/null
+++ b/.idea/prettier.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/python-libraries.iml b/.idea/python-libraries.iml
index 5e05546..92fb703 100644
--- a/.idea/python-libraries.iml
+++ b/.idea/python-libraries.iml
@@ -8,6 +8,8 @@
+
+
diff --git a/database/CHANGELOG.md b/database/CHANGELOG.md
index 70722f5..5582209 100644
--- a/database/CHANGELOG.md
+++ b/database/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## [3.4.1] - 2024-10-28
+
+- Update the underlying version of `sqlparse` and `geoalchemy2`.
+
## [3.4.0] - 2024-10-17
- Add capability to instantiate the `Database` wrapper class from an engine as
diff --git a/database/poetry.lock b/database/poetry.lock
index a6f5e2d..4036cf5 100644
--- a/database/poetry.lock
+++ b/database/poetry.lock
@@ -55,13 +55,13 @@ development = ["black", "flake8", "mypy", "pytest", "types-colorama"]
[[package]]
name = "geoalchemy2"
-version = "0.14.3"
+version = "0.15.2"
description = "Using SQLAlchemy with Spatial Databases"
optional = false
python-versions = ">=3.7"
files = [
- {file = "GeoAlchemy2-0.14.3-py3-none-any.whl", hash = "sha256:a727198394fcc4760a27c4c5bff8b9f4f79324ec2dd98c4c1b8a7026b8918d81"},
- {file = "GeoAlchemy2-0.14.3.tar.gz", hash = "sha256:79c432b10dd8c48422f794eaf9a1200929de14f41d2396923bfe92f4c6abaf89"},
+ {file = "GeoAlchemy2-0.15.2-py3-none-any.whl", hash = "sha256:546455dc39f5bcdfc5b871e57d3f7546c8a6f798eb364c474200f488ace6fd32"},
+ {file = "geoalchemy2-0.15.2.tar.gz", hash = "sha256:3af0272db927373e74ee3b064cdc9464ba08defdb945c51745db1b841482f5dc"},
]
[package.dependencies]
@@ -485,19 +485,18 @@ url = ["furl (>=0.4.1)"]
[[package]]
name = "sqlparse"
-version = "0.4.4"
+version = "0.5.1"
description = "A non-validating SQL parser."
optional = false
-python-versions = ">=3.5"
+python-versions = ">=3.8"
files = [
- {file = "sqlparse-0.4.4-py3-none-any.whl", hash = "sha256:5430a4fe2ac7d0f93e66f1efc6e1338a41884b7ddf2a350cedd20ccc4d9d28f3"},
- {file = "sqlparse-0.4.4.tar.gz", hash = "sha256:d446183e84b8349fa3061f0fe7f06ca94ba65b426946ffebe6e3e8295332420c"},
+ {file = "sqlparse-0.5.1-py3-none-any.whl", hash = "sha256:773dcbf9a5ab44a090f3441e2180efe2560220203dc2f8c0b0fa141e18b505e4"},
+ {file = "sqlparse-0.5.1.tar.gz", hash = "sha256:bb6b4df465655ef332548e24f08e205afc81b9ab86cb1c45657a7ff173a3a00e"},
]
[package.extras]
-dev = ["build", "flake8"]
+dev = ["build", "hatch"]
doc = ["sphinx"]
-test = ["pytest", "pytest-cov"]
[[package]]
name = "typing-extensions"
@@ -513,4 +512,4 @@ files = [
[metadata]
lock-version = "2.0"
python-versions = "^3.8"
-content-hash = "b340b0f3df2c27f453d2b4696a460c3ad8dc5366ebd04ef7c7991842d26da2e8"
+content-hash = "a23c5334efeeaba78663e45d31c6372a28e88004e087fdb875a8fbd652f3d483"
diff --git a/database/pyproject.toml b/database/pyproject.toml
index 5eb6d53..eb02fcb 100644
--- a/database/pyproject.toml
+++ b/database/pyproject.toml
@@ -3,17 +3,17 @@ authors = ["Daven Quinn "]
description = "A SQLAlchemy-based database toolkit."
name = "macrostrat.database"
packages = [{ include = "macrostrat" }]
-version = "3.4.0"
+version = "3.4.1"
[tool.poetry.dependencies]
-GeoAlchemy2 = "^0.14.0"
+GeoAlchemy2 = "^0.15.2"
SQLAlchemy = "^2.0.18"
SQLAlchemy-Utils = "^0.41.1"
click = "^8.1.3"
"macrostrat.utils" = "^1.0.0"
psycopg2-binary = "^2.9.6"
python = "^3.8"
-sqlparse = "^0.4.4"
+sqlparse = "^0.5.1"
aiofiles = "^23.2.1"
rich = "^13.7.1"
diff --git a/dinosaur/poetry.lock b/dinosaur/poetry.lock
index fb46f82..3b42f6d 100644
--- a/dinosaur/poetry.lock
+++ b/dinosaur/poetry.lock
@@ -172,13 +172,13 @@ websockets = ["websocket-client (>=1.3.0)"]
[[package]]
name = "geoalchemy2"
-version = "0.14.3"
+version = "0.15.2"
description = "Using SQLAlchemy with Spatial Databases"
optional = false
python-versions = ">=3.7"
files = [
- {file = "GeoAlchemy2-0.14.3-py3-none-any.whl", hash = "sha256:a727198394fcc4760a27c4c5bff8b9f4f79324ec2dd98c4c1b8a7026b8918d81"},
- {file = "GeoAlchemy2-0.14.3.tar.gz", hash = "sha256:79c432b10dd8c48422f794eaf9a1200929de14f41d2396923bfe92f4c6abaf89"},
+ {file = "GeoAlchemy2-0.15.2-py3-none-any.whl", hash = "sha256:546455dc39f5bcdfc5b871e57d3f7546c8a6f798eb364c474200f488ace6fd32"},
+ {file = "geoalchemy2-0.15.2.tar.gz", hash = "sha256:3af0272db927373e74ee3b064cdc9464ba08defdb945c51745db1b841482f5dc"},
]
[package.dependencies]
@@ -278,7 +278,7 @@ files = [
[[package]]
name = "macrostrat-database"
-version = "3.4.0"
+version = "3.4.1"
description = "A SQLAlchemy-based database toolkit."
optional = false
python-versions = "^3.8"
@@ -288,13 +288,13 @@ develop = true
[package.dependencies]
aiofiles = "^23.2.1"
click = "^8.1.3"
-GeoAlchemy2 = "^0.14.0"
+GeoAlchemy2 = "^0.15.2"
"macrostrat.utils" = "^1.0.0"
psycopg2-binary = "^2.9.6"
rich = "^13.7.1"
SQLAlchemy = "^2.0.18"
SQLAlchemy-Utils = "^0.41.1"
-sqlparse = "^0.4.4"
+sqlparse = "^0.5.1"
[package.source]
type = "directory"
@@ -746,19 +746,18 @@ pg = ["psycopg2"]
[[package]]
name = "sqlparse"
-version = "0.4.4"
+version = "0.5.1"
description = "A non-validating SQL parser."
optional = false
-python-versions = ">=3.5"
+python-versions = ">=3.8"
files = [
- {file = "sqlparse-0.4.4-py3-none-any.whl", hash = "sha256:5430a4fe2ac7d0f93e66f1efc6e1338a41884b7ddf2a350cedd20ccc4d9d28f3"},
- {file = "sqlparse-0.4.4.tar.gz", hash = "sha256:d446183e84b8349fa3061f0fe7f06ca94ba65b426946ffebe6e3e8295332420c"},
+ {file = "sqlparse-0.5.1-py3-none-any.whl", hash = "sha256:773dcbf9a5ab44a090f3441e2180efe2560220203dc2f8c0b0fa141e18b505e4"},
+ {file = "sqlparse-0.5.1.tar.gz", hash = "sha256:bb6b4df465655ef332548e24f08e205afc81b9ab86cb1c45657a7ff173a3a00e"},
]
[package.extras]
-dev = ["build", "flake8"]
+dev = ["build", "hatch"]
doc = ["sphinx"]
-test = ["pytest", "pytest-cov"]
[[package]]
name = "typing-extensions"
@@ -791,4 +790,4 @@ zstd = ["zstandard (>=0.18.0)"]
[metadata]
lock-version = "2.0"
python-versions = "^3.8"
-content-hash = "baa0c3142455ee7285d9187f56fffe5a1bff4b528bffbb19f0273d14f584f634"
+content-hash = "b90be14391d4006ab2045623f0a63eeb44b9ab64ec48b390b60bd9cb9fb3322f"
diff --git a/dinosaur/pyproject.toml b/dinosaur/pyproject.toml
index 9925d4c..db0855c 100644
--- a/dinosaur/pyproject.toml
+++ b/dinosaur/pyproject.toml
@@ -3,20 +3,17 @@ authors = ["Daven Quinn "]
description = "Diff-based database migrations"
name = "macrostrat.dinosaur"
packages = [{ include = "macrostrat" }]
-version = "3.1.0"
+version = "3.1.1"
[tool.poetry.dependencies]
-GeoAlchemy2 = "^0.14.0"
SQLAlchemy = "^2.0.0"
-SQLAlchemy-Utils = "^0.41.1"
docker = "^7.0.0"
-"macrostrat.database" = "^3.1.2"
+"macrostrat.database" = "^3.4.1"
"macrostrat.utils" = "^1.2.1"
migra = "^3.0.1621480950"
psycopg2-binary = "^2.9.1"
python = "^3.8"
schemainspect = "^3.0.1616029793"
-sqlparse = "^0.4.0"
[tool.poetry.dev-dependencies]
"macrostrat.database" = { path = "../database", develop = true }
diff --git a/poetry.lock b/poetry.lock
index 102901d..7415387 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -502,13 +502,13 @@ all = ["email-validator (>=2.0.0)", "httpx (>=0.23.0)", "itsdangerous (>=1.1.0)"
[[package]]
name = "geoalchemy2"
-version = "0.14.7"
+version = "0.15.2"
description = "Using SQLAlchemy with Spatial Databases"
optional = false
python-versions = ">=3.7"
files = [
- {file = "GeoAlchemy2-0.14.7-py3-none-any.whl", hash = "sha256:af592892c58da0b98aa284d400f207f08a643aeee4523f025cef74991f76af14"},
- {file = "GeoAlchemy2-0.14.7.tar.gz", hash = "sha256:9ff731c4e5b955525cb128ee7173222365e7f084d4b99f6f68e491bac6b44d21"},
+ {file = "GeoAlchemy2-0.15.2-py3-none-any.whl", hash = "sha256:546455dc39f5bcdfc5b871e57d3f7546c8a6f798eb364c474200f488ace6fd32"},
+ {file = "geoalchemy2-0.15.2.tar.gz", hash = "sha256:3af0272db927373e74ee3b064cdc9464ba08defdb945c51745db1b841482f5dc"},
]
[package.dependencies]
@@ -795,7 +795,7 @@ url = "auth-system"
[[package]]
name = "macrostrat-database"
-version = "3.4.0"
+version = "3.4.1"
description = "A SQLAlchemy-based database toolkit."
optional = false
python-versions = "^3.8"
@@ -805,13 +805,13 @@ develop = true
[package.dependencies]
aiofiles = "^23.2.1"
click = "^8.1.3"
-GeoAlchemy2 = "^0.14.0"
+GeoAlchemy2 = "^0.15.2"
"macrostrat.utils" = "^1.0.0"
psycopg2-binary = "^2.9.6"
rich = "^13.7.1"
SQLAlchemy = "^2.0.18"
SQLAlchemy-Utils = "^0.41.1"
-sqlparse = "^0.4.4"
+sqlparse = "^0.5.1"
[package.source]
type = "directory"
@@ -819,7 +819,7 @@ url = "database"
[[package]]
name = "macrostrat-dinosaur"
-version = "3.1.0"
+version = "3.1.1"
description = "Diff-based database migrations"
optional = false
python-versions = "^3.8"
@@ -828,15 +828,12 @@ develop = true
[package.dependencies]
docker = "^7.0.0"
-GeoAlchemy2 = "^0.14.0"
-"macrostrat.database" = "^3.1.2"
+"macrostrat.database" = "^3.4.1"
"macrostrat.utils" = "^1.2.1"
migra = "^3.0.1621480950"
psycopg2-binary = "^2.9.1"
schemainspect = "^3.0.1616029793"
SQLAlchemy = "^2.0.0"
-SQLAlchemy-Utils = "^0.41.1"
-sqlparse = "^0.4.0"
[package.source]
type = "directory"
@@ -2099,19 +2096,18 @@ pg = ["psycopg2"]
[[package]]
name = "sqlparse"
-version = "0.4.4"
+version = "0.5.1"
description = "A non-validating SQL parser."
optional = false
-python-versions = ">=3.5"
+python-versions = ">=3.8"
files = [
- {file = "sqlparse-0.4.4-py3-none-any.whl", hash = "sha256:5430a4fe2ac7d0f93e66f1efc6e1338a41884b7ddf2a350cedd20ccc4d9d28f3"},
- {file = "sqlparse-0.4.4.tar.gz", hash = "sha256:d446183e84b8349fa3061f0fe7f06ca94ba65b426946ffebe6e3e8295332420c"},
+ {file = "sqlparse-0.5.1-py3-none-any.whl", hash = "sha256:773dcbf9a5ab44a090f3441e2180efe2560220203dc2f8c0b0fa141e18b505e4"},
+ {file = "sqlparse-0.5.1.tar.gz", hash = "sha256:bb6b4df465655ef332548e24f08e205afc81b9ab86cb1c45657a7ff173a3a00e"},
]
[package.extras]
-dev = ["build", "flake8"]
+dev = ["build", "hatch"]
doc = ["sphinx"]
-test = ["pytest", "pytest-cov"]
[[package]]
name = "starlette"