From 1ee43a16c745b521b369932da78ebac670bad0a6 Mon Sep 17 00:00:00 2001
From: Tania Allard <taniar.allard@gmail.com>
Date: Tue, 26 Mar 2024 07:28:22 +0000
Subject: [PATCH] MAINT - Add conda-store dependencies to pyproject.toml (#798)

---
 .github/workflows/tests.yaml      |  2 +-
 conda-store-server/pyproject.toml | 58 ++++++++++++++++++++-----------
 conda-store/environment.yaml      |  2 +-
 conda-store/pyproject.toml        | 14 ++++----
 4 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 05a2bd785..c779d7b88 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -56,7 +56,7 @@ jobs:
 
       - name: "Linting Checks 🧹"
         run: |
-          hatch env run -e dev lint
+          hatch env run -e lint lint
 
       - name: "Build package 📦"
         run: |
diff --git a/conda-store-server/pyproject.toml b/conda-store-server/pyproject.toml
index c5c3e6093..9ca81b171 100644
--- a/conda-store-server/pyproject.toml
+++ b/conda-store-server/pyproject.toml
@@ -26,25 +26,38 @@ classifiers = [
   "Programming Language :: Python :: 3 :: Only",
 ]
 dependencies = [
+  # env builds
+  # conda (which cannot be installed via pip see https://github.com/conda/conda/issues/11715)
+  "python-docker",
+  # we need platform dependent dependencies here
   "conda-docker; sys_platform == 'linux'",
+  "conda-lock >=1.0.5",
   "conda-pack",
+  "conda-package-handling",
+  "conda-package-streaming",
+  # web server
+  "alembic",
   "celery",
-  "sqlalchemy",
-  "requests",
   "fastapi",
+  "filelock",
+  "itsdangerous",
+  "jinja2",
+  "pyjwt",
+  "psycopg2-binary",
+  "pymysql",
   "pyyaml",
   "redis",
+  "requests",
   "pydantic<2",
-  "minio",
+  "python-multipart",
+  "sqlalchemy<=1.4.47",
   "traitlets",
-  "pyjwt",
+  "uvicorn",
   "yarl",
-  "filelock",
-  "itsdangerous",
-  "jinja2",
-  "python-multipart",
-  "python-docker"
-  # conda (which should not be included here)
+  # installer
+  "constructor",
+  # artifact storage
+  "minio",
 ]
 dynamic = ["version"]
 
@@ -55,25 +68,30 @@ Source = "https://github.com/conda-incubator/conda-store"
 [tool.hatch.version]
 path = "conda_store_server/__init__.py"
 
-[project.optional-dependencies]
-dev = ["build", "twine"]
-
 [tool.hatch.envs.dev]
 dependencies = [
+  "aiohttp>=3.8.1",
+  "build",
+  "docker-compose",
+  "docker-py<7",
+  "flower",
+  "playwright",
   "pre-commit",
-  "sphinx",
-  "myst-parser",
-  "sphinx-panels",
-  "sphinx-copybutton",
-  "pydata-sphinx-theme",
   "pytest",
+  "pytest-celery",
   "pytest-mock",
   "pytest-playwright",
+  "twine>=5.0.0",
+  "pkginfo>=1.10",
 ]
 
-[tool.hatch.envs.dev.scripts]
+[tool.hatch.envs.lint]
+dependencies = ["pre-commit"]
+
+[tool.hatch.envs.lint.scripts]
 lint = ["pre-commit run --all"]
-unit-test = "pytest tests -v"
+
+unit-test = "pytest -m 'not extended_prefix and not user_journey' tests"
 playwright-test = [
   "playwright install",
   "pytest --video on ../tests/test_playwright.py"
diff --git a/conda-store/environment.yaml b/conda-store/environment.yaml
index 122cb1d1b..138b4d4ed 100644
--- a/conda-store/environment.yaml
+++ b/conda-store/environment.yaml
@@ -4,7 +4,7 @@ channels:
 dependencies:
   - pip
   - jupyterhub<2.0.0
-  - jupyterlab>=3.0.0
+  - jupyterlab>=4.0.0
   - nb_conda_kernels
   # - nb_conda_store_kernels >=0.1.4
   - nodejs=16
diff --git a/conda-store/pyproject.toml b/conda-store/pyproject.toml
index 012a8dded..0967991f7 100644
--- a/conda-store/pyproject.toml
+++ b/conda-store/pyproject.toml
@@ -31,7 +31,11 @@ classifiers = [
   "Intended Audience :: Science/Research",
   "Intended Audience :: System Administrators",
 ]
-dependencies = ["rich", "click", "yarl", "aiohttp", "ruamel.yaml"]
+dependencies = ["rich",
+  "click",
+  "yarl",
+  "aiohttp>=3.8.1",
+  "ruamel.yaml"]
 dynamic = ["version"]
 
 [project.urls]
@@ -46,13 +50,11 @@ dev = ["build", "twine"]
 
 [tool.hatch.envs.dev]
 dependencies = [
+  "build",
   "pre-commit",
-  "sphinx",
-  "myst-parser",
-  "sphinx-panels",
-  "sphinx-copybutton",
-  "pydata-sphinx-theme",
   "pytest",
+  "twine>=5.0.0",
+  "pkginfo >= 1.10",
   "pytest-mock",
 ]