Skip to content

Commit

Permalink
MAINT - Add conda-store dependencies to pyproject.toml (#798)
Browse files Browse the repository at this point in the history
  • Loading branch information
trallard authored Mar 26, 2024
1 parent 6264e5b commit 1ee43a1
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
58 changes: 38 additions & 20 deletions conda-store-server/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion conda-store/environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 8 additions & 6 deletions conda-store/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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",
]

Expand Down

0 comments on commit 1ee43a1

Please sign in to comment.