Skip to content

Commit

Permalink
DEV - Update runtime dependencies (#827)
Browse files Browse the repository at this point in the history
Co-authored-by: Tania Allard <[email protected]>
  • Loading branch information
peytondmurray and trallard authored Jun 4, 2024
1 parent 98bb61e commit 0f4db01
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 56 deletions.
31 changes: 0 additions & 31 deletions conda-store-server/environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,3 @@ dependencies:
- python ==3.10
# conda environment builds
- conda ==23.5.2
- python-docker
- conda-docker >= 0.1.2
- conda-pack
- conda-lock >=1.0.5
- conda-package-handling
- conda-package-streaming
# web server
- celery
- flower
- redis-py
- sqlalchemy<=1.4.47
- alembic
- platformdirs >=4.0,<5.0a0
- psycopg2
- pymysql
- requests
- pyyaml
- uvicorn
- fastapi
- pydantic < 2.0
- traitlets
- yarl
- pyjwt
- filelock
- itsdangerous
- jinja2
- python-multipart
# artifact storage
- minio
# installer
- constructor
10 changes: 3 additions & 7 deletions conda-store-server/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ dependencies = [
"celery",
"fastapi",
"filelock",
"flower",
"itsdangerous",
"jinja2",
"pyjwt",
Expand All @@ -50,12 +51,10 @@ dependencies = [
"requests",
"pydantic<2",
"python-multipart",
"sqlalchemy<=1.4.47",
"sqlalchemy<2",
"traitlets",
"uvicorn",
"yarl",
# installer
"constructor",
# artifact storage
"minio",
"platformdirs >=4.0,<5.0a0"
Expand All @@ -75,15 +74,12 @@ dependencies = [
"build",
"docker-compose",
"docker-py<7",
"flower",
"playwright",
"pre-commit",
"pytest",
"pytest-celery",
"pytest-mock",
"pytest-playwright",
"twine>=5.0.0",
"pkginfo>=1.10",
"pkginfo>=1.10", # Needed to support metadata 2.3
]

[tool.hatch.envs.lint]
Expand Down
16 changes: 2 additions & 14 deletions conda-store/environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,7 @@ name: conda-store
channels:
- conda-forge
dependencies:
- pip
- jupyterhub<2.0.0
- jupyterlab>=4.0.0
- nb_conda_kernels
# - nb_conda_store_kernels >=0.1.4
- nodejs=16
- nodejs=18
- yarn
# conda-store client dependencies
- yarl
- aiohttp>=3.8.1
- rich
- click
- ruamel.yaml
- pip:
- https://github.com/yuvipanda/jupyter-launcher-shortcuts/archive/refs/heads/master.zip
- jupyterlab-conda-store
- constructor # Runtime dependency, but must be conda-installed
13 changes: 9 additions & 4 deletions conda-store/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,17 @@ classifiers = [
"Intended Audience :: Science/Research",
"Intended Audience :: System Administrators",
]
dependencies = ["rich",
dependencies = [
"rich",
"click",
"yarl",
"aiohttp>=3.8.1",
"ruamel.yaml"]
"ruamel.yaml",
"jupyterhub<2.0.0",
"jupyterlab>=4.0.0",
"jupyter-launcher-shortcuts",
"jupyterlab-conda-store",
]
dynamic = ["version"]

[project.urls]
Expand All @@ -54,8 +60,7 @@ dependencies = [
"pre-commit",
"pytest",
"twine>=5.0.0",
"pkginfo >= 1.10",
"pytest-mock",
"pkginfo >= 1.10", # Needed to support metadata 2.3
]

[tool.hatch.envs.lint]
Expand Down

0 comments on commit 0f4db01

Please sign in to comment.