From bcf05dbe82c0654eb4199f02ff3a54ca6de7026b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 17 Jul 2020 01:29:47 +0000 Subject: [PATCH 1/2] :arrow_up: Bump pointCollection from `21d92f1` to `d7d1b8d` Bumps [pointCollection](https://github.com/SmithB/pointCollection) from `21d92f1` to `d7d1b8d`. - [Release notes](https://github.com/SmithB/pointCollection/releases) - [Commits](https://github.com/SmithB/pointCollection/compare/21d92f130d9daa0f9456941954d4e91576e5ce81...d7d1b8d88aea3e79abc77c3386a0619abc8dba0c) Signed-off-by: dependabot-preview[bot] --- pointCollection | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pointCollection b/pointCollection index 21d92f1..d7d1b8d 160000 --- a/pointCollection +++ b/pointCollection @@ -1 +1 @@ -Subproject commit 21d92f130d9daa0f9456941954d4e91576e5ce81 +Subproject commit d7d1b8d88aea3e79abc77c3386a0619abc8dba0c From da2342f4979b1acad98c567c9321f0be7506f80e Mon Sep 17 00:00:00 2001 From: Wei Ji Date: Fri, 17 Jul 2020 14:20:04 +1200 Subject: [PATCH 2/2] :pushpin: Install pointCollection properly via pip Can get rid of the pointCollection submodule now that it is pip installable from Github using `poetry add git+https://github.com/SmithB/pointCollection.git`! --- .gitmodules | 5 +---- poetry.lock | 35 ++++++++++++++++++++++++++++++++++- pointCollection | 1 - pyproject.toml | 1 + 4 files changed, 36 insertions(+), 6 deletions(-) delete mode 160000 pointCollection diff --git a/.gitmodules b/.gitmodules index a10bb33..0031f1a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "ATL11"] path = ATL11 - url = https://github.com/suzanne64/ATL11 -[submodule "pointCollection"] - path = pointCollection - url = https://github.com/SmithB/pointCollection + url = https://github.com/suzanne64/ATL11 \ No newline at end of file diff --git a/poetry.lock b/poetry.lock index a6303fc..d238751 100644 --- a/poetry.lock +++ b/poetry.lock @@ -468,6 +468,14 @@ optional = false python-versions = ">3.5" version = "0.7.4" +[[package]] +category = "main" +description = "GDAL: Geospatial Data Abstraction Library" +name = "gdal" +optional = false +python-versions = "*" +version = "3.0.4" + [[package]] category = "main" description = "Geographic pandas extensions" @@ -1265,6 +1273,27 @@ version = "0.13.1" [package.extras] dev = ["pre-commit", "tox"] +[[package]] +category = "main" +description = "Utilities for organizing and manipulating point data" +name = "pointCollection" +optional = false +python-versions = "*" +version = "1.0.0.0" + +[package.dependencies] +gdal = "3.0.4" +h5py = "*" +matplotlib = "*" +netCDF4 = "*" +numpy = "*" +pyproj = "*" +scipy = "*" + +[package.source] +reference = "d7d1b8d88aea3e79abc77c3386a0619abc8dba0c" +type = "git" +url = "https://github.com/SmithB/pointCollection.git" [[package]] category = "main" description = "Python client for the Prometheus monitoring system." @@ -1837,7 +1866,7 @@ version = "2.0.0" heapdict = "*" [metadata] -content-hash = "0915771b9bff559a68a13fe9b991d1cbc96534b54038fde9181caec170a03213" +content-hash = "7f45f51d7517a715a3fae7aea67c97352a885671fed232cdc475c6d05970f67d" python-versions = "^3.8" [metadata.files] @@ -2045,6 +2074,9 @@ fsspec = [ {file = "fsspec-0.7.4-py3-none-any.whl", hash = "sha256:1f9391c9b6e92a89949f0b0f7154b8b62a01f00b9c2767797d94ffa376dae9ab"}, {file = "fsspec-0.7.4.tar.gz", hash = "sha256:7075fde6d617cd3a97eac633d230d868121a188a46d16a0dcb484eea0cf2b955"}, ] +gdal = [ + {file = "GDAL-3.0.4.tar.gz", hash = "sha256:a17eaa6872e4b7f7fa82f86aeccecc57d224bd054952a56db64368ecaf18509c"}, +] geopandas = [ {file = "geopandas-0.7.0-py2.py3-none-any.whl", hash = "sha256:dd478cfb979c7aca529a61c05f26a4606852547a0d7e22ae9babe0c70f7d73f8"}, {file = "geopandas-0.7.0.tar.gz", hash = "sha256:19074b090ab928527193c50b383d31a259a9b84b18553562631295fa67f640bc"}, @@ -2526,6 +2558,7 @@ pluggy = [ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"}, ] +pointCollection = [] prometheus-client = [ {file = "prometheus_client-0.8.0-py2.py3-none-any.whl", hash = "sha256:983c7ac4b47478720db338f1491ef67a100b474e3bc7dafcbaefb7d0b8f9b01c"}, {file = "prometheus_client-0.8.0.tar.gz", hash = "sha256:c6e6b706833a6bd1fd51711299edee907857be10ece535126a158f911ee80915"}, diff --git a/pointCollection b/pointCollection deleted file mode 160000 index d7d1b8d..0000000 --- a/pointCollection +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d7d1b8d88aea3e79abc77c3386a0619abc8dba0c diff --git a/pyproject.toml b/pyproject.toml index cd67b8f..81b6562 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,6 +21,7 @@ jupyterlab = "^2.1.5" lxml = "^4.5.0" matplotlib = "^3.2.2" numcodecs = "<=0.6.3" +pointcollection = {git = "https://github.com/SmithB/pointCollection.git", rev = "d7d1b8d88aea3e79abc77c3386a0619abc8dba0c"} pydap = "^3.2.2" pyepsg = "^0.4.0" pygmt = "^0.1.1"