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

pythia8: patch latest 8.311 for upstream bug #43803

Open
wants to merge 9 commits into
base: develop
Choose a base branch
from

Conversation

wdconinc
Copy link
Contributor

@wdconinc wdconinc commented Apr 24, 2024

Something is not right with pythia8-8.311, and it took some more extensive usage testing to figure it out. In contrast to 8.310, the line CFG_FILE=examples/Makefile.inc in pythia8-config is not replaced by the configure script, resulting in pythia8-config --cxxflags failing with Error: cannot find valid configuration for Pythia 8. Initial investigation of this issue does not point to anything specific. Because https://gitlab.com/Pythia8/releases/ is only updated with releases, it is hard to run a bisect for when this started.

This PR fixes all versions for a sed n that limited replacement to even lines only.

@wdconinc
Copy link
Contributor Author

@spackbot fix style

Copy link

spackbot-app bot commented Apr 24, 2024

Let me see if I can fix that for you!

Copy link

spackbot-app bot commented Apr 24, 2024

I was able to run spack style --fix for you!

spack style --fix
==> Running style checks on spack
  selected: isort, black, flake8, mypy
==> Modified files
  var/spack/repos/builtin/packages/pythia8/package.py
==> Running isort checks
  isort checks were clean
==> Running black checks
reformatted var/spack/repos/builtin/packages/pythia8/package.py
All done! ✨ 🍰 ✨
1 file reformatted.
  black checks were clean
==> Running flake8 checks
  flake8 checks were clean
==> Running mypy checks
lib/spack/spack/version/version_types.py:145: error: Argument 2 to "StandardVersion" has incompatible type "*Tuple[Tuple[Any, ...], Tuple[Any, ...]]"; expected "Tuple[Tuple[Any, ...], Tuple[Any, ...]]"  [arg-type]
lib/spack/spack/version/version_types.py:452: error: Argument 2 to "StandardVersion" has incompatible type "*Tuple[Tuple[Any, ...], Tuple[Any, ...]]"; expected "Tuple[Tuple[Any, ...], Tuple[Any, ...]]"  [arg-type]
lib/spack/spack/version/version_types.py:481: error: Argument 2 to "StandardVersion" has incompatible type "*Tuple[Tuple[Any, ...], Tuple[Any, ...]]"; expected "Tuple[Tuple[Any, ...], Tuple[Any, ...]]"  [arg-type]
Found 3 errors in 1 file (checked 621 source files)
  mypy found errors
Keep in mind that I cannot fix your flake8 or mypy errors, so if you have any you'll need to fix them and update the pull request. If I was able to push to your branch, if you make further changes you will need to pull from your updated branch before pushing again.

I've updated the branch with style fixes.

@wdconinc
Copy link
Contributor Author

@wdconinc
Copy link
Contributor Author

@spackbot fix style

Copy link

spackbot-app bot commented Apr 26, 2024

Let me see if I can fix that for you!

Copy link

spackbot-app bot commented Apr 26, 2024

I was able to run spack style --fix for you!

spack style --fix
==> Running style checks on spack
  selected: isort, black, flake8, mypy
==> Modified files
  var/spack/repos/builtin/packages/pythia8/package.py
==> Running isort checks
  isort checks were clean
==> Running black checks
reformatted var/spack/repos/builtin/packages/pythia8/package.py
All done! ✨ 🍰 ✨
1 file reformatted.
  black checks were clean
==> Running flake8 checks
var/spack/repos/builtin/packages/pythia8/package.py:121: [W605] invalid escape sequence '\|'
  flake8 found errors
==> Running mypy checks
lib/spack/spack/version/version_types.py:145: error: Argument 2 to "StandardVersion" has incompatible type "*Tuple[Tuple[Any, ...], Tuple[Any, ...]]"; expected "Tuple[Tuple[Any, ...], Tuple[Any, ...]]"  [arg-type]
lib/spack/spack/version/version_types.py:452: error: Argument 2 to "StandardVersion" has incompatible type "*Tuple[Tuple[Any, ...], Tuple[Any, ...]]"; expected "Tuple[Tuple[Any, ...], Tuple[Any, ...]]"  [arg-type]
lib/spack/spack/version/version_types.py:481: error: Argument 2 to "StandardVersion" has incompatible type "*Tuple[Tuple[Any, ...], Tuple[Any, ...]]"; expected "Tuple[Tuple[Any, ...], Tuple[Any, ...]]"  [arg-type]
Found 3 errors in 1 file (checked 621 source files)
  mypy found errors
Keep in mind that I cannot fix your flake8 or mypy errors, so if you have any you'll need to fix them and update the pull request. If I was able to push to your branch, if you make further changes you will need to pull from your updated branch before pushing again.

I've updated the branch with style fixes.

@wdconinc wdconinc changed the title pythia8: prefer 8.310 pythia8: patch latest 8.311 for upstream bug Apr 26, 2024
@wdconinc
Copy link
Contributor Author

wdconinc commented May 4, 2024

Sorry, messed up the rebase there for a bit. This now compiles correctly and without complaints on audit. @ChristianTackeGSI Can you take a look for review please?

Copy link
Contributor

@jmcarcell jmcarcell left a comment

Choose a reason for hiding this comment

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

Tested and works.

@wdconinc wdconinc force-pushed the packages/pythia-8.310-preferred branch from 4cfbc2c to 6e5ddb4 Compare May 10, 2024 13:04
@wdconinc
Copy link
Contributor Author

@ChristianTackeGSI Can you give this another review?

@wdconinc wdconinc enabled auto-merge (squash) May 10, 2024 13:36
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.

None yet

2 participants