From a11087e9568a75391be88f7ca8058af7b8bfb684 Mon Sep 17 00:00:00 2001
From: pdmurray <peynmurray@gmail.com>
Date: Wed, 29 May 2024 18:44:07 -0700
Subject: [PATCH] Update runtime dependencies

---
 conda-store-server/environment.yaml | 30 +----------------------------
 conda-store-server/pyproject.toml   |  9 ++-------
 conda-store/environment.yaml        | 12 +++---------
 conda-store/pyproject.toml          |  9 +++++----
 4 files changed, 11 insertions(+), 49 deletions(-)

diff --git a/conda-store-server/environment.yaml b/conda-store-server/environment.yaml
index ea06891d5..f1c57ed5b 100644
--- a/conda-store-server/environment.yaml
+++ b/conda-store-server/environment.yaml
@@ -6,34 +6,6 @@ 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
diff --git a/conda-store-server/pyproject.toml b/conda-store-server/pyproject.toml
index 371049002..91481eca3 100644
--- a/conda-store-server/pyproject.toml
+++ b/conda-store-server/pyproject.toml
@@ -50,12 +50,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"
@@ -75,15 +73,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 tos upport metadata 2.3
 ]
 
 [tool.hatch.envs.lint]
diff --git a/conda-store/environment.yaml b/conda-store/environment.yaml
index 138b4d4ed..1eba54c08 100644
--- a/conda-store/environment.yaml
+++ b/conda-store/environment.yaml
@@ -6,15 +6,9 @@ dependencies:
   - 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
+  - constructor # Runtime dependency, but must be conda-installed
   - pip:
-      - https://github.com/yuvipanda/jupyter-launcher-shortcuts/archive/refs/heads/master.zip
+      - jupyter-launcher-shortcuts
       - jupyterlab-conda-store
diff --git a/conda-store/pyproject.toml b/conda-store/pyproject.toml
index a090fe501..15cd90250 100644
--- a/conda-store/pyproject.toml
+++ b/conda-store/pyproject.toml
@@ -31,11 +31,13 @@ classifiers = [
   "Intended Audience :: Science/Research",
   "Intended Audience :: System Administrators",
 ]
-dependencies = ["rich",
+dependencies = [
+  "rich",
   "click",
   "yarl",
   "aiohttp>=3.8.1",
-  "ruamel.yaml"]
+  "ruamel.yaml",
+]
 dynamic = ["version"]
 
 [project.urls]
@@ -54,8 +56,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]