Skip to content

Commit b859a69

Browse files
committed
⬆️ Bump pandas to 0.25.0, and update other data science deps
Manually updating various PyData/data science dependencies in Pipfile, references to release notes and diff commits as follows: - [dask](https://github.com/dask/dask) from 1.2.2 to 2.1.0 - [Release notes](https://docs.dask.org/en/latest/changelog.html) - [Commits](dask/dask@v1.2.2...v2.1.0) - [geopandas](https://github.com/geopandas/geopandas) from 0.5.0 to 0.5.1: - [Release notes](https://github.com/geopandas/geopandas/releases/tag/v0.5.1) - [Commits](geopandas/geopandas@v0.5.0...v0.5.1) - [matplotlib](https://github.com/matplotlib/matplotlib) from 3.1.0 to 3.1.1: - [Release notes](https://github.com/matplotlib/matplotlib/releases/tag/v3.1.1) - [Commits](matplotlib/matplotlib@v3.1.0...v3.1.1) - [numpy](https://github.com/numpy/numpy) from 1.16.4 to 1.17.0rc2: - [Release notes](https://github.com/numpy/numpy/releases/tag/v1.17.0rc2) - [Commits](numpy/numpy@v1.16.4...v1.17.0rc2) - [pandas](https://github.com/pandas-dev/pandas) from 0.24.2 to 0.25.0: - [Release notes](https://github.com/pandas-dev/pandas/releases/tag/v0.25.0) - [Changelog](https://github.com/pandas-dev/pandas/blob/master/RELEASE.md) - [Commits](pandas-dev/pandas@v0.24.2...v0.25.0) - [rasterio](https://github.com/mapbox/rasterio) from 1.0.23 to 1.0.24. - [Release notes](https://github.com/mapbox/rasterio/releases/tag/1.0.24) - [Changelog](https://github.com/mapbox/rasterio/blob/master/CHANGES.txt) - [Commits](rasterio/rasterio@1.0.23...1.0.24) - [tqdm](https://github.com/tqdm/tqdm) from 4.32.1 to 4.32.2: - [Release notes](https://github.com/tqdm/tqdm/releases/tag/v4.32.2) - [Commits](tqdm/tqdm@v4.32.1...v4.32.2) Quickfix in data_prep.ascii_to_xyz with pandas 0.25.0 introducing new json_normalize behaviour (see https://pandas.pydata.org/pandas-docs/version/0.25/whatsnew/v0.25.0.html#json-normalize-with-max-level-param-support, pandas-dev/pandas#23843). Caught unit test failing when trying to do the math Z=ELEVATION-BOTTOM because pandas.Series parsed the dictionary's key (Z) directly into the name as converters.Z, wow just wow...
1 parent 43e8c4b commit b859a69

File tree

4 files changed

+73
-86
lines changed

4 files changed

+73
-86
lines changed

Pipfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,26 @@ black = "==19.3b0"
88
chainer = "==6.2.0"
99
comet-ml = "==2.0.5"
1010
cupy-cuda100 = "==6.2.0"
11-
dask = {extras = ["array"],version = "==1.2.2"}
11+
dask = {extras = ["array"],version = "==2.1.0"}
1212
descartes = "==1.1.0"
13-
geopandas = "==0.5.0"
13+
geopandas = "==0.5.1"
1414
joblib = "==0.13.2"
1515
jupyterlab = "==1.0.0a10"
1616
jupytext = "==1.1.4rc1"
1717
livelossplot = "==0.4.1"
18-
matplotlib = "==3.1.0"
18+
matplotlib = "==3.1.1"
1919
netcdf4 = "==1.4.1"
20-
numpy = "==1.16.4"
20+
numpy = "==1.17.0rc2"
2121
onnx_chainer = "==1.4.1"
2222
optuna = "==0.13.0"
23-
pandas = "==0.24.2"
23+
pandas = "==0.25.0"
2424
pygmt = {editable = true, ref = "0.0.1a0-40-g29220bd", git = "https://github.com/weiji14/pygmt.git"}
2525
quilt = "==2.9.15"
26-
rasterio = "==1.0.23"
26+
rasterio = "==1.0.24"
2727
rtree = "==0.8.3"
2828
salem = "==0.2.4"
2929
scikit-image = "==0.15.0"
30-
tqdm = "==4.32.1"
30+
tqdm = "==4.32.2"
3131

3232
[dev-packages]
3333
behave = "==1.2.6"

Pipfile.lock

+64-77
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

data_prep.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@
683683
"\n",
684684
" # Read json file first\n",
685685
" j = json.loads(open(pipeline_file).read())\n",
686-
" jdf = pd.io.json.json_normalize(j, record_path=\"pipeline\")\n",
686+
" jdf = pd.io.json.json_normalize(data=j, record_path=\"pipeline\", max_level=0)\n",
687687
" jdf = jdf.set_index(keys=\"type\")\n",
688688
" reader = jdf.loc[\"readers.text\"] # check how to read the file(s)\n",
689689
"\n",

data_prep.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ def ascii_to_xyz(pipeline_file: str) -> pd.DataFrame:
286286

287287
# Read json file first
288288
j = json.loads(open(pipeline_file).read())
289-
jdf = pd.io.json.json_normalize(j, record_path="pipeline")
289+
jdf = pd.io.json.json_normalize(data=j, record_path="pipeline", max_level=0)
290290
jdf = jdf.set_index(keys="type")
291291
reader = jdf.loc["readers.text"] # check how to read the file(s)
292292

0 commit comments

Comments
 (0)