From 560a747ca978e8f617c36f1a8f761950a6701319 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Mon, 13 Sep 2021 17:07:28 -0400 Subject: [PATCH 1/9] bump doxygen and sphinx version on RTD This fixes #847. The idea comes fom https://github.com/readthedocs/readthedocs.org/issues/8151#issuecomment-890359661. --- .readthedocs.yml | 2 ++ doc/environment.yml | 6 ++++++ setup.py | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .readthedocs.yml create mode 100644 doc/environment.yml diff --git a/.readthedocs.yml b/.readthedocs.yml new file mode 100644 index 0000000000..4eac7eaca7 --- /dev/null +++ b/.readthedocs.yml @@ -0,0 +1,2 @@ +conda: + environment: doc/environment.yml \ No newline at end of file diff --git a/doc/environment.yml b/doc/environment.yml new file mode 100644 index 0000000000..b835c0a2e7 --- /dev/null +++ b/doc/environment.yml @@ -0,0 +1,6 @@ +name: RTD +channels: + - conda-forge + - defaults +dependencies: + - doxygen>=1.9.1 \ No newline at end of file diff --git a/setup.py b/setup.py index 363cd0015f..d46703e463 100644 --- a/setup.py +++ b/setup.py @@ -127,7 +127,7 @@ cmake_minimum_required_version="3.0", extras_require={ "test": ["dpdata>=0.1.9", "ase", "pytest", "pytest-cov", "pytest-sugar"], - "docs": ["sphinx>=3.1.1,<4.1.0", "recommonmark", "sphinx_rtd_theme>=1.0.0rc1", "sphinx_markdown_tables", "myst-parser", "breathe", "exhale", "numpydoc", "ase"], + "docs": ["sphinx>=3.1.1", "recommonmark", "sphinx_rtd_theme>=1.0.0rc1", "sphinx_markdown_tables", "myst-parser", "breathe", "exhale", "numpydoc", "ase"], **extras_require, }, entry_points={"console_scripts": ["dp = deepmd.entrypoints.main:main"]}, From 9e76d2e47e98d7f50c472cd62920c0683d7bf32d Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Mon, 13 Sep 2021 17:13:43 -0400 Subject: [PATCH 2/9] use version 2 --- .readthedocs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.readthedocs.yml b/.readthedocs.yml index 4eac7eaca7..a105ddb2b2 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,2 +1,3 @@ +version: 2 conda: environment: doc/environment.yml \ No newline at end of file From 7e9808cd21af59b1afe4bed6e25a41aba62121e6 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Mon, 13 Sep 2021 17:19:56 -0400 Subject: [PATCH 3/9] add other dependencies --- doc/environment.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/environment.yml b/doc/environment.yml index b835c0a2e7..da7876e296 100644 --- a/doc/environment.yml +++ b/doc/environment.yml @@ -3,4 +3,8 @@ channels: - conda-forge - defaults dependencies: - - doxygen>=1.9.1 \ No newline at end of file + - doxygen>=1.9.1 + - python=3.9 + - pip>=20.1 + - pip: + - .[docs,cpu] From 138cf8245b34fff85191cb1a902d46485e9d7cee Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Mon, 13 Sep 2021 17:28:23 -0400 Subject: [PATCH 4/9] fix error --- doc/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/environment.yml b/doc/environment.yml index da7876e296..bdb56f2722 100644 --- a/doc/environment.yml +++ b/doc/environment.yml @@ -7,4 +7,4 @@ dependencies: - python=3.9 - pip>=20.1 - pip: - - .[docs,cpu] + - --requirement requirements.txt From 24cbea32d52536830e4c43f4a5ec5cbfad249a9d Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Mon, 13 Sep 2021 17:32:02 -0400 Subject: [PATCH 5/9] fix path --- doc/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/environment.yml b/doc/environment.yml index bdb56f2722..f3928e4015 100644 --- a/doc/environment.yml +++ b/doc/environment.yml @@ -7,4 +7,4 @@ dependencies: - python=3.9 - pip>=20.1 - pip: - - --requirement requirements.txt + - ..[docs,cpu] From cb596f10f1f30939878975d7da7768a645540903 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Mon, 13 Sep 2021 17:44:08 -0400 Subject: [PATCH 6/9] got a memory error... --- .readthedocs.yml | 6 +++++- doc/environment.yml | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index a105ddb2b2..51929b8eda 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,3 +1,7 @@ version: 2 conda: - environment: doc/environment.yml \ No newline at end of file + environment: doc/environment.yml +python: + version: 3.9 + install: + - requirements: doc/requirements.txt \ No newline at end of file diff --git a/doc/environment.yml b/doc/environment.yml index f3928e4015..a784e685ab 100644 --- a/doc/environment.yml +++ b/doc/environment.yml @@ -4,7 +4,3 @@ channels: - defaults dependencies: - doxygen>=1.9.1 - - python=3.9 - - pip>=20.1 - - pip: - - ..[docs,cpu] From 3732e621118e3a2ed1cbf395ced142232b5773b2 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Mon, 13 Sep 2021 17:47:58 -0400 Subject: [PATCH 7/9] 3.9 is not supported --- .readthedocs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 51929b8eda..8ad6d6d324 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -2,6 +2,6 @@ version: 2 conda: environment: doc/environment.yml python: - version: 3.9 + version: 3.8 install: - - requirements: doc/requirements.txt \ No newline at end of file + - requirements: doc/requirements.txt From 41c1034ac42e338fc657fcda3c1d66e6fbe36190 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Tue, 14 Sep 2021 18:04:26 -0400 Subject: [PATCH 8/9] Revert "3.9 is not supported" This reverts commit 3732e621118e3a2ed1cbf395ced142232b5773b2. --- .readthedocs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 8ad6d6d324..51929b8eda 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -2,6 +2,6 @@ version: 2 conda: environment: doc/environment.yml python: - version: 3.8 + version: 3.9 install: - - requirements: doc/requirements.txt + - requirements: doc/requirements.txt \ No newline at end of file From 3c719c2763c46c436aebd9163c40af5392a45585 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Tue, 14 Sep 2021 18:04:27 -0400 Subject: [PATCH 9/9] Revert "got a memory error..." This reverts commit cb596f10f1f30939878975d7da7768a645540903. --- .readthedocs.yml | 6 +----- doc/environment.yml | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 51929b8eda..a105ddb2b2 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,7 +1,3 @@ version: 2 conda: - environment: doc/environment.yml -python: - version: 3.9 - install: - - requirements: doc/requirements.txt \ No newline at end of file + environment: doc/environment.yml \ No newline at end of file diff --git a/doc/environment.yml b/doc/environment.yml index a784e685ab..f3928e4015 100644 --- a/doc/environment.yml +++ b/doc/environment.yml @@ -4,3 +4,7 @@ channels: - defaults dependencies: - doxygen>=1.9.1 + - python=3.9 + - pip>=20.1 + - pip: + - ..[docs,cpu]