include pip .txt env in conda .yml and remove duplicates

kedhammar · Oct 22, 2024 · 0c49d0f · 0c49d0f
1 parent 53e2bad
commit 0c49d0f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/conda_requirements.yml b/conda_requirements.yml
@@ -1,9 +1,14 @@
+channels:
+  - conda-forge
+  - defaults
 dependencies:
   - python=3.12
-  - 'conda-forge::pango>=1.42.0'
-  - 'conda-forge::pandas>=1.3.2'
-  - conda-forge::psycopg2
-  - conda-forge::open-fonts
-  - conda-forge::xorg-libxrender
-  - conda-forge::xorg-libxext
-  - conda-forge::xorg-libxau
+  - pango>=1.42.0
+  - pandas>=1.3.2
+  - psycopg2
+  - open-fonts
+  - xorg-libxrender
+  - xorg-libxext
+  - xorg-libxau
+  - pip:
+    - '-r requirements.txt'
diff --git a/requirements.txt b/requirements.txt
@@ -14,8 +14,6 @@ nose
 numpy>=1.12.1
 oauth2>=1.9.0.post1
 openpyxl
-pandas
-psycopg2
 pycryptodome>=3.6.1
 pyparsing>=2.2.0
 python-dateutil>=2.7.5