Commit b3e5ce21 authored by Chris Jewell's avatar Chris Jewell
Browse files

Update Python version and covid19uk

parent 4df7a515
......@@ -359,19 +359,19 @@ develop = false
[package.dependencies]
gemlib = {git = "https://gitlab.com/gem-epidemics/gemlib.git", tag = "v0.6.4"}
geopandas = "^0.8.1"
h5py = "^3.1.0"
netCDF4 = "^1.5.6"
pandas = "^1.1.3"
geopandas = "^0.10.2"
h5py = "^3.6.0"
netCDF4 = "^1.5.8"
pandas = "^1.4.1"
PyYAML = "^5.3.1"
tqdm = "^4.50.2"
xarray = {version = "^0.17.0", extras = ["netcdf4"]}
xarray = "^2022.3.0"
[package.source]
type = "git"
url = "https://gitlab.com/chicas-covid19/covid19uk.git"
reference = "v0.9.2"
resolved_reference = "8c27be3a453f914d2669e0108009410f6da7e670"
resolved_reference = "2e2f488b2dd04e715c47e3522181b69f299b8ea0"
[[package]]
name = "cycler"
......@@ -613,15 +613,15 @@ develop = false
[package.dependencies]
libclang = "<12.0.0"
numpy = "^1.20.0"
tensorflow = "^2.7.0"
numpy = "^1.22.3"
tensorflow = "^2.8.0"
tensorflow-probability = "^0.16.0"
[package.source]
type = "git"
url = "https://gitlab.com/gem-epidemics/gemlib.git"
reference = "v0.6.4"
resolved_reference = "bc4fa99cc3d55e2d21f6ff9684a557394ed5c2a9"
resolved_reference = "e09e129f2c9c4f40ba4ce7734d7c3b732c3606df"
[[package]]
name = "geojson"
......@@ -633,17 +633,17 @@ python-versions = "*"
[[package]]
name = "geopandas"
version = "0.8.2"
version = "0.10.2"
description = "Geographic pandas extensions"
category = "main"
optional = false
python-versions = ">=3.5"
python-versions = ">=3.7"
[package.dependencies]
fiona = "*"
pandas = ">=0.23.0"
fiona = ">=1.8"
pandas = ">=0.25.0"
pyproj = ">=2.2.0"
shapely = "*"
shapely = ">=1.6"
[[package]]
name = "google-auth"
......@@ -2269,21 +2269,22 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
[[package]]
name = "xarray"
version = "0.17.0"
version = "2022.3.0"
description = "N-D labeled arrays and datasets in Python"
category = "main"
optional = false
python-versions = ">=3.7"
python-versions = ">=3.8"
[package.dependencies]
numpy = ">=1.15"
pandas = ">=0.25"
numpy = ">=1.18"
packaging = ">=20.0"
pandas = ">=1.1"
[package.extras]
accel = ["scipy", "bottleneck", "numbagg"]
complete = ["netcdf4", "h5netcdf", "scipy", "pydap", "zarr", "fsspec", "cftime", "rasterio", "cfgrib", "bottleneck", "numbagg", "dask", "matplotlib", "seaborn", "nc-time-axis"]
docs = ["netcdf4", "h5netcdf", "scipy", "pydap", "zarr", "fsspec", "cftime", "rasterio", "cfgrib", "bottleneck", "numbagg", "dask", "matplotlib", "seaborn", "nc-time-axis", "sphinx-autosummary-accessors", "sphinx-rtd-theme", "ipython", "ipykernel", "jupyter-client", "nbsphinx", "scanpydoc"]
io = ["netcdf4", "h5netcdf", "scipy", "pydap", "zarr", "fsspec", "cftime", "rasterio", "cfgrib"]
complete = ["netcdf4", "h5netcdf", "scipy", "pydap", "zarr", "fsspec", "cftime", "rasterio", "cfgrib", "pooch", "bottleneck", "numbagg", "dask", "matplotlib", "seaborn", "nc-time-axis"]
docs = ["netcdf4", "h5netcdf", "scipy", "pydap", "zarr", "fsspec", "cftime", "rasterio", "cfgrib", "pooch", "bottleneck", "numbagg", "dask", "matplotlib", "seaborn", "nc-time-axis", "sphinx-autosummary-accessors", "sphinx-rtd-theme", "ipython", "ipykernel", "jupyter-client", "nbsphinx", "scanpydoc"]
io = ["netcdf4", "h5netcdf", "scipy", "pydap", "zarr", "fsspec", "cftime", "rasterio", "cfgrib", "pooch"]
parallel = ["dask"]
viz = ["matplotlib", "seaborn", "nc-time-axis"]
......@@ -2344,7 +2345,7 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"]
[metadata]
lock-version = "1.1"
python-versions = ">=3.8.0,<3.11"
content-hash = "9f6c2d9faa62f093504b9e59698c105a0bb77f5dced43fd9042e1adf40e8589a"
content-hash = "74c4e897787830d25fd237137ff8743774667c356dde7ed1ea2c26e4f0ab95a6"
[metadata.files]
absl-py = [
......@@ -2805,8 +2806,8 @@ geojson = [
{file = "geojson-2.5.0.tar.gz", hash = "sha256:6e4bb7ace4226a45d9c8c8b1348b3fc43540658359f93c3f7e03efa9f15f658a"},
]
geopandas = [
{file = "geopandas-0.8.2-py2.py3-none-any.whl", hash = "sha256:8f53aa98e4ddb054afc46d289c930e96267d32c35c3dc685721ec2fddee77e60"},
{file = "geopandas-0.8.2.tar.gz", hash = "sha256:aa9ae82e4e6b52efa244bd4b8bd2363d66693e5592ad1a0f52b6afa8c36348cb"},
{file = "geopandas-0.10.2-py2.py3-none-any.whl", hash = "sha256:1722853464441b603d9be3d35baf8bde43831424a891e82a8545eb8997b65d6c"},
{file = "geopandas-0.10.2.tar.gz", hash = "sha256:efbf47e70732e25c3727222019c92b39b2e0a66ebe4fe379fbe1aa43a2a871db"},
]
google-auth = [
{file = "google-auth-2.6.2.tar.gz", hash = "sha256:60d449f8142c742db760f4c0be39121bc8d9be855555d784c252deaca1ced3f5"},
......@@ -4121,8 +4122,8 @@ wrapt = [
{file = "wrapt-1.14.0.tar.gz", hash = "sha256:8323a43bd9c91f62bb7d4be74cc9ff10090e7ef820e27bfe8815c57e68261311"},
]
xarray = [
{file = "xarray-0.17.0-py3-none-any.whl", hash = "sha256:ce204fb5015c3d382036f7c065c927df5684276976810aef43d78908c3ceb440"},
{file = "xarray-0.17.0.tar.gz", hash = "sha256:9c2edad2a4e588f9117c666a4249920b9717fb75703b96998cf65fcd4f60551f"},
{file = "xarray-2022.3.0-py3-none-any.whl", hash = "sha256:560f36eaabe7a989d5583d37ec753dd737357aa6a6453e55c80bb4f92291a69e"},
{file = "xarray-2022.3.0.tar.gz", hash = "sha256:398344bf7d170477aaceff70210e11ebd69af6b156fe13978054d25c48729440"},
]
yarl = [
{file = "yarl-1.7.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:f2a8508f7350512434e41065684076f640ecce176d262a7d54f0da41d99c5a95"},
......
......@@ -7,7 +7,6 @@ license = "MIT"
[tool.poetry.dependencies]
python = ">=3.8.0,<3.11"
xarray = {extras = ["netcdf4"], version = "^0.17.0"}
s3fs = "^2021.04.0"
ruffus = "^2.8.4"
openpyxl = "^3.0.7"
......@@ -19,6 +18,7 @@ dhaconfig = {git = "https://gitlab.com/achale/dhaconfig.git", tag="v0.0.2"}
covid19uk = {git = "https://gitlab.com/chicas-covid19/covid19uk.git", tag="v0.9.2"}
nodejs = "^0.1.1"
npm = "^0.1.1"
xarray = "^2022.3.0"
[tool.poetry.dev-dependencies]
jedi = "^0.17.2"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment