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.

Sign up for GitHub

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

Jump to bottom

fix install w/ .cylcignore #5066

Merged
merged 4 commits into from
Aug 18, 2022
Merged

fix install w/ .cylcignore #5066

merged 4 commits into from
Aug 18, 2022

Conversation

hjoliver
Copy link
Member

@hjoliver hjoliver commented Aug 14, 2022 •
edited
Loading

A .cylcignore file works as expected if you do cylc install . from within the source dir. But otherwise, this happens:

WorkflowFilesError: No flow.cylc or suite.rc in /home/oliverh/cylc-run/bug/run8

and the install log says:

WARNING - An error occurred when copying files from /home/oliverh/cylc-src/bug to /home/oliverh/cylc-run/bug/run8
WARNING -  Warning: rsync: failed to open exclude file .cylcignore: No such file or directory (2)
    rsync error: error in file IO (code 11) at exclude.c(1207) [client=3.1.2]

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.
  • Tests are included (or explain why tests are not needed).
  • CHANGES.md entry included if this is a change that can affect users
  • No docs needed
  • If this is a bug fix, PRs raised to both master and the relevant maintenance branch.

@hjoliver hjoliver added the bug Something is wrong :( label Aug 14, 2022
@hjoliver hjoliver added this to the cylc-8.0.1 milestone Aug 14, 2022
@hjoliver hjoliver self-assigned this Aug 14, 2022
@hjoliver hjoliver requested a review from datamel August 14, 2022 10:53
@wxtim wxtim requested review from wxtim and removed request for datamel August 15, 2022 07:39
@wxtim wxtim mentioned this pull request Aug 15, 2022
Closed
@wxtim wxtim requested a review from datamel August 15, 2022 07:48
@wxtim
Copy link
Member

wxtim commented Aug 15, 2022

Changelog entry PR https://github.com/hjoliver/cylc-flow/pull/25/files

wxtim
wxtim approved these changes Aug 15, 2022
View reviewed changes
Copy link
Member

@wxtim wxtim left a comment

Choose a reason for hiding this comment

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

This makes sense to me, I've reproduced the bug and confirmed the fix. I've opened a PR agin 8.0.x because this ought to be fixed asap.

@oliver-sanders
Copy link
Member

Bumping this onto the 8.0.x branch.

@oliver-sanders oliver-sanders changed the base branch from master to 8.0.x August 15, 2022 08:26
@oliver-sanders
Copy link
Member

@hjoliver can you rebase onto 8.0.x.

@MetRonnie
Copy link
Member

MetRonnie commented Aug 15, 2022 •
edited
Loading

Is it worth adding a test onto tests/functional/cylc-install/03-file-transfer.t?

@oliver-sanders oliver-sanders modified the milestones: cylc-8.0.1, 8.0.2 Aug 16, 2022
datamel
datamel reviewed Aug 16, 2022
View reviewed changes
Copy link
Contributor

@datamel datamel left a comment

Choose a reason for hiding this comment

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

I have confirmed the problem on master and have checked this out, read the code and it fixes the issue, thanks!
I think, as Ronnie has suggested, a test might be useful to preserve this logic, since it is functionality that isn't ordinarily tested on a day to day basis.
I'll wait until rebase is complete before approving.

@hjoliver
Copy link
Member Author

hjoliver commented Aug 18, 2022 •
edited
Loading

Rebased to 8.0.x ... and functional test added.

MetRonnie
MetRonnie requested changes Aug 18, 2022
View reviewed changes
Copy link
Member

@MetRonnie MetRonnie left a comment

Choose a reason for hiding this comment

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

Consider it approved with the suggested changelog fix

CHANGES.md Outdated Show resolved Hide resolved
@hjoliver
Copy link
Member Author

(Tests all passed before skip-ci update to change log only).

Final sanity check from @datamel should do it.

datamel
datamel approved these changes Aug 18, 2022
View reviewed changes
Copy link
Contributor

@datamel datamel left a comment

Choose a reason for hiding this comment

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

All good!

@datamel datamel merged commit 72311c6 into cylc:8.0.x Aug 18, 2022
@hjoliver hjoliver deleted the fix-.cylcignore branch August 18, 2022 19:58
wxtim added a commit to wxtim/cylc that referenced this pull request Aug 24, 2022
@wxtim
Merge remote-tracking branch 'upstream/8.0.x' into bugfix.c8.reload_p…
5f9072d 
…olling_bug

* upstream/8.0.x:
  fix install w/ .cylcignore (cylc#5066)
  Datastore fix for removed taskdef. (cylc#5067)
  Update PULL_REQUEST_TEMPLATE.md
@hjoliver hjoliver mentioned this pull request Sep 14, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MetRonnie MetRonnie MetRonnie requested changes

@datamel datamel datamel approved these changes

@wxtim wxtim wxtim approved these changes

Assignees

@hjoliver hjoliver

Labels
bug Something is wrong :(
Projects
None yet
Milestone
cylc-8.0.2
Development

Successfully merging this pull request may close these issues.
5 participants
@hjoliver @wxtim @oliver-sanders @MetRonnie @datamel