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

Bump cylc-flow dependency #173

Merged
merged 1 commit into from
Aug 31, 2022
Merged

Bump cylc-flow dependency #173

merged 1 commit into from
Aug 31, 2022

Conversation

MetRonnie
Copy link
Member

I think the reason the cylc-doc GH Actions is failing to install the libraries is the conflicting dependencies

# cylc-uiserver
cylc-flow==8.1.*
# cylc-rose
cylc-flow==8.0.*

I have updated the dependency on cylc-flow to 8.1.* here, to match cylc-uiserver.

Strictly speaking this should be on the 1.2.0 milestone rather than 1.1.1. Perhaps we should create a 1.1.x branch like we've got in cylc-flow for the maintenance releases?

Requirements 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 setup.cfg.
  • Does not need tests
  • No change log entry required (invisible to users).
  • No documentation update required.

@MetRonnie MetRonnie self-assigned this Aug 31, 2022
@oliver-sanders
Copy link
Member

The cylc-admin issue checkbox for this was ticked but this hadn't been completed?

@oliver-sanders oliver-sanders added this to the 1.2.0 milestone Aug 31, 2022
@oliver-sanders
Copy link
Member

Perhaps we should create a 1.1.x branch like we've got in cylc-flow for the maintenance releases?

I think go ahead and commit the cylc-flow version changes to master. We can create a ?.?.x branch, either automatically as part of the release, or manually if we need to make a bugfix release laster.

Just this once it'll probably be easier to get these two merged and release 1.1.1 first - https://github.com/cylc/cylc-rose/pulls?q=is%3Aopen+is%3Apr+milestone%3A1.1.1

@MetRonnie
Copy link
Member Author

The cylc-admin issue checkbox for this was ticked but this hadn't been completed?

... pin downstream components to the next cylc-flow dev release.

A bit ambiguous as there are 2 cylc-flow releases in development...

@MetRonnie MetRonnie merged commit 7b7ba35 into cylc:master Aug 31, 2022
@MetRonnie MetRonnie deleted the dev branch August 31, 2022 14:05
@oliver-sanders
Copy link
Member

oliver-sanders commented Aug 31, 2022 •
edited
Loading

A bit ambiguous as there are 2 cylc-flow releases in development...

Err, there is a specific checkbox for each, this was 8.0.0 so it was the only one:

cylc-rose (pin to latest cylc-flow)

@oliver-sanders
Copy link
Member

This has been merged before the 1.1.1 PRs so we will now need to create a 1.1.x branch and rebase those PRs onto it.

oliver-sanders added a commit that referenced this pull request Aug 31, 2022
@oliver-sanders
Revert "Bump cylc-flow dependency (#173)"
17df3d7 
This reverts commit 7b7ba35.
@oliver-sanders
Copy link
Member

We've got 1.1.1 PRs merged before and after so reverting to allow us to merge the last 1.1.1 PR and release.

@MetRonnie
Copy link
Member Author

A bit ambiguous as there are 2 cylc-flow releases in development...

Err, there is a specific checkbox for each, this was 8.0.0 so it was the only one:

cylc-rose (pin to latest cylc-flow)

The cylc-flow version was bumped to 8.0.1.dev immediately after the 8.0.0 release, which meant the pin cylc-flow==8.0.* was still valid here at the time.

This has been merged before the 1.1.1 PRs so we will now need to create a 1.1.x branch and rebase those PRs onto it.

Can't we just start a 1.1.x branch off 0e7a5a9 and cherry pick 7627b69 (merged just after this, bad timing) onto it?

image

@oliver-sanders
Copy link
Member

The cylc-flow version was bumped to 8.0.1.dev immediately after the 8.0.0 release, which meant the pin cylc-flow==8.0.* was still valid here at the time.

Not sure I understand, could you change the "cylc-rose (pin to latest cylc-flow)" line to preference.

@MetRonnie MetRonnie mentioned this pull request Aug 31, 2022
Merged
wxtim pushed a commit to wxtim/cylc-rose that referenced this pull request Nov 25, 2022
@MetRonnie @wxtim
Bump cylc-flow dependency (cylc#173)
0807f58
wxtim added a commit to wxtim/cylc-rose that referenced this pull request Nov 25, 2022
@wxtim
Merge branch 'master' of github.com:cylc/cylc-rose into further_incre…
317a9c0 
…mental_improvements_to_testing

* 'master' of github.com:cylc/cylc-rose:
  Remove subprocess from tests (cylc#194)
  update stem - install interface (cylc#193)
  Update tests/unit/test_rose_stem_units.py
  response to review
  Update setup.cfg
  removed never used option
  Improve test coverage for Rose Stem
  reinstall changes to `rose-suite.conf` [tests] (cylc#178)
  Changed the rose stem functional tests to a more pytest-integration style.
  Bump rose dependency to `2.1.*`
  Bump dev version on master to next minor release (cylc#175)
  Fix changelog conflict with 1.1.x (cylc#186)
  Prepare release: 1.1.1 (cylc#183)
  Rose Stem Fixes (cylc#172)
  Don't pass rose variables with state ! or !! to Cylc. (cylc#171)
  Don't pass rose variables with state ! or !! to Cylc. (cylc#171)
  Bump cylc-flow dependency (cylc#173)
  functional tests only cleanup if succeeded
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oliver-sanders oliver-sanders oliver-sanders approved these changes

Assignees

@MetRonnie MetRonnie

Labels
dependencies small
Projects
None yet
Milestone
1.2.0
Development

Successfully merging this pull request may close these issues.
2 participants
@MetRonnie @oliver-sanders