Fix GitHub docs deployment, reduce redundant folder structure, pin in…

…take below v2.0 (#65) ### What kind of change does this PR introduce? * Points the GitHub Docs deployment workflow at the right folder. * Reduces the number of folder levels (should be ported to cookiecutter as well) * Pins intake below v2.0 ### Does this PR introduce a breaking change? No. ### Other information: New `intake` just dropped; Doesn't seem to be compatible with some dependencies. https://pypi.org/project/intake/2.0.0/ More information: https://github.com/intake/intake/blob/master/README_refactor.md
hydrologie · Feb 3, 2024 · 2dd0bca · 2dd0bca
2 parents 9b5e47b + 9e7cc89
commit 2dd0bca
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -43,4 +43,4 @@ jobs:
         uses: JamesIves/[email protected]
         with:
           branch: gh-pages # The branch the action should deploy to.
-          folder: docs/_build/html # The folder the action should deploy.
+          folder: docs/_build/en/html # The folder the action should deploy.
diff --git a/Makefile b/Makefile
@@ -93,13 +93,13 @@ linkcheck: autodoc ## run checks over all external links found throughout the do
 	$(MAKE) -C docs linkcheck
 
 docs: autodoc ## generate Sphinx HTML documentation, including API docs
-	$(MAKE) -C docs html BUILDDIR="_build/html/en"
+	$(MAKE) -C docs html BUILDDIR="_build/en"
 ifneq ("$(wildcard $(LOCALES))","")
 	${MAKE} -C docs gettext
-	$(MAKE) -C docs html BUILDDIR="_build/html/fr" SPHINXOPTS="-D language='fr'"
+	$(MAKE) -C docs html BUILDDIR="_build/fr" SPHINXOPTS="-D language='fr'"
 endif
 ifndef READTHEDOCS
-	$(BROWSER) docs/_build/html/en/html/index.html
+	$(BROWSER) docs/_build/en/html/index.html
 endif
 
 servedocs: docs ## compile the docs watching for changes

diff --git a/environment-dev.yml b/environment-dev.yml
@@ -8,7 +8,7 @@ dependencies:
   - dask
   - dask-geopandas
   - geopandas
-  - intake
+  - intake <2.0
   - intake-geopandas
   - intake-xarray >=0.6.1
   - ipykernel

diff --git a/environment-docs.yml b/environment-docs.yml
@@ -10,7 +10,7 @@ dependencies:
   - furo
   - geoviews
   - hvplot
-  - intake
+  - intake <2.0.0
   - intake-geopandas
   - intake-xarray >=0.6.1
   - ipykernel

diff --git a/pyproject.toml b/pyproject.toml
@@ -48,7 +48,7 @@ dependencies = [
   "dask[array]>=2.6",
   "dask-geopandas",
   "geopandas",
-  "intake",
+  "intake<2.0.0",
   "intake-xarray>=0.6.1",
   "intake-geopandas",
   "ipython",