From 569795cdf81f9ddbffb29f45005d0b07c913c309 Mon Sep 17 00:00:00 2001 From: Julia Kent Date: Wed, 15 Sep 2021 11:50:11 -0600 Subject: [PATCH 01/13] change install to pip in readthedocs --- .readthedocs.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index c60462e5..f449491c 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -4,8 +4,10 @@ version: 2 build: image: latest -conda: - environment: ci/environment.yml +python: + install: + - requirements: ci/environment.yml + - method: pip sphinx: configuration: portal/conf.py From 03e2e1d9952ab220ed15cb715e69007b44deb12a Mon Sep 17 00:00:00 2001 From: Julia Kent Date: Wed, 15 Sep 2021 11:54:48 -0600 Subject: [PATCH 02/13] update blackdoc --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 82538b60..fab0e074 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: - id: black - repo: https://github.com/keewis/blackdoc - rev: v0.3.3 + rev: v0.3.4 hooks: - id: blackdoc From 652f3af5f55a51a9314fd8b96f5e3c98c54ca57e Mon Sep 17 00:00:00 2001 From: Julia Kent Date: Wed, 15 Sep 2021 11:58:38 -0600 Subject: [PATCH 03/13] change requirements to path --- .readthedocs.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index f449491c..c53848ad 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -6,8 +6,8 @@ build: python: install: - - requirements: ci/environment.yml - - method: pip + - path: ci/environment.yml + - method: pip sphinx: configuration: portal/conf.py From 571e81295edb6aeafcbd001a98c83ad9dfe49557 Mon Sep 17 00:00:00 2001 From: Julia Kent Date: Wed, 15 Sep 2021 12:00:38 -0600 Subject: [PATCH 04/13] method before requirements --- .readthedocs.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index c53848ad..665b2eb7 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -6,8 +6,9 @@ build: python: install: - - path: ci/environment.yml - method: pip + requirements: ci/environment.yml + sphinx: configuration: portal/conf.py From 995c43189afede4805ec93ef2d99c0fb939e7350 Mon Sep 17 00:00:00 2001 From: Julia Kent Date: Wed, 15 Sep 2021 12:01:42 -0600 Subject: [PATCH 05/13] trailing white space --- .readthedocs.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 665b2eb7..ccc1849c 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -8,7 +8,6 @@ python: install: - method: pip requirements: ci/environment.yml - sphinx: configuration: portal/conf.py From 49e70fb3d0aec2e6d70d234c64015d4795368178 Mon Sep 17 00:00:00 2001 From: Julia Kent Date: Wed, 15 Sep 2021 12:05:42 -0600 Subject: [PATCH 06/13] indent --- .readthedocs.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index ccc1849c..005b1bc8 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -6,8 +6,8 @@ build: python: install: - - method: pip - requirements: ci/environment.yml + - method: pip + requirements: ci/environment.yml sphinx: configuration: portal/conf.py From 98351999a7f1f9184b9fb272a58855551097d177 Mon Sep 17 00:00:00 2001 From: Julia Kent Date: Wed, 15 Sep 2021 12:15:10 -0600 Subject: [PATCH 07/13] trying path again --- .readthedocs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 005b1bc8..5dd6569e 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -7,7 +7,7 @@ build: python: install: - method: pip - requirements: ci/environment.yml + path: ci/environment.yml sphinx: configuration: portal/conf.py From a3b62687cbded70145bf7f95c1c261e50e9eecd8 Mon Sep 17 00:00:00 2001 From: Julia Kent Date: Wed, 15 Sep 2021 12:21:09 -0600 Subject: [PATCH 08/13] rm method (pip default) --- .readthedocs.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 5dd6569e..555d4c5b 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -6,8 +6,7 @@ build: python: install: - - method: pip - path: ci/environment.yml + - requirements: ci/environment.yml sphinx: configuration: portal/conf.py From 6ef5c84808fd16f59216eb25f97a59516cccefbd Mon Sep 17 00:00:00 2001 From: Julia Kent Date: Wed, 15 Sep 2021 12:25:46 -0600 Subject: [PATCH 09/13] del environment name to test --- ci/environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/environment.yml b/ci/environment.yml index 7b9d2e73..0cd62b56 100644 --- a/ci/environment.yml +++ b/ci/environment.yml @@ -1,4 +1,3 @@ -name: pythia channels: - conda-forge - nodefaults From b08be55d4836a08aba1806a777981a98c3848e39 Mon Sep 17 00:00:00 2001 From: Julia Kent Date: Wed, 15 Sep 2021 12:26:48 -0600 Subject: [PATCH 10/13] del channels to test --- ci/environment.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/ci/environment.yml b/ci/environment.yml index 0cd62b56..e95bd086 100644 --- a/ci/environment.yml +++ b/ci/environment.yml @@ -1,6 +1,3 @@ -channels: - - conda-forge - - nodefaults dependencies: - myst-nb==0.12.3 - sphinx-book-theme From 30577e836ac5f01d6d84dbf8b7abb4d31cb3dd8f Mon Sep 17 00:00:00 2001 From: Julia Kent Date: Wed, 15 Sep 2021 12:28:11 -0600 Subject: [PATCH 11/13] revert environment.yaml --- ci/environment.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/environment.yml b/ci/environment.yml index e95bd086..7b9d2e73 100644 --- a/ci/environment.yml +++ b/ci/environment.yml @@ -1,3 +1,7 @@ +name: pythia +channels: + - conda-forge + - nodefaults dependencies: - myst-nb==0.12.3 - sphinx-book-theme From 62da2c1d47785796b2cbf7af7a69e15813eba522 Mon Sep 17 00:00:00 2001 From: Julia Kent Date: Wed, 15 Sep 2021 12:37:50 -0600 Subject: [PATCH 12/13] try an environement txt file --- .readthedocs.yaml | 2 +- ci/environment_pip.txt | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 ci/environment_pip.txt diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 555d4c5b..f62cc87d 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -6,7 +6,7 @@ build: python: install: - - requirements: ci/environment.yml + - requirements: ci/environment_pip.txt sphinx: configuration: portal/conf.py diff --git a/ci/environment_pip.txt b/ci/environment_pip.txt new file mode 100644 index 00000000..14196f3e --- /dev/null +++ b/ci/environment_pip.txt @@ -0,0 +1,7 @@ +myst-nb==0.12.3 +sphinx-book-theme +sphinx-panels +matplotlib +pandas +pyyaml +pre-commit \ No newline at end of file From cde357e83e5616b8383c97d60a8d5959f623937f Mon Sep 17 00:00:00 2001 From: Julia Kent Date: Wed, 15 Sep 2021 12:40:04 -0600 Subject: [PATCH 13/13] add newline at end of file --- ci/environment_pip.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/environment_pip.txt b/ci/environment_pip.txt index 14196f3e..f897babf 100644 --- a/ci/environment_pip.txt +++ b/ci/environment_pip.txt @@ -4,4 +4,4 @@ sphinx-panels matplotlib pandas pyyaml -pre-commit \ No newline at end of file +pre-commit