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

Fix trait-documenter extension tests for Sphinx 3.1 #1206

Merged
merged 1 commit into from
Jun 10, 2020

Conversation

mdickinson
Copy link
Member

@mdickinson mdickinson commented Jun 10, 2020

The trait-documenter tests weren't using a valid configuration file; this PR fixes that.

Fixes #1205

@mdickinson
Copy link
Member Author

Note: I've tested locally with Sphinx 3.1, but I haven't tested with the current version of Sphinx from EDM; the CI should do that effectively.

@mdickinson mdickinson mentioned this pull request Jun 10, 2020
6 tasks
@mdickinson mdickinson added the component: trait-documenter Issues related to the trait-documenter Sphinx extension label Jun 10, 2020
Copy link
Contributor

@kitchoi kitchoi left a comment

Choose a reason for hiding this comment

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

LGTM

@mdickinson mdickinson merged commit aeaf72f into master Jun 10, 2020
@mdickinson mdickinson deleted the fix/trait-documenter-sphinx-31 branch June 10, 2020 12:30
mdickinson added a commit that referenced this pull request Jul 21, 2020
mdickinson added a commit that referenced this pull request Jul 21, 2020
* Fix end-year in copyright statement (#1198)

(cherry picked from commit 21e2a99)

* Fix trait-documenter extension tests for Sphinx 3.1 (#1206)

(cherry picked from commit aeaf72f)

* DOC/FIX: User manual mentioning a nonexisting feature in metadata filter (#1207)

* Fix user manual erroneously mentioning a nonexisting feature

* Fix grammar

Co-authored-by: Mark Dickinson <mdickinson@enthought.com>

Co-authored-by: Mark Dickinson <mdickinson@enthought.com>
(cherry picked from commit 3e78a41)

* Spelling and grammar. (#1210)

(cherry picked from commit 24c4d76)

* Fix description in README to match the one in the setup script (#1219)

(cherry picked from commit a5dc3f2)

* Fix some missing stubs (#1204)

* Add a couple of missing imports to api.pyi

* Remove mis-spelled stubs file

* Add missing api.pyi stubs for the has_traits module

* Add CTrait

* Add imports for BaseTraitHandler and TraitHandler

* Add constants

(cherry picked from commit 47806c8)

* Standardize copyright years (#1227)

* Standardize copyright years

* Use hard-coded year in conf.py, for ease of later search-and-replace. Also normalise punctuation.

* More punctuation OCD

* More consistency fixes

* Remove unused import

* Remove the _right_ unused import

* Yet one more consistency fix

(cherry picked from commit aa63531)

* Don't mutate global state at import time in a test module (#1222)

(cherry picked from commit 24345a1)

* Fix typo in optional_dependencies (#1235)

Fix a comment that mistakenly refers to traits.api, when it means traitsui.api.

(cherry picked from commit a48ede5)

* Update PyPI links and capitalization in README.rst (#1250)

* Update PyPI links and capitalization in README.rst

This PR:
- updates incorrect and inconsistent capitalization in the README
- adds a PyPI link for Sphinx
- adds a PyPI link for the Enthought Sphinx Theme (the previous link was to GitHub)

* Clarify that later versions  of Sphinx are fine

* Update README.rst

(cherry picked from commit 8d03955)

* Update changelog

Co-authored-by: Kit Choi <kitchoi@users.noreply.github.com>
@mdickinson mdickinson added porting: backported to 6.1 This PR has been backported to the Traits 6.1.x release branch and removed porting: needs backport to 6.1 labels Jul 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component: trait-documenter Issues related to the trait-documenter Sphinx extension porting: backported to 6.1 This PR has been backported to the Traits 6.1.x release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

trait_documenter tests broken with Sphinx 3.1.0
2 participants