Skip to content

Install file got merge conflict #3001

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.

Sign up for GitHub

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

Jump to bottom
Closed
Carreau opened this issue Apr 21, 2014 · 4 comments
Closed

Install file got merge conflict #3001

Carreau opened this issue Apr 21, 2014 · 4 comments

Comments

@Carreau
Copy link
Contributor

Carreau commented Apr 21, 2014

As seen here.
https://github.com/matplotlib/matplotlib/blob/master/INSTALL#L197-L219

Also, the install instruction on os x did not work for me I had to add the following export

 export LDFLAGS="-L/usr/local/Cellar/freetype/2.5.3_1/include/freetype2/";
 export CPPFLAGS="-I/usr/local/Cellar/freetype/2.5.3_1/include/freetype2/";
 python3 setup.py install

Should I add lines in README.osx ?

(and sorry for posting with empty bodies for people that get this issue by mail)
@Carreau Carreau changed the title Install file go merge conflict : Install file got merge conflict Apr 21, 2014
@tacaswell
Copy link
Member

Sorry, the merge conflict is my fault, I will take care of that.

@Carreau
Copy link
Contributor Author

Carreau commented Apr 21, 2014

Sorry, the merge conflict is my fault, I will take care of that.

No problem, I can do it too, mainly opened an issue because I can't do it right now and I will forget after.

I would also add an rst extension to the file to have it render on github, but it might break links.

@tacaswell
Copy link
Member

see #3002

Adding the extension would require touching the sphinx set up as well as the INSTALL file is embedded in the docs directly.

@tacaswell tacaswell mentioned this issue Apr 21, 2014
Closed
@tacaswell
Copy link
Member

Closing as this is fixed.

tacaswell added a commit to tacaswell/matplotlib that referenced this issue Jun 29, 2014
@tacaswell
DOC : tweak to OSX install
1e07f9d 
as suggest by @Carreau in matplotlib#3001
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@tacaswell @Carreau