From 1441596fba28c7f59b54ae64ac1bc16e7704867e Mon Sep 17 00:00:00 2001 From: Mark Sperry <71798812+msperryucsd@users.noreply.github.com> Date: Mon, 5 Jun 2023 12:20:22 -0700 Subject: [PATCH 1/6] Update actions.yml --- .github/workflows/actions.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 7afd53b..878d252 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -40,4 +40,5 @@ jobs: # Finally, we run the package unit-tests on the specified OS and python versions. - name: Test with pytest run: | - pytest + pip install git+https://github.com/LSDOlab/lsdo_test.git + lsdo_test \* From 4238564ca8fdbd8507b9d3537c2d6e76ff332c13 Mon Sep 17 00:00:00 2001 From: msperryucsd Date: Mon, 5 Jun 2023 12:25:39 -0700 Subject: [PATCH 2/6] comment out sphinxcollections --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e0917eb..9b6d0eb 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ def get_version(rel_path): 'sphinx-autoapi', 'numpydoc', 'gitpython', - 'sphinxcontrib-collections @ git+https://github.com/anugrahjo/sphinx-collections.git', # 'sphinx-collections', + # 'sphinxcontrib-collections @ git+https://github.com/anugrahjo/sphinx-collections.git', # 'sphinx-collections', 'sphinxcontrib-bibtex', 'setuptools', 'wheel', From f7e4b435d258a7a9c37d1a843dd16dfe78d47568 Mon Sep 17 00:00:00 2001 From: msperryucsd Date: Mon, 5 Jun 2023 12:26:34 -0700 Subject: [PATCH 3/6] comment out sphinxcollections --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 02d908f..c4e178d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,5 +10,5 @@ sphinx-copybutton sphinx-autoapi numpydoc gitpython -git+https://github.com/anugrahjo/sphinx-collections.git +# git+https://github.com/anugrahjo/sphinx-collections.git sphinxcontrib-bibtex From 2260080ed54b60ee38879a3a64b545980d7fe079 Mon Sep 17 00:00:00 2001 From: msperryucsd Date: Mon, 5 Jun 2023 12:29:10 -0700 Subject: [PATCH 4/6] comment out sphinxcollections --- .github/workflows/actions.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 878d252..419a407 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -40,5 +40,6 @@ jobs: # Finally, we run the package unit-tests on the specified OS and python versions. - name: Test with pytest run: | - pip install git+https://github.com/LSDOlab/lsdo_test.git - lsdo_test \* + # pip install git+https://github.com/LSDOlab/lsdo_test.git + # lsdo_test \* + pytest From a872e3fa1df4e7ec755b7d46f883ee9d72ae16a2 Mon Sep 17 00:00:00 2001 From: msperryucsd Date: Mon, 5 Jun 2023 12:30:26 -0700 Subject: [PATCH 5/6] comment out sphinxcollections --- .github/workflows/actions.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 419a407..7012347 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -40,6 +40,6 @@ jobs: # Finally, we run the package unit-tests on the specified OS and python versions. - name: Test with pytest run: | - # pip install git+https://github.com/LSDOlab/lsdo_test.git - # lsdo_test \* - pytest + pip install git+https://github.com/LSDOlab/lsdo_test.git + lsdo_test \* + # pytest From 77e4d61b09e382bef31f9bcb0538453a7ec4dd87 Mon Sep 17 00:00:00 2001 From: msperryucsd Date: Mon, 5 Jun 2023 18:23:52 -0700 Subject: [PATCH 6/6] edit reqs and setup --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index c4e178d..02d908f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,5 +10,5 @@ sphinx-copybutton sphinx-autoapi numpydoc gitpython -# git+https://github.com/anugrahjo/sphinx-collections.git +git+https://github.com/anugrahjo/sphinx-collections.git sphinxcontrib-bibtex diff --git a/setup.py b/setup.py index 9b6d0eb..70e3db5 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ def get_version(rel_path): 'sphinx-autoapi', 'numpydoc', 'gitpython', - # 'sphinxcontrib-collections @ git+https://github.com/anugrahjo/sphinx-collections.git', # 'sphinx-collections', + 'sphinx-collections @ git+https://github.com/anugrahjo/sphinx-collections.git', # 'sphinx-collections', 'sphinxcontrib-bibtex', 'setuptools', 'wheel',