GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Overhaul make.osx in master by jkseppan · Pull Request #30 · matplotlib/matplotlib

Conversation

@jkseppan

@jkseppan jkseppan commented Mar 6, 2011

Copy link
Copy Markdown
Member

This is the master branch counterpart to pull request #17, which fixes some problems in make.osx on the v1.0.x maintenance branch. In addition to the changes on that branch, this pull request updates zlib, freetype and libpng to new versions.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
jkseppan added 3 commits March 5, 2011 11:46
@jkseppan
Simplify make.osx, add targets
a71414d
@jkseppan
Merge branch 'make.osx' into master-make-osx
5260b85 
Conflicts:
	make.osx
@jkseppan
Upgrade dependency versions in make.osx
9204cc7
@jkseppan

jkseppan commented Mar 6, 2011

Copy link
Copy Markdown
Member Author

Some tests fail with new freetype - see http://thread.gmane.org/gmane.comp.python.matplotlib.devel/9948/focus=9965
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
jkseppan added 3 commits March 10, 2011 11:53
@jkseppan
Remove unnecessary command from make.osx
9d4c65e 
The echo was there to comment out a cp command, and things seem to
work fine without the cp.
@jkseppan
Go back to older freetype
b7efe25
@jkseppan
Merge branch 'master' into master-make-osx
56af69b 
Conflicts:
	README.osx
	make.osx
@jkseppan

jkseppan commented Mar 26, 2011

Copy link
Copy Markdown
Member Author

Went back to an older freetype because of the failing tests, and merged master because of a conflict. Comments, anyone?
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@ddale

ddale commented Apr 2, 2011

Copy link
Copy Markdown
Contributor

I don't use the makefile approach myself. I use MacPorts to provide the dependencies and then the usual "python setup.py install --user". I might recommend adding an additional install target like "mpl_install_user", to support installing to user's local site-packages directory (python-2.6 and newer).

Aside from that, the only comment I have is that I would have stuck with the newer freetype, it is going to be provided by other package managers anyway.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@mdboom

mdboom commented Apr 4, 2011

Copy link
Copy Markdown
Member

Perhaps as part of this effort we should merge the two different Mac OS X makefiles in the tree? (Or as a follow on.) Just wanted to link this mailing list discussion here:

http://www.mail-archive.com/[email protected]/msg08055.html
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@efiring

efiring commented Jun 16, 2011

Copy link
Copy Markdown
Member

I think this really should get merged now, before the next release, and I agree with Mike that it should have the new freetype version. However, I have been unsuccessful in doing the merge. Every time I try, README.osx gets truncated. I could use a brute-force method, simply copying the revised versions of the two files from the branch into master and committing, but maybe someone else can figure out a more elegant solution.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@ddale

ddale commented Jun 16, 2011

Copy link
Copy Markdown
Contributor

Yeah, I see the same thing. Rebasing yields the same result. I'd like to understand what is going on, github says this pull request can be automatically merged, but when I perform the merge locally there are conflicts that have to be resolved. Jouni, why did you merge master into this branch?
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@ddale

ddale commented Jun 16, 2011

Copy link
Copy Markdown
Contributor

Maybe its not worth worrying about, and we should just do the brute-force approach. I'm not at work today where I can test on a mac. Eric, could you take care of it? Are you familiar with 'git commit --author="Jouni K. Seppänen [email protected]"'?
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@efiring

efiring commented Jun 16, 2011

Copy link
Copy Markdown
Member

On 06/16/2011 03:06 AM, ddale wrote:

Maybe its not worth worrying about, and we should just do the brute-force approach. I'm not at work today where I can test on a mac. Eric, could you take care of it? Are you familiar with 'git commit --author="Jouni K. Seppä[email protected]"'?

Now I am!
I will do it this afternoon.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
jkseppan added a commit that referenced this pull request Jun 16, 2011
@jkseppan @efiring
Simplify make.osx, add targets. Closes pull request #30.
861da23 
Slightly modified version of a71414d from the maintenance branch.
@efiring

efiring commented Jun 16, 2011

Copy link
Copy Markdown
Member

Closed with 861da23.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@efiring efiring closed this Jun 16, 2011
mdboom added a commit to mdboom/matplotlib that referenced this pull request Oct 31, 2011
@mdboom
Flush buffer when finishing SVG file. Closes matplotlib#30.
d1e3b1c
mdboom added a commit to mdboom/matplotlib that referenced this pull request Oct 31, 2011
@mdboom
Merge pull request matplotlib#31 from mdboom/bytes_io_truncated
e06cef0 
Flush buffer when finishing SVG file.  Closes matplotlib#30.
@richbwood richbwood mentioned this pull request Dec 19, 2012
test_pcolormesh hangs #1609
Closed
magnunor pushed a commit to magnunor/matplotlib that referenced this pull request Dec 5, 2013
Stefano Mazzucco
load the SI data in natural order: rows, columns, etc. Fixes matplotl…
cf2b96f 
…ib#30

lib/io/dm3_data_plugin.py
BUG-FIX: DM3ImageFile.read_image_data
         when loading data, the natural order should be (rows, columns, ...)
         and not (X, Y, ...).

         Digital Micrograph stores Spectrum Images as:

         X0, Y0, Z0,
         X1, Y0, Z0,
         [...],
         Xn, Ym, Z0,
         [...]
         X0, Y0, Z1,
         [...],
         Xn, Ym, Zk

         Since X <=> column and Y <=> row the 1st two axes of the ndarray
         must be transposed because the natural order is:
         row (Y), column (X), E.

MOVE:   file_reader
        For back compatibility with the plotting libraries, the data are
        transposed back.
magnunor pushed a commit to magnunor/matplotlib that referenced this pull request Dec 5, 2013
@francisco-dlp
Add support for dm4 files, fixes matplotlib#8 and fixes matplotlib#30.…
f68d247 
… The digital micrograph

reader has been almost fully rewritten and it should now be able to read
a higher number of dm3 files.
nansonzheng pushed a commit to nansonzheng/matplotlib that referenced this pull request Mar 5, 2016
@dashed
Merge pull request matplotlib#30 from CSCD01Winter2016/1235-tests
cd67491 
1235 tests
fariza added a commit to fariza/matplotlib that referenced this pull request Sep 22, 2016
@fariza
Merge pull request matplotlib#30 from fariza/fig-legend
d4ff15f 
making figure legend for profiles
@jkseppan
jkseppan deleted the master-make-osx branch January 2, 2017 10:59
@WeatherGod WeatherGod mentioned this pull request Mar 2, 2018
pyplot hangs at plot() #10648
Closed
@DavidMertz DavidMertz mentioned this pull request Sep 30, 2019
Bar width expands between subsequent bars #15351
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

4 participants

@jkseppan @ddale @mdboom @efiring
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.