Skip to content

Split hepmc Into hepmc and hepmc3#16892

Merged
becker33 merged 2 commits intospack:developfrom
vvolkl:split-hepmc
Jun 17, 2020
Merged

Split hepmc Into hepmc and hepmc3#16892
becker33 merged 2 commits intospack:developfrom
vvolkl:split-hepmc

Conversation

@vvolkl
Copy link
Copy Markdown
Contributor

@vvolkl vvolkl commented Jun 1, 2020

Since HepMC3 is basically an indepependent package from HepMC2, this splits the recipes, as discussed in #16880, which adds some generators that can use hepmc and hepmc3 concurrently.

Copy link
Copy Markdown
Member

@becker33 becker33 left a comment

Choose a reason for hiding this comment

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

It looks like you missed some changes to make to hepmc, unless those were simultaneous bugfixes.

Otherwise LGTM

Comment on lines 27 to 28
depends_on('python', when='+python')
depends_on('root', when='+rootio')
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

It looks (from the conflicts removed below) like neither of these should be valid dependencies for hepmc when we split out hepmc3

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

good catch, indeed I removed the variants but overlooked those two lines. Fixed.

@vvolkl
Copy link
Copy Markdown
Contributor Author

vvolkl commented Jun 16, 2020

@becker33 is the build failure is related to my changes or something unrelated?

@becker33
Copy link
Copy Markdown
Member

The build failure is unrelated, apple release a patch for macos that broke one of our tests when it was integrated into github actions (interestingly, the test succeeds when run directly on a macbook with the patch). We're working on fixing that, and in the meantime merging things despite failures of that particular test.

Copy link
Copy Markdown
Member

@becker33 becker33 left a comment

Choose a reason for hiding this comment

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

One last request.

@@ -27,51 +22,14 @@ class Hepmc(CMakePackage):
version('2.06.05', sha256='4c411077cc97522c03b74f973264b8d9fd2b6ccec0efc7ceced2645371c73618')

variant('python', default=False, description='Enable Python bindings')
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think this variant still needs to be deleted.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Can't believe I overlooked that again! Fixed, thanks.

@becker33 becker33 merged commit 03880f5 into spack:develop Jun 17, 2020
@vvolkl vvolkl deleted the split-hepmc branch June 17, 2020 23:19
manifestoso pushed a commit to DeepThoughtHPC/spack that referenced this pull request Jun 19, 2020
@wdconinc wdconinc mentioned this pull request Jul 28, 2020
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.

3 participants