Skip to content

Conversation

pelson
Copy link
Member

@pelson pelson commented Mar 2, 2012

I have changed the documentation building to use the plot directive & avoid the need for a make.py to build the figures in advance. My motivation for this was to be able to build the documentation without the need of ipython (which I do not have installed).

I am concerned about the change to lib/mpl_toolkits/basemap/shapefile.py. I was unable to revert the seemingly automatic change using git checkout -- lib/mpl_toolkits/basemap/shapefile.py and would like to be reassured that I have not done anything wrong before any merge should go through.

Many Thanks,

@jswhit
Copy link

jswhit commented Mar 2, 2012

Phil: Thanks, this is something that definitely needs to be done. I don't think the changes to the two examples and shapefile.py are related though - so they should be reverted.

@pelson
Copy link
Member Author

pelson commented Mar 2, 2012

Hi Jeff, I have been trying to figure out what's going on with that file. I haven't touched it, and have reverted back to the master on several occasions, but git is still complaining... I have just noticed that when I commit I get a message:

warning: CRLF will be replaced by LF in lib/mpl_toolkits/basemap/shapefile.py

This is related to the line endings in said file.
Do you run git on windows? What is the output of:

git config core.autocrlf

Ideally, you should allow git to convert your line endings in a standard way. This can be enabled with:

git config core.autocrlf True

jswhit pushed a commit that referenced this pull request Mar 4, 2012
Change basemap docs to use the plot directive.
@jswhit jswhit merged commit 7e55b37 into matplotlib:master Mar 4, 2012
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