Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update urllib3 dep #59

Merged
merged 5 commits into from
Feb 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.7.8
current_version = 0.7.9
commit = True
tag = True

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
3,112 changes: 1,751 additions & 1,361 deletions poetry.lock

Large diffs are not rendered by default.

26 changes: 14 additions & 12 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"]
Expand Down Expand Up @@ -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"}
Expand All @@ -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 = [
Expand All @@ -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 = '''
/(
Expand Down
5 changes: 2 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion toshi_hazard_store/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

__author__ = """GNS Science"""
__email__ = '[email protected]'
__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
Loading