Skip to content

Api doc backport no imag build #7779

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

Merged
merged 4 commits into from
Jan 13, 2017

Conversation

tacaswell
Copy link
Member

backport of #7757 + docs

dopplershift and others added 2 commits January 9, 2017 23:33
By default, don't include tests in binary distributions.
Update to include details about how to re-enable.
@tacaswell tacaswell added this to the 2.0 (style change major release) milestone Jan 10, 2017
@@ -201,6 +201,20 @@ replaced by ``nipy_spectral`` and ``nipy_spectral_r`` since matplotlib
raised a warning. As of matplotlib 2.0.0, using the old names raises a
deprecation warning. In the future, using the old names will raise an error.

Default install does not include test images
Copy link
Member

Choose a reason for hiding this comment

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

does not include -> no longer includes

To reduce the default size of wheels and source installs, the tests
and baseline images are no longer included by default.

To restore installing the tests and images have a `setup.cfg` with ::
Copy link
Member

Choose a reason for hiding this comment

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

images have -> images, use
(or add)

@@ -79,10 +79,15 @@ Alternatively, if you do ::
pip install -v ./

all of the files will be copied to the installation directory however,
you will have to rerun this command every time the source is changed.
you will have to rerun this command every time the source is changed. Additionally you will
need to copy :file:`setup.cfg.template` to :file:`setup.cfg` and edit to contain ::
Copy link
Member

Choose a reason for hiding this comment

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

edit to -> edit it to

@tacaswell
Copy link
Member Author

Apparently we have moved to using develop on the master branch, but not in 2.x....

Copy link
Member

@NelleV NelleV left a comment

Choose a reason for hiding this comment

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

Apart from the minor comments (which IMO are minor enough that they can be ignored), this looks good.
👍

Default install does not include test images
--------------------------------------------

To reduce the default size of wheels and source installs, the tests
Copy link
Member

Choose a reason for hiding this comment

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

Isn't "default" an extra word here?

@@ -22,10 +22,10 @@

[packages]
# There are a number of subpackages of matplotlib that are considered
Copy link
Member

Choose a reason for hiding this comment

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

matplotlib -> Matplotlib
(trying to catch them as they come…)

@NelleV NelleV changed the title Api doc backport no imag build [MRG+1] Api doc backport no imag build Jan 13, 2017
@tacaswell tacaswell force-pushed the API_DOC_backport_no_imag_build branch from 08be52f to 9cff712 Compare January 13, 2017 03:53
@tacaswell tacaswell force-pushed the API_DOC_backport_no_imag_build branch from 9cff712 to ca6bb75 Compare January 13, 2017 03:54
@tacaswell
Copy link
Member Author

Took 3 tries, but I think I got all of them.

@NelleV NelleV merged commit be4b213 into matplotlib:v2.x Jan 13, 2017
@NelleV
Copy link
Member

NelleV commented Jan 13, 2017

Thanks!

@QuLogic QuLogic changed the title [MRG+1] Api doc backport no imag build Api doc backport no imag build Jan 13, 2017
@tacaswell tacaswell deleted the API_DOC_backport_no_imag_build branch January 13, 2017 15:26
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.

4 participants