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

{vis}[foss/2018a] gnuplot v5.2.2 #5955

Merged
merged 21 commits into from
Mar 15, 2018

Conversation

reedts
Copy link
Contributor

@reedts reedts commented Mar 6, 2018

(created using eb --new-pr)
Edit: depends on #5988, #5987, #5979, #5980

('libpng', '1.6.32'),
('fontconfig', '2.12.6'),
('libjpeg-turbo', '1.5.3'),
('libpng', '1.6.34'),
Copy link
Member

Choose a reason for hiding this comment

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

@reedts Please don't bump dependency versions in existing easyconfig, you'll introduce conflicts in other places...

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'll take it out

Copy link
Member

Choose a reason for hiding this comment

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

@reedts You want to add a new easyconfig for libgd 2.2.5, not change the existing one for 2.2.4` in place...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah I found an error in my libgd-2.2.5 easyconfig. The version there was still 2.2.4. Seems like it messed things up...

@boegel
Copy link
Member

boegel commented Mar 6, 2018

@reedts This PR is getting quite big, to the point where it's going to be difficult to get it merged. A rule of thumb is to not include/tweak more than 10 easyconfigs per PR.

Can you flesh out some of this in a separate PR?

@boegel boegel added the update label Mar 6, 2018
@reedts
Copy link
Contributor Author

reedts commented Mar 9, 2018

@boegel I agree, I'll restructure this and split it up into several PRs.

@boegel
Copy link
Member

boegel commented Mar 9, 2018

@reedts You may not need to, see PRs for Mesa 17.3.6 (#5973) and cairo 1.14.12 (#5979)

@reedts
Copy link
Contributor Author

reedts commented Mar 9, 2018

@boegel Removed the Mesa and cairo packages. The other easyconfigs are already outsourced in other PRs, see updated PR description.

Read this too late, sorry..

@easybuilders easybuilders deleted a comment from boegelbot Mar 9, 2018
@boegel boegel added this to the 3.6.0 milestone Mar 9, 2018
easyblock = 'ConfigureMake'

name = 'libgd'
version = '2.2.4'
Copy link
Member

Choose a reason for hiding this comment

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

@reedts Please don't remove existing easyconfigs...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@boegel My fault. Looks like I have to re-add it to remove it?

easyblock = 'ConfigureMake'

name = 'libdrm'
version = '2.4.90'
Copy link
Member

Choose a reason for hiding this comment

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

@reedts We already have an existing easyconfig for libdrm 2.4.91, which is more recent than this...

Also, this is not related to gnuplot at all? So can just be removed imho...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@boegel Right, it must have got in here somehow. I'll remove it.

@easybuilders easybuilders deleted a comment from boegelbot Mar 9, 2018
@boegel
Copy link
Member

boegel commented Mar 12, 2018

@reedts All PRs this PR depends on are now merged, I've retriggered the tests in Travis to get a better view on current status.

@easybuilders easybuilders deleted a comment from boegelbot Mar 12, 2018
('cairo', '1.14.12'),
('libjpeg-turbo', '1.5.3'),
('libpng', '1.6.34'),
('libgd', '2.2.5'),
Copy link
Member

Choose a reason for hiding this comment

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

@reedts Easyconfig file for this libgd dep is still missing?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@boegel Should be included now.

Copy link
Member

Choose a reason for hiding this comment

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

looks good now indeed 👍

('libpng', '1.6.32'),
('fontconfig', '2.12.6'),
('libjpeg-turbo', '1.5.3'),
('libpng', '1.6.34'),
Copy link
Member

Choose a reason for hiding this comment

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

@reedts You want to add a new easyconfig for libgd 2.2.5, not change the existing one for 2.2.4` in place...

@@ -1,7 +1,7 @@
easyblock = 'ConfigureMake'

name = 'libgd'
version = '2.2.4'
version = '2.2.5'
Copy link
Member

Choose a reason for hiding this comment

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

@reedts You're now renaming the libgd 2.2.4 easyconfig to 2.2.5, which means removing the 2.2.4 easyconfig...

Also, the checksum for libgd 2.2.5 needs to be fixed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@boegel I fixed the checksum but still struggling to get that version 2.2.4 out. Will removing it and readding it work (before I try and it still won't work)?

Copy link
Member

Choose a reason for hiding this comment

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

@reedts Just re-adding it should do it (you can't remove it anymore, it's already gone since it was renamed to 2.2.5).

@boegel
Copy link
Member

boegel commented Mar 13, 2018

Test report by @boegel
SUCCESS
Build succeeded for 6 out of 6 (6 easyconfigs in this PR)
node2666.swalot.os - Linux centos linux 7.4.1708, Intel(R) Xeon(R) CPU E5-2660 v3 @ 2.60GHz, Python 2.7.5
See https://gist.github.com/0a05880852fc61f494e8733666301d7c for a full test report.

boegel
boegel previously approved these changes Mar 13, 2018
@boegel
Copy link
Member

boegel commented Mar 13, 2018

Test report by @boegel
SUCCESS
Build succeeded for 6 out of 6 (6 easyconfigs in this PR)
node2040.delcatty.os - Linux centos linux 7.4.1708, Intel(R) Xeon(R) CPU E5-2670 0 @ 2.60GHz, Python 2.7.5
See https://gist.github.com/93e7a071f9b61cc10882198663dfd9ed for a full test report.

@boegel
Copy link
Member

boegel commented Mar 13, 2018

@reedts Tests complain that both libjpeg-turbo 1.5.2 and 1.5.3 are now used as deps in foss/2018a easyconfigs (thanks to the added check in #5970), which is an issue with the just merged GraphicsMagick & Ghostscript easyconfigs from #5982, not this gnuplot PR.

I'm fixing that in #5999, I will re-trigger the tests here once that PR is merged.

@reedts
Copy link
Contributor Author

reedts commented Mar 13, 2018

@boegel All right! Good that check exists now in the first place!

@easybuilders easybuilders deleted a comment from boegelbot Mar 13, 2018
@boegel
Copy link
Member

boegel commented Mar 13, 2018

@reedts Seems like you'll need to sync your branch with current develop...

@boegel
Copy link
Member

boegel commented Mar 14, 2018

@reedts Please merge reedts#1 so we can get this PR merged?

@reedts
Copy link
Contributor Author

reedts commented Mar 15, 2018

@boegel Merged.

@boegel
Copy link
Member

boegel commented Mar 15, 2018

Going in, thanks @reedts!

@boegel boegel merged commit e951ee3 into easybuilders:develop Mar 15, 2018
@easybuilders easybuilders deleted a comment from boegelbot Mar 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants