Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

moved docs dir and updated references to it #3975

Merged
merged 5 commits into from
Feb 3, 2021

Conversation

tkknight
Copy link
Contributor

@tkknight tkknight commented Feb 1, 2021

🚀 Pull Request

Description

Move the Iris documentation directory from iris/docs/iris to iris/docs.

The references to this directory in the documentation and the appropriate config files have been made.

Closes #3836.


Consult Iris pull request check list

@tkknight
Copy link
Contributor Author

tkknight commented Feb 1, 2021

Read the docs build was ok, see https://readthedocs.org/projects/tkknight-iris-test-doc/builds/12909179/

@tkknight tkknight marked this pull request as ready for review February 1, 2021 17:04
@bjlittle bjlittle self-assigned this Feb 2, 2021
@bjlittle
Copy link
Member

bjlittle commented Feb 3, 2021

@tkknight Sadly, you have conflicts - a simple rebase will fix it.

My fault, sorry for not servicing this PR sooner 😊

Copy link
Member

@bjlittle bjlittle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tkknight Awesome, thanks 👍

@bjlittle bjlittle merged commit ea49375 into SciTools:master Feb 3, 2021
tkknight added a commit to tkknight/iris that referenced this pull request Feb 4, 2021
* master:
  corrected syntax (SciTools#3980)
  core dev whatsnew entry (SciTools#3978)
  moved docs dir and updated references to it (SciTools#3975)
  Fix test_incompatible_dimensions test (SciTools#3977)
tkknight added a commit to tkknight/iris that referenced this pull request Feb 9, 2021
* master: (23 commits)
  Added text to state the Python version used to build the docs. (SciTools#3989)
  add nox session conda list (SciTools#3990)
  Add abstract cube summary (SciTools#3987)
  automate docs discovery of iris and python versions (SciTools#3981)
  corrected syntax (SciTools#3980)
  core dev whatsnew entry (SciTools#3978)
  moved docs dir and updated references to it (SciTools#3975)
  Fix test_incompatible_dimensions test (SciTools#3977)
  remove explicit URLs for core dev names from latest.rst (SciTools#3973)
  document that iris.coords.Coord is an ABC (SciTools#3971)
  reorganise docs common links + add core devs (SciTools#3972)
  Docs whatsnew add dropdowns to the template (SciTools#3969)
  Docs whatsnew enumerated lists (SciTools#3970)
  Merge back v3p0p1 (SciTools#3966)
  Captilise installation heading - align SciTools#3958 content with SciTools#3940. (SciTools#3963)
  Merge back v3p0p0 (SciTools#3960)
  Extended the installation description (SciTools#3958)
  Put cube data on the x axis if plotting just a cube against a vertical or y coordinate (SciTools#3906)
  remove stock_mdi_arrays.npz (SciTools#3913)
  Gallery: update seasonal ensemble example (SciTools#3933)
  ...
@tkknight tkknight deleted the docs_dir_move3 branch March 2, 2022 17:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Docs directory prune: iris/docs/iris -> iris/docs/
2 participants