Skip to content

Commit

Permalink
Rename documentation/ to the more common docs/ (cocotb#3486)
Browse files Browse the repository at this point in the history
  • Loading branch information
cmarqu authored Nov 6, 2023
1 parent d9f8133 commit 1d47ee4
Show file tree
Hide file tree
Showing 74 changed files with 15 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ Most important: please explain *why* you are proposing this change.
* Make sure you have read https://github.com/cocotb/cocotb/blob/master/CONTRIBUTING.md
* Extend or add a test under `tests/test_cases/`.
* Add documentation under `documentation/source/`,
* Add documentation under `docs/source/`,
docstrings in Python code, or Doxygen markup in C/C++ code.
Use ``versionadded``/``versionchanged``/``deprecated``.
* Add a newsfragment - see `documentation/source/newsfragments/README.rst`.
* Add a newsfragment - see `docs/source/newsfragments/README.rst`.
* Use `closes #XXXX` to auto-close the issue that this PR fixes (if such).
-->
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ repos:
args:
- "--fix=lf"
- id: "end-of-file-fixer"
exclude: "^documentation/source/diagrams/(svg|xml)/"
exclude: "^docs/source/diagrams/(svg|xml)/"
4 changes: 2 additions & 2 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ build:

python:
install:
- requirements: documentation/requirements.txt
- requirements: docs/requirements.txt
- method: pip
path: .
extra_requirements:
- bus

sphinx:
configuration: documentation/source/conf.py
configuration: docs/source/conf.py
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ All changes which should go into the main codebase of cocotb must follow this se
- All code must pass existing tests.
New functionality must be accompanied by tests, and bug fixes should add tests to increase the test coverage and prevent regressions.
- If code changes or enhances documented behavior the documentation should be updated.
- If a change is user-visible, a newsfragment should be added to `documentation/source/newsfragments`.
- If a change is user-visible, a newsfragment should be added to `docs/source/newsfragments`.
- All pull requests must be accepted by at least one maintainer, with no maintainer strongly objecting.
Reviews must be performed by a person other than the primary author of the code.
- All commits should follow established best practices when creating a commit message:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 6 additions & 8 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -524,9 +524,9 @@ def release_test_nosim(session: nox.Session) -> None:

def create_env_for_docs_build(session: nox.Session) -> None:
session.run(
"pip", "install", "documentation/_vendor/domaintools"
"pip", "install", "docs/_vendor/domaintools"
) # not done in requirements.txt due to the way relative paths are handled in that file (gh-pypa/pip#8765)
session.run("pip", "install", "-r", "documentation/requirements.txt")
session.run("pip", "install", "-r", "docs/requirements.txt")
session.run("pip", "install", "-e", ".")


Expand All @@ -535,9 +535,7 @@ def docs(session: nox.Session) -> None:
"""invoke sphinx-build to build the HTML docs"""
create_env_for_docs_build(session)
outdir = session.cache_dir / "docs_out"
session.run(
"sphinx-build", "./documentation/source", str(outdir), "--color", "-b", "html"
)
session.run("sphinx-build", "./docs/source", str(outdir), "--color", "-b", "html")
index = (outdir / "index.html").resolve().as_uri()
session.log(f"Documentation is available at {index}")

Expand All @@ -559,7 +557,7 @@ def docs_preview(session: nox.Session) -> None:
# changes to cocotb code.
"--watch",
"cocotb",
"./documentation/source",
"./docs/source",
str(outdir),
)

Expand All @@ -571,7 +569,7 @@ def docs_linkcheck(session: nox.Session) -> None:
outdir = session.cache_dir / "docs_out"
session.run(
"sphinx-build",
"./documentation/source",
"./docs/source",
str(outdir),
"--color",
"-b",
Expand All @@ -586,7 +584,7 @@ def docs_spelling(session: nox.Session) -> None:
outdir = session.cache_dir / "docs_out"
session.run(
"sphinx-build",
"./documentation/source",
"./docs/source",
str(outdir),
"--color",
"-b",
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ build-backend = "setuptools.build_meta"

[tool.towncrier]
package = "cocotb"
directory = "documentation/source/newsfragments"
filename = "documentation/source/release_notes.rst"
directory = "docs/source/newsfragments"
filename = "docs/source/release_notes.rst"
issue_format = ":pr:`{issue}`"
# The first underline is used for the version/date header,
# the second underline for the subcategories (like 'Features')
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[flake8]
extend-exclude =
documentation/source/conf.py,
docs/source/conf.py,
makefiles,
venv,
_vendor,
Expand Down

0 comments on commit 1d47ee4

Please sign in to comment.