Merge pull request #59 from GNS-Science/update-urllib3-dep

Update urllib3 dep

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.7.8
+current_version = 0.7.9
 commit = True
 tag = True
 

.github/workflows/dev.yml

@@ -20,7 +20,7 @@ jobs:
     # The type of runner that the job will run on
     strategy:
       matrix:
-        python-versions: ["3.9", "3.10", "3.11"]
+        python-versions: ["3.10", "3.11"]
         os: [ubuntu-latest, macos-latest, windows-latest]
     defaults:
       run:

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
-## [0.7.8] - 2023-01-31
+## [0.7.9] - 2024-02-26
+
+### Changed
+ - dependencies for compatibility with openquake-engine v3.19
+
+## [0.7.8] - 2024-01-31
 ### Added
  - 0.5% in 50 years PoE for disaggregations
 

pyproject.toml

@@ -1,7 +1,7 @@
 [tool]
 [tool.poetry]
 name = "toshi-hazard-store"
-version = "0.7.8"
+version = "0.7.9"
 homepage = "https://github.com/GNS-Science/toshi-hazard-store"
 description = "Library for saving and retrieving NZHSM openquake hazard results with convenience (uses AWS Dynamodb)."
 authors = ["GNS Science <chrisbc@artisan.co.nz>"]
@@ -32,16 +32,18 @@ ths_cache = 'scripts.ths_cache:cli'
 ths_testing = 'scripts.ths_testing:cli'
 
 [tool.poetry.dependencies]
-python = ">=3.9,<3.13"
-openquake-engine = {version = "^3.16", optional = true}
-pynamodb-attributes = "^0.3.2"
-nzshm-common = "^0.6.0"
+python = ">=3.10,<3.13"
 
 # see https://github.com/orgs/python-poetry/discussions/7937
-urllib3 = "<2" 
-numpy = "<1.25"
-pynamodb = "^5.5.0"
+# urllib3 = ">2" 
 pandas = "~2.0.3"
+numpy = "^1.26.4"
+nzshm-common = "^0.6.1"
+pynamodb-attributes = "^0.4.0"
+pynamodb = "^5.5.1"
+openquake-engine = {version = "^3.18.0", optional = true}
+fiona = {version = "^1.9.5", optional = true}
+networkx = {version = "^3.2.1", optional = true}
 
 [tool.poetry.group.dev.dependencies]
 black  = { version = "^22.3"}
@@ -59,17 +61,17 @@ mkdocs-material-extensions  = "^1.1.1"
 mkdocs-pymdownx-material-extras = "^2.0.3"
 mkdocstrings  = "^0.22.0"
 mkdocstrings-python = "^1.3.0"
-moto = "^3.1.10"
 pre-commit = "^3.0.4"
 pymdown-extensions = {version = "^9.4"}
 pytest = { version = "^6.2.4"}
 pytest-cov  = { version = "^2.12.0"}
 toml = {version = "^0.10.2", optional = true}
 tox = "^4.4.5"
-twine  = { version = "^3.3.0"}
 types-python-dateutil = "^2.8.16"
 virtualenv  = { version = "^20.2.2", optional = true}
 mypy = "^1.5.0"
+twine = "^5.0.0"
+moto = "^3.1.10"
 
 [tool.poetry.extras]
 test = [
@@ -93,12 +95,12 @@ doc = [
     "mkdocs-autorefs"
     ]
 
-openquake = ["openquake-engine"]
+openquake = ["openquake-engine", "fiona", "networkx"]
 
 [tool.black]
 line-length = 120
 skip-string-normalization = true
-target-version = ['py38', 'py39']
+target-version = ['py310', 'py311']
 include = '\.pyi?$'
 exclude = '''
 /(

setup.cfg

@@ -45,13 +45,12 @@ exclude_lines =
 
 [tox:tox]
 isolated_build = true
-envlist =py39, py310, py311, format, lint, build
+envlist = py310, py311, format, lint, build
 
 [gh-actions]
 python =
     3.11: py311
-    3.10: py310
-    3.9: py39, format, lint, build
+    3.10: py310, format, lint, build
 
 [testenv]
 allowlist_externals = pytest

toshi_hazard_store/__init__.py

@@ -2,7 +2,7 @@
 
 __author__ = """GNS Science"""
 __email__ = 'chrisbc@artisan.co.nz'
-__version__ = '0.7.8'
+__version__ = '0.7.9'
 
 import toshi_hazard_store.model as model
 import toshi_hazard_store.query.hazard_query as query_v3  # alias for clients using deprecated module name