From 0c49d0ffffc3ab2dd02386054d0479b496d24fe2 Mon Sep 17 00:00:00 2001 From: kedhammar Date: Tue, 22 Oct 2024 13:30:21 +0200 Subject: [PATCH] include pip .txt env in conda .yml and remove duplicates --- conda_requirements.yml | 19 ++++++++++++------- requirements.txt | 2 -- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/conda_requirements.yml b/conda_requirements.yml index d4b14013a..0af3fb941 100644 --- 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 index d2f1cd9aa..9a489695f 100644 --- 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