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

stop using modextrapaths to update $PYTHONPATH with standard path to installed Python packages (lib/python%(pyshortver)s/site-packages) #20960

Merged
merged 9 commits into from
Oct 7, 2024

Conversation

Micket
Copy link
Contributor

@Micket Micket commented Jul 3, 2024

All the trivial cases cleaned up here. Some others i could potentially partly clean up, which uses a mix of several PYTHONPATH (standard + nonstandard location, Spark is an example of such an easyconfig).

Should of course not be merged until the corresponding framework PR is merged.

@Micket Micket added the EasyBuild-5.0 EasyBuild 5.0 label Jul 3, 2024
@Micket Micket added this to the 5.0 milestone Jul 3, 2024
@Flamefire
Copy link
Contributor

That reminds me of an old PR of mine: #13385

However all but 1 of the ECs are now deprecated and that one is fixed here. However there was also an enhancement to CI which I extracted to #20963

And a regexp I used which you might try in your tree: grep -E ": 'lib/python[^/]+/site-packages'" $(grep --files-with-matches -Er "\\beasyblock = '(ConfigureMakePythonPackage|PythonBundle)'")

@Flamefire
Copy link
Contributor

@boegel boegel changed the title Drop manually specified default PYTHONPATH's stop using modextrapaths to update $PYTHONPATH with standard path to installed Python packages (lib/python*/site-packages) Oct 1, 2024
@boegel boegel changed the title stop using modextrapaths to update $PYTHONPATH with standard path to installed Python packages (lib/python*/site-packages) stop using modextrapaths to update $PYTHONPATH with standard path to installed Python packages (lib/python%(pyshortver)s/site-packages) Oct 1, 2024
modextrapaths = ec.get('modextrapaths', {})
regex = re.compile(r'^lib*/python[0-9]\.[0-9]+/site-packages$')
for key, value in modextrapaths.items():
value = resolve_template(value, ec.template_values)
Copy link
Contributor

Choose a reason for hiding this comment

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

ec.get has a resolve parameter defaulting to True, so it seems the value is already resolved at this point, isn't it?

If it was indeed required I'd suggest putting it below the check to avoid resolving every value without using almost any

Copy link
Member

Choose a reason for hiding this comment

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

Ah, maybe, I didn't actually verify that tbh... Will check

@boegel
Copy link
Member

boegel commented Oct 6, 2024

Test report by @boegel
FAILED
Build succeeded for 207 out of 209 (201 easyconfigs in total)
node3573.doduo.os - Linux RHEL 8.8, x86_64, AMD EPYC 7552 48-Core Processor, Python 3.6.8
See https://gist.github.com/boegel/7aa02cde418f967a759fb7895d895a0d for a full test report.

@boegel
Copy link
Member

boegel commented Oct 7, 2024

The two failures have nothing to do the changes being made here:

For BUSCO-5.4.5-foss-2022a.eb:

024-10-06 23:52:05 ERROR:	A run with the name /arcanine/scratch/gent/vo/000/gvo00002/vsc40023/easybuild_tests/RHEL8-eb5dev-rpath/zen2-ib/software/BUSCO/5.4.5-foss-2022a/test_eukaryota.out already exists...
	If you are sure you wish to overwrite existing files, please use the -f (force) option
2024-10-06 23:52:05 ERROR:	BUSCO analysis failed!

For FunGAP-1.1.1-foss-2022a.eb:

Missing modules for dependencies (use --robot?): BUSCO/5.4.5-foss-2022a

So it won't let it block this PR...

@boegel
Copy link
Member

boegel commented Oct 7, 2024

Going in, thanks @Micket!

@boegel boegel merged commit 519d8c8 into easybuilders:5.0.x Oct 7, 2024
7 checks passed
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.

3 participants