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

Doc updates #9291

Merged
merged 7 commits into from
Oct 7, 2017
Merged

Doc updates #9291

merged 7 commits into from
Oct 7, 2017

Conversation

anntzer
Copy link
Contributor

@anntzer anntzer commented Oct 6, 2017

PR Summary

PR Checklist

  • Has Pytest style unit tests
  • Code is PEP 8 compliant
  • New features are documented, with examples if plot related
  • Documentation is sphinx and numpydoc compliant
  • Added an entry to doc/users/next_whats_new/ if major new feature (follow instructions in README.rst there)
  • Documented in doc/api/api_changes.rst if API changed in a backward-incompatible way

Sorry, something went wrong.

The situation is much better: most GUI toolkits are now pip-installable.
@tacaswell tacaswell added this to the 2.1.0-docs milestone Oct 6, 2017
@@ -267,14 +178,14 @@ retry the install. If that does not work, then check
Installing via OSX mpkg installer package
-----------------------------------------

matplotlib also has a disk image (``.dmg``) installer, which contains a
typical Installer.app package to install matplotlib. You should use binary
Matplotlib also has a disk image (``.dmg``) installer, which contains a
Copy link
Member

Choose a reason for hiding this comment

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

This is no longer true, we only do wheels on mac now. Can you remove all references to dmg files?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Can you just edit accordingly? I have close to no idea how things work on OSX, so I can cargo it but I'd rather not.

Copy link
Member

Choose a reason for hiding this comment

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

I also have no idea how macs work, but I do know we do not build a dmg file.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

just killed the section


rm -rf build
rm -rf /path/to/site-packages/matplotlib*
Copy link
Member

Choose a reason for hiding this comment

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

This can be replaced by pip unistall matplotlib

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I intentionally left it to cover the case of "seriously broken install" but not sure it's worth it -- let me know what you think.

Copy link
Member

Choose a reason for hiding this comment

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

That is a compelling position, including a reference to pip uninstall matplotlib someplace would be good though.

@anntzer anntzer force-pushed the doc-updates branch 3 times, most recently from 4fe9110 to 7490eb5 Compare October 6, 2017 07:06
If you want to be able to follow the development branch as it changes
just replace the last step with::

pip install -e .
Copy link
Member

Choose a reason for hiding this comment

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

One gotcha that I've run into is pip not being installed in the conda environment I'm in, so it uses the default pip, and installs the development version over the released version in my main conda environment. Not sure where environments fit into this document, but something that could be discussed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I updated the thing to use python -mpip throughout, which should make sure pip always works from (and thus, in) the local environment.
I also think that conda now installs pip by default in all envs? (but it's even if it doesn't it's not a problem as long as you use python -mpip).

Mainly dedent the bullet list, so that it does not appear as a rst
blockquote.
Mostly moving away from python3.4 in the examples.
@tacaswell
Copy link
Member

I am 👍 on what @anntzer wrote, but added a few commits so I don't want to merge this. Anyone (including @anntzer ) should merge this if it is a net improvement to the docs.

your system to install matplotlib. This will guarantee that everything
that is needed for matplotlib will be installed as well.
To install Matplotlib at the system-level we recommend that you use your
distribution's package manager to install Matplotlib. This will guarantee
Copy link
Member

Choose a reason for hiding this comment

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

Suggest drop: "...to install Matplotlib"

comes with at least a basic build system. Follow the :ref:`instructions
<install-from-git>` found above for how to build and install matplotlib.
If, for some reason, you can not use the package manager, you may use the
manylinux wheels available on PyPI::
Copy link
Member

Choose a reason for hiding this comment

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

OK, when I read this I thought that manylinux was a typo. Put in quotes?

Copy link
Member

Choose a reason for hiding this comment

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

https://github.com/pypa/manylinux They never use quotes, I do not think we want to deviate from their notation.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's a bit jargon-esque but I'd prefer leaving it as it is.

Copy link
Member

Choose a reason for hiding this comment

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

Not a big deal, but how about "...you may use the wheels available from manylinux, available on PyPI"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

use the manylinux-tagged wheels, available on PyPI OK?

Copy link
Member

Choose a reason for hiding this comment

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

Sounds good!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Upon further throught I just dropped the "manylinux", as they are the only kind of linux wheels on pypi anyways, and either the reader knows what it means in which case it's obvious the wheels should be manylinux-tagged, or the reader doesn't and that doesn't help him at all.

If, for some reason, you can not use the package manager, Linux usually
comes with at least a basic build system. Follow the :ref:`instructions
<install-from-git>` found above for how to build and install matplotlib.
If, for some reason, you can notuse the package manager, you may use the wheels
Copy link
Member

Choose a reason for hiding this comment

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

Notuse -> not use

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed the wrong space :) fixed

@tacaswell tacaswell merged commit cc7de70 into matplotlib:master Oct 7, 2017
@anntzer anntzer deleted the doc-updates branch October 7, 2017 22:41
tacaswell added a commit that referenced this pull request Oct 7, 2017
DOC: Install instruction updates
@tacaswell
Copy link
Member

backported as 22c088e

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.

Document that python setup.py develop add the symlink to easy-install.pth
4 participants