Skip to content

Bring sphinx updates from development to master#331

Merged
mdeceglie merged 3 commits into
masterfrom
sphinx-dev2master
Jul 1, 2022
Merged

Bring sphinx updates from development to master#331
mdeceglie merged 3 commits into
masterfrom
sphinx-dev2master

Conversation

@kandersolar
Copy link
Copy Markdown
Member

  • Code changes are covered by tests
  • Code changes have been evaluated for compatibility/integration with TrendAnalysis
  • New functions added to __init__.py
  • API.rst is up to date, along with other sphinx docs pages
  • Example notebooks are rerun and differences in results scrutinized
  • Updated changelog

The sphinx updates in #325 were merged to development but it would be nice to have them on master as well (see docs build failure in #326). Merging development to master is not a good solution at this point because it has other changes we're not ready to merge to master yet, so this branch reflects an earlier state of the development branch with only the sphinx changes.

Note: #325 was merged (not squash-and-merged), so we should probably do the same here to have the same commit history on master as we have on development.

Copy link
Copy Markdown
Collaborator

@mdeceglie mdeceglie left a comment

Choose a reason for hiding this comment

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

LGTM

@mdeceglie mdeceglie merged commit ae94347 into master Jul 1, 2022
@mdeceglie mdeceglie deleted the sphinx-dev2master branch July 1, 2022 20:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants