BUILD: move LLM-specific packages to min/max configs and list them in…

… conda/tox test configs
BCG-X-Official · Jun 21, 2024 · bbbd35f · bbbd35f
1 parent 0bcca30
commit bbbd35f
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 29 deletions.
diff --git a/condabuild/meta.yaml b/condabuild/meta.yaml
@@ -32,14 +32,14 @@ test:
     - artkit.model
   requires:
     - pytest ~= 8.2
-    - aiohttp ~=3.9.5
-    - pyyaml ~=6.0.1
-    - transformers ~=4.41.2
-    - pytorch ~=2.3.0
-    - openai {{ environ.get('ARTKIT_V_OPENAI', '[False]') }}
+    - aiohttp {{ environ.get('ARTKIT_V_AIOHTTP', '[False]') }}
     - anthropic {{ environ.get('ARTKIT_V_ANTHROPIC', '[False]') }}
+    - google-generativeai {{ environ.get('ARTKIT_V_GOOGLE-GENERATIVEAI', '[False]') }}
     - groq {{ environ.get('ARTKIT_V_GROQ', '[False]') }}
-    - google-generativeai {{ environ.get('ARTKIT_V_GOOGLE_GENERATIVEAI', '[False]') }}
+    - openai {{ environ.get('ARTKIT_V_OPENAI', '[False]') }}
+    - pyyaml {{ environ.get('ARTKIT_V_PYYAML', '[False]') }}
+    - pytorch {{ environ.get('ARTKIT_V_PYTORCH', '[False]') }}
+    - transformers {{ environ.get('ARTKIT_V_TRANSFORMERS', '[False]') }}
   commands:
     - conda list
     - python -c "import artkit; import os; assert artkit.__version__ == os.environ['ARTKIT_BUILD_ARTKIT_VERSION']"

diff --git a/pyproject.toml b/pyproject.toml
@@ -74,10 +74,7 @@ testing = [
     "pytest                   ~= 8.2",
     "pytest-cov               ~= 5.0",
     "pytest-asyncio           ~= 0.23",
-    "aiohttp                  ~= 3.9",
     "pyyaml                   ~= 6.0.1",
-    "transformers             ~= 4.41",
-    "torch                    ~= 2.3"
 ]
 
 [tool.flit.metadata.urls]
@@ -89,28 +86,34 @@ Repository = "https://github.com/BCG-X-Official/artkit"
 no-binary.min = ["matplotlib"]
 
 [build.matrix.min]
-matplotlib        = "~=3.6.3"
-pandas            = "~=2.1"
-python            = "==3.11"
-gamma-pytools     = "~=3.0.0"
-fluxus            = "~=1.0.0"
-typing_inspect    = "~=0.7.1"
-openai            = "~=1.34"
-anthropic         = "~=0.28"
-groq              = "~=0.9"
+matplotlib          = "~=3.6.3"
+pandas              = "~=2.1"
+python              = "==3.11"
+gamma-pytools       = "~=3.0.0"
+fluxus              = "~=1.0.0"
+typing_inspect      = "~=0.7.1"
+openai              = "~=1.34"
+anthropic           = "~=0.28"
+groq                = "~=0.9"
 google-generativeai = "~=0.6"
+aiohttp             = "~=3.9"
+transformers        = "~=4.41"
+torch               = "~=2.3"
 
 [build.matrix.max]
-matplotlib        = "~=3.8"
-pandas            = "~=2.2"
-python            = ">=3.12,<4a"
-gamma-pytools     = "~=3.0"
-fluxus            = "~=1.0"
-typing_inspect    = "~=0.9"
-openai            = ">=1.34"
-anthropic         = ">=0.28"
-groq              = ">=0.9"
+matplotlib          = "~=3.8"
+pandas              = "~=2.2"
+python              = ">=3.12,<4a"
+gamma-pytools       = "~=3.0"
+fluxus              = "~=1.0"
+typing_inspect      = "~=0.9"
+openai              = ">=1.34"
+anthropic           = ">=0.28"
+groq                = ">=0.9"
 google-generativeai = ">=0.6"
+aiohttp             = ">=3.9"
+transformers        = ">=4.41"
+torch               = ">=2.3"
 
 [tool.black]
 required-version = '24.4.2'

diff --git a/tox.ini b/tox.ini
@@ -35,10 +35,14 @@ deps =
     fluxus{env:ARTKIT_V_FLUXUS}
     gamma-pytools{env:ARTKIT_V_GAMMA_PYTOOLS}
     typing_inspect{env:ARTKIT_V_TYPING_INSPECT}
-    openai{env:ARTKIT_V_OPENAI}
+    aiohttp{env:ARTKIT_V_AIOHTTP}
     anthropic{env:ARTKIT_V_ANTHROPIC}
+    google-generativeai{env:ARTKIT_V_GOOGLE-GENERATIVEAI}
     groq{env:ARTKIT_V_GROQ}
-    google-generativeai{env:ARTKIT_V_GOOGLE_GENERATIVEAI}
+    openai{env:ARTKIT_V_OPENAI}
+    pyyaml{env:ARTKIT_V_PYYAML}
+    pytorch{env:ARTKIT_V_PYTORCH}
+    transformers{env:ARTKIT_V_TRANSFORMERS}
 
 [flake8]