Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Update dependencies #113

Merged
merged 4 commits into from
May 31, 2023
Merged

Update dependencies #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42d5693
Update dependencies
sjperkins May 31, 2023
a749d24
Replace deprecated Dataframe.append with pandas.concat
sjperkins May 31, 2023
8ec14c4
Remove test-dataframe-factory cruft
sjperkins May 31, 2023
76935a6
Use dask.dataframe to concatentate dask dataframes
sjperkins May 31, 2023
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
4 changes: 1 addition & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,12 @@ shadems = {reference = "bin/shadems", type = "file"}
[tool.poetry.dependencies]
python = "^3.8"
datashader = "^0.13.0"
dask-ms = { version = "^0.2.15", extras = ["xarray"] }
dask-ms = { version = "^0.2.16", extras = ["xarray"] }
holoviews = "^1.14.9"
matplotlib = { version = "^3.6.0" }
cmasher = "^1.6.3"
future-fstrings = "^1.2.0"
requests = "^2.27.1"
numpy = "1.23.5" # Datashader installs the latest numpy which is in conflict with <=1.35.5 required by numba
dask = { extras = ["array"], version = "2022.9.1" } # Datashader installs the latest dask which is in conflict with <2023.0.0 required by dask-ms[array]
pytest = { version = "^7.2.2", optional=true }
pytest-flake8 = { version = "^1.1.1", optional=true }

Expand Down
2 changes: 1 addition & 1 deletion shade_ms/tests/test_dask_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def test_dataframe_factory_multicol():
assert_array_equal(df['c0'].min(), data1c.min())
assert_array_equal(df['c0'].max(), data1c.max())

df = df.append(df)
df = dd.multi.concat([df, df])

assert_array_equal(df['x'].min(), data1a.min())
assert_array_equal(df['x'].max(), data1a.max())
Expand Down
23 changes: 0 additions & 23 deletions test-dataframe-factory.py
View file
Open in desktop

This file was deleted.