Merge pull request #2049 from jaimergp/move-sphinx

move sphinx sources into sphinx/

Author: beckermr

.ci_scripts/generate_cfep_index.py

@@ -7,7 +7,7 @@
 TITLE_PATTERN = "<td>\s*Title\s*</td><td>\s*(.*)\s*</td>"
 STATUS_PATTERN = "<td>\s*Status\s*</td><td>\s*(.*)\s*</td>"
 REPO_DIR = Path(__file__).parents[1].absolute()
-CFEP_INDEX_RST = REPO_DIR / "src" / "orga" / "cfep-index.rst"
+CFEP_INDEX_RST = REPO_DIR / "sphinx" / "src" / "orga" / "cfep-index.rst"
 
 
 @dataclass

.ci_scripts/generate_html.py

@@ -8,7 +8,7 @@
 
 repo_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 
-with open(os.path.join(repo_dir, "src", "inst_partners.yaml")) as fp:
+with open(os.path.join(repo_dir, "sphinx", "src", "inst_partners.yaml")) as fp:
     data = yaml.safe_load(fp)
 
 keys = list(data.keys())
@@ -32,7 +32,7 @@
                     print(f"bad logo for {k}: {e}")
                     del data[k]["Logo URL"]
 
-with open(os.path.join(repo_dir, "index.html.tmpl")) as fp:
+with open(os.path.join(repo_dir, "sphinx", "index.html.tmpl")) as fp:
     tmpl = jinja2.Template(fp.read())
 
 context = {
@@ -51,5 +51,5 @@
     ),
 }
 
-with open(os.path.join(repo_dir, 'index.html'), 'w') as fp:
+with open(os.path.join(repo_dir, 'sphinx', 'index.html'), 'w') as fp:
     fp.write(tmpl.render(context))

.ci_scripts/update_docs

@@ -8,7 +8,7 @@ git config --global user.name "conda-forge-admin"
 
 git checkout -b new_site_content
 
-pushd newsfeed
+pushd sphinx/newsfeed
 pip install --no-deps .
 popd
 
@@ -19,19 +19,19 @@ rm -rf docs/
 
 python .ci_scripts/generate_cfep_index.py
 
-pushd src
+pushd sphinx/src
 
 # -W --keep-going: list all warnings but fail build in case there are any
 # -n: check validity of all links
 make html SPHINXOPTS="-W --keep-going -n"
 linkcheck_failed=0
 make linkcheck > /dev/null || linkcheck_failed=1
-python ../.ci_scripts/display_linkcheck.py _build/linkcheck/output.json
+python ../../.ci_scripts/display_linkcheck.py _build/linkcheck/output.json
 
 if [[ "${GHREF}" != "refs/heads/main" ]]; then
   test "$linkcheck_failed" -eq 0
 fi
 
-mv _build/html ../docs
+mv _build/html ../../docs
 rm -rf _build
 popd

.github/CONTRIBUTING.md

@@ -28,7 +28,7 @@ jobs:
     with:
       date: ${{ inputs.date || 'now' }}
       template_path: misc/DEV_MEETING_TEMPLATE.md
-      output_path: src/orga/minutes/%Y-%m-%d.md
+      output_path: sphinx/src/orga/minutes/%Y-%m-%d.md
       hackmd_team: conda-forge
       force_push: true
       pr_body: |

.github/workflows/meeting-notes.yml

@@ -1,10 +1,10 @@
 # Ignore doc build
-src/_build/
-src/default.profraw
+sphinx/src/_build/
+sphinx/src/default.profraw
 
 # Ignore newsfeed build
-newsfeed/build
-newsfeed/sphinxcontrib_newsfeed.egg-info
+sphinx/newsfeed/build
+sphinx/newsfeed/sphinxcontrib_newsfeed.egg-info
 
 # Ignore sphinx .buildinfo metadata
 docs/.buildinfo
@@ -16,6 +16,6 @@ elm-stuff
 .DS_Store
 
 # Ignore RTD redirect build
-rtd/_build
-rtd/default.profraw
-newsfeed/demo/_build
+sphinx/rtd/_build
+sphinx/rtd/default.profraw
+sphinx/newsfeed/demo/_build

.gitignore

@@ -1,7 +1,7 @@
 version: 2
 
 sphinx:
-  configuration: rtd/conf.py
+  configuration: src/rtd/conf.py
 
 formats:
   - htmlzip