From 14826208cbc51121875be3e7ece772f1910ae773 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Mon, 7 Oct 2024 15:38:24 -0400 Subject: [PATCH 01/10] debug RTD build --- docs/rtd_environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/rtd_environment.yml b/docs/rtd_environment.yml index 7eae4aad6..1e9288d56 100644 --- a/docs/rtd_environment.yml +++ b/docs/rtd_environment.yml @@ -2,6 +2,5 @@ name: dpdata channels: - conda-forge dependencies: - - mamba - pip: - ..[docs] From f38dbd6e0bb2a00ff36f8f88ebe37751808c555a Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Wed, 9 Oct 2024 15:42:00 -0400 Subject: [PATCH 02/10] python <3.13 --- docs/rtd_environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/rtd_environment.yml b/docs/rtd_environment.yml index 1e9288d56..7be4441a3 100644 --- a/docs/rtd_environment.yml +++ b/docs/rtd_environment.yml @@ -2,5 +2,6 @@ name: dpdata channels: - conda-forge dependencies: + - python <3.13 - pip: - ..[docs] From 667267c1395a1440df049944fec71a5d960cdd0c Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Wed, 9 Oct 2024 15:47:55 -0400 Subject: [PATCH 03/10] update mambaforge --- .readthedocs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 83a360327..79c271f43 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -3,7 +3,7 @@ version: 2 build: os: ubuntu-22.04 tools: - python: "mambaforge-22.9" + python: "mambaforge-23.11" conda: environment: docs/rtd_environment.yml sphinx: From 7e88996ae2b72e033512b637ae47c8903a54f3f9 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Wed, 9 Oct 2024 15:52:50 -0400 Subject: [PATCH 04/10] update conda --- docs/rtd_environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/rtd_environment.yml b/docs/rtd_environment.yml index 7be4441a3..d5ae1f7d4 100644 --- a/docs/rtd_environment.yml +++ b/docs/rtd_environment.yml @@ -3,5 +3,6 @@ channels: - conda-forge dependencies: - python <3.13 + - conda - pip: - ..[docs] From d343d55632e91b9e7bb1be29097baed423f603ff Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Wed, 9 Oct 2024 16:35:00 -0400 Subject: [PATCH 05/10] mamba --- docs/rtd_environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/rtd_environment.yml b/docs/rtd_environment.yml index d5ae1f7d4..bd16d07dd 100644 --- a/docs/rtd_environment.yml +++ b/docs/rtd_environment.yml @@ -3,6 +3,6 @@ channels: - conda-forge dependencies: - python <3.13 - - conda + - mamba - pip: - ..[docs] From e9be4e36fac589cd52e6aff3bf522133387e9c9b Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Wed, 9 Oct 2024 17:26:04 -0400 Subject: [PATCH 06/10] rename env --- docs/rtd_environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/rtd_environment.yml b/docs/rtd_environment.yml index bd16d07dd..ad5230447 100644 --- a/docs/rtd_environment.yml +++ b/docs/rtd_environment.yml @@ -1,4 +1,4 @@ -name: dpdata +name: dpdata-rtd channels: - conda-forge dependencies: From 6f2c116385775fb775ea3c01ad6df4bece127ada Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Wed, 9 Oct 2024 17:32:51 -0400 Subject: [PATCH 07/10] Update environment.yml --- docs/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/environment.yml b/docs/environment.yml index 89d2e5cad..cb8ebdf25 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -1,4 +1,4 @@ -name: dpdata +name: dpdata-emscripten channels: - https://repo.mamba.pm/emscripten-forge - conda-forge From 0cecd92a9de6f863d466b4f0c1d04ba2399a2925 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Thu, 10 Oct 2024 22:28:31 -0400 Subject: [PATCH 08/10] Revert "Update environment.yml" This reverts commit 6f2c116385775fb775ea3c01ad6df4bece127ada. --- docs/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/environment.yml b/docs/environment.yml index cb8ebdf25..89d2e5cad 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -1,4 +1,4 @@ -name: dpdata-emscripten +name: dpdata channels: - https://repo.mamba.pm/emscripten-forge - conda-forge From 19bc618195d811a4456f8446ccdbf4e3835d6152 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Thu, 10 Oct 2024 22:28:32 -0400 Subject: [PATCH 09/10] Revert "rename env" This reverts commit e9be4e36fac589cd52e6aff3bf522133387e9c9b. --- docs/rtd_environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/rtd_environment.yml b/docs/rtd_environment.yml index ad5230447..bd16d07dd 100644 --- a/docs/rtd_environment.yml +++ b/docs/rtd_environment.yml @@ -1,4 +1,4 @@ -name: dpdata-rtd +name: dpdata channels: - conda-forge dependencies: From 496bf9d5ab3700d25c84f3dfa0c1fbb248480e1d Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Thu, 10 Oct 2024 22:29:01 -0400 Subject: [PATCH 10/10] pin mamba<2 --- docs/rtd_environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/rtd_environment.yml b/docs/rtd_environment.yml index bd16d07dd..50572dca7 100644 --- a/docs/rtd_environment.yml +++ b/docs/rtd_environment.yml @@ -3,6 +3,6 @@ channels: - conda-forge dependencies: - python <3.13 - - mamba + - mamba <2 - pip: - ..[docs]