From 1ceca0c5b5b22c670228f5de81ab9f9dc8817c9f Mon Sep 17 00:00:00 2001 From: Ambuj Pawar Date: Fri, 19 Aug 2022 10:51:28 +0200 Subject: [PATCH 1/5] BLD: Explicitly state pip as a dependency in environment.yml --- environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.yml b/environment.yml index f1472f453b935..155d97df7bc9a 100644 --- a/environment.yml +++ b/environment.yml @@ -127,6 +127,7 @@ dependencies: # build the interactive terminal - jupyterlab >=3.4,<4 + - pip # Add explicitly to prevent conda/mamba using incorrect pip - pip: - jupyterlite==0.1.0b10 - sphinx-toggleprompt From c04aafd36bc3d9c415abe8dd9fca208e551fb1be Mon Sep 17 00:00:00 2001 From: Ambuj Pawar Date: Fri, 19 Aug 2022 11:17:27 +0200 Subject: [PATCH 2/5] BLD: Changes in environment.yml should be represented in requirements.txt as well --- requirements-dev.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements-dev.txt b/requirements-dev.txt index 60dd738e43ba3..7338e8e2882a0 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -98,6 +98,7 @@ feedparser pyyaml requests jupyterlab >=3.4,<4 +pip jupyterlite==0.1.0b10 sphinx-toggleprompt setuptools>=51.0.0 From 4470848c027d25f317bc4c9cbafa2c3680726a53 Mon Sep 17 00:00:00 2001 From: Ambuj Pawar Date: Fri, 19 Aug 2022 13:39:28 +0200 Subject: [PATCH 3/5] BLD: Add defaults channel to environment.yml for explicit pip dependency --- environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.yml b/environment.yml index 155d97df7bc9a..82b7fe2842586 100644 --- a/environment.yml +++ b/environment.yml @@ -2,6 +2,7 @@ name: pandas-dev channels: - conda-forge + - defaults dependencies: - python=3.8 From 17006ec370c3eea057fa066080ae7e7d044e961f Mon Sep 17 00:00:00 2001 From: Ambuj Pawar Date: Sun, 21 Aug 2022 22:17:14 +0530 Subject: [PATCH 4/5] default channel not needed. Removing it --- environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/environment.yml b/environment.yml index 82b7fe2842586..155d97df7bc9a 100644 --- a/environment.yml +++ b/environment.yml @@ -2,7 +2,6 @@ name: pandas-dev channels: - conda-forge - - defaults dependencies: - python=3.8 From c96068047e30a29614e9f8b20b8b80248f8b2dd2 Mon Sep 17 00:00:00 2001 From: Ambuj Pawar Date: Mon, 22 Aug 2022 23:35:06 +0530 Subject: [PATCH 5/5] move pip dependency to top of environment.yaml --- environment.yml | 2 +- requirements-dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 155d97df7bc9a..cd5a5d82facef 100644 --- a/environment.yml +++ b/environment.yml @@ -4,6 +4,7 @@ channels: - conda-forge dependencies: - python=3.8 + - pip # test dependencies - cython=0.29.32 @@ -127,7 +128,6 @@ dependencies: # build the interactive terminal - jupyterlab >=3.4,<4 - - pip # Add explicitly to prevent conda/mamba using incorrect pip - pip: - jupyterlite==0.1.0b10 - sphinx-toggleprompt diff --git a/requirements-dev.txt b/requirements-dev.txt index 7338e8e2882a0..2778d75af95c6 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,6 +1,7 @@ # This file is auto-generated from environment.yml, do not modify. # See that file for comments about the need/usage of each dependency. +pip cython==0.29.32 pytest>=6.0 pytest-cov @@ -98,7 +99,6 @@ feedparser pyyaml requests jupyterlab >=3.4,<4 -pip jupyterlite==0.1.0b10 sphinx-toggleprompt setuptools>=51.0.0