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

add share/lib/python and share/bin to PYTHONPATH & PATH #5525

Merged

Conversation

wxtim
Copy link
Member

@wxtim wxtim commented May 9, 2023

Closes #5396

Check List

  • I have read CONTRIBUTING.md and added my name as a Code Contributor.
  • Contains logically grouped changes (else tidy your branch by rebase).
  • Does not contain off-topic changes (use other PRs for other changes).
  • Applied any dependency changes to both setup.cfg (and conda-environment.yml if present).
  • Tests are included (or explain why tests are not needed).
  • CHANGES.md entry included if this is a change that can affect users
  • Cylc-Doc pull request opened if required at include a description of WORKFLOW_SHARE_DIR/bin and lib/python cylc-doc#609.
  • If this is a bug fix, PR should be raised against the relevant ?.?.x branch.

@wxtim wxtim requested review from MetRonnie and hjoliver May 9, 2023 13:54
@wxtim wxtim self-assigned this May 9, 2023
@wxtim wxtim added this to the cylc-8.2.0 milestone May 9, 2023
@wxtim wxtim force-pushed the feature.support_share/bin_and_share/lib branch from bbae847 to 7a3512a Compare May 9, 2023 13:57
Copy link
Member

@hjoliver hjoliver left a comment

Choose a reason for hiding this comment

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

Looks good. One trivial spelling fix suggested.

tests/functional/jobscript/01-share-lib-bin/flow.cylc Outdated Show resolved Hide resolved

cat > "${CYLC_WORKFLOW_SHARE_DIR}/bin/myscript.sh" <<__HERE__
#!/usr/bin/bash
echo "A sure cure for seasickness is to sit under a tree."
Copy link
Member

Choose a reason for hiding this comment

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

Or is it?

_88932705_20302

Copy link
Member Author

@wxtim wxtim May 11, 2023

Choose a reason for hiding this comment

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

I feel that one large wave might cure seasickness (and all other illnesses) in a rather permanent way for sailors on that.

(P.S. It's a Spike Milligan quote - I'm running through all the SFW (It's a smallish list) SM quotes I can find for tests today)

Copy link
Member

Choose a reason for hiding this comment

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

@hjoliver that is an insanely niche reference.

Copy link
Member

Choose a reason for hiding this comment

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

@hjoliver
Copy link
Member

hjoliver commented May 9, 2023

Functional test failure is for cylc clean so I expect the test needs tweaking for the new dirs.

Make the bin and share dirs

fix remote clean test

Update tests/functional/jobscript/01-share-lib-bin/flow.cylc

Co-authored-by: Hilary James Oliver <hilary.j.oliver@gmail.com>
@wxtim wxtim force-pushed the feature.support_share/bin_and_share/lib branch from 17a3503 to 838d40d Compare May 11, 2023 07:42
@wxtim
Copy link
Member Author

wxtim commented May 11, 2023

Functional test failure is for cylc clean so I expect the test needs tweaking for the new dirs.

I was working on my home PC at that point and couldn't test my fix locally - apparently my ability to imitate the output of tree manually isn't perfect...

CHANGES.md Outdated Show resolved Hide resolved
cylc/flow/etc/job.sh Outdated Show resolved Hide resolved
tests/functional/jobscript/01-share-lib-bin.t Outdated Show resolved Hide resolved
wxtim and others added 3 commits May 11, 2023 19:11
Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
@wxtim wxtim requested a review from MetRonnie May 12, 2023 07:58
Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
@wxtim wxtim requested a review from oliver-sanders May 12, 2023 13:20
@oliver-sanders oliver-sanders merged commit 08ab96c into cylc:master May 15, 2023
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

share lib/ and bin/ directories
4 participants