Skip to content

Commit

Permalink
Add "json_merge_patch" dependency (bluesky#761)
Browse files Browse the repository at this point in the history
* Add "json_merge_patch" dependency

* Add jsonpatch to minimal-client, minimal-server deps

Co-authored-by: Hiran Wijesinghe <wwijesing1@bnl.gov>

* Dedupliate and sort.

* Remove comment related to unsorted deps.

---------

Co-authored-by: Dan Allan <daniel.b.allan@gmail.com>
Co-authored-by: Hiran Wijesinghe <wwijesing1@bnl.gov>
Co-authored-by: Dan Allan <dallan@bnl.gov>
  • Loading branch information
4 people authored Jun 20, 2024
1 parent 86ea335 commit 99d5682
Showing 1 changed file with 23 additions and 19 deletions.
42 changes: 23 additions & 19 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,13 @@ all = [
"aiosqlite",
"alembic",
"anyio",
"appdirs",
"asgi-correlation-id",
"asyncpg",
"appdirs",
"awkward >=2.4.3",
"blosc2; python_version >= '3.10'",
"cachetools",
"canonicaljson",
"dask",
"dask[array]",
"dask[dataframe]",
Expand All @@ -62,12 +63,11 @@ all = [
"h5netcdf",
"h5py",
"httpx >=0.20.0,!=0.23.1",
"canonicaljson",
"jinja2",
"jmespath",
"jsonschema",
"jsonpatch",
"json-merge-patch",
"jsonpatch",
"jsonschema",
"lz4",
"msgpack >=1.0.0",
"ndindex",
Expand Down Expand Up @@ -111,8 +111,9 @@ client = [
"dask[dataframe]",
"entrypoints",
"httpx >=0.20.0,!=0.23.1",
"jsonschema",
"json-merge-patch",
"jsonpatch",
"jsonschema",
"lz4",
"msgpack >=1.0.0",
"ndindex",
Expand All @@ -124,8 +125,8 @@ client = [
"rich",
"sparse",
"typer",
"xarray",
"watchfiles",
"xarray",
"zstandard",
]
# These are used by the client/server to more efficiently compress.
Expand All @@ -147,28 +148,27 @@ dev = [
"coverage",
"flake8",
"importlib_resources;python_version < \"3.9\"",
"ipython",
"ldap3",
"matplotlib",
"mistune <2.0.0", # temporary while sphinx sorts this out,
"myst-parser",
"numpydoc",
"pre-commit",
"pytest <8", # TMP pin while plugins catch up
"pytest-asyncio",
"pytest-rerunfailures",
"pytest-mock",
"pytest-rerunfailures",
"sphinx !=4.1.0, !=4.1.1, !=4.1.2, !=4.2.0",
# These are dependencies of various sphinx extensions for documentation.
"ipython",
"matplotlib",
"mistune <2.0.0", # temporary while sphinx sorts this out,
"myst-parser",
"numpydoc",
"sphinx-click",
"sphinxcontrib-mermaid",
"sphinx-copybutton",
"sphinx_rtd_theme",
"sphinxcontrib-mermaid",
]
# These are used by the server to read files in the respective formats.
formats = [
"h5py",
"h5netcdf",
"h5py",
"openpyxl",
"pillow",
"tifffile",
Expand All @@ -178,6 +178,8 @@ minimal-client = [
"appdirs",
"entrypoints",
"httpx >=0.20.0,!=0.23.1",
"json-merge-patch",
"jsonpatch",
"jsonschema",
"msgpack >=1.0.0",
"orjson",
Expand All @@ -195,12 +197,14 @@ minimal-server = [
"appdirs",
"asgi-correlation-id",
"cachetools",
"canonicaljson",
"dask",
"fastapi",
"httpx >=0.20.0,!=0.23.1",
"canonicaljson",
"jinja2",
"jmespath",
"json-merge-patch",
"jsonpatch",
"jsonschema",
"msgpack >=1.0.0",
"orjson",
Expand Down Expand Up @@ -230,19 +234,19 @@ server = [
"awkward >=2.4.3",
"blosc2; python_version >= '3.10'",
"cachetools",
"canonicaljson",
"dask",
"dask[array]",
"dask[dataframe]",
"fastapi",
"h5netcdf",
"h5py",
"httpx >=0.20.0,!=0.23.1",
"canonicaljson",
"jinja2",
"jmespath",
"jsonschema",
"jsonpatch",
"json-merge-patch",
"jsonpatch",
"jsonschema",
"lz4",
"msgpack >=1.0.0",
"ndindex",
Expand Down

0 comments on commit 99d5682

Please sign in to comment.