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

Main #131

Merged
merged 4 commits into from
Apr 28, 2023
Merged

Main #131

merged 4 commits into from
Apr 28, 2023

Conversation

cqc-melf
Copy link
Collaborator

No description provided.

@cqc-melf cqc-melf requested a review from cqc-alec April 27, 2023 17:14
@cqc-melf cqc-melf marked this pull request as ready for review April 27, 2023 17:14
@cqc-melf cqc-melf requested a review from yao-cqc as a code owner April 27, 2023 17:14
Copy link
Collaborator

@cqc-alec cqc-alec left a comment

Choose a reason for hiding this comment

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

I guess we shouldn't merge this, since we didn't do the release and tests are failing.

@cqc-melf
Copy link
Collaborator Author

The check only failed because of an issues with the backend. Should be fine after rerunning.
I think we should merge this PR or revert the commits on main to avoid conflicts with the next release.

@cqc-alec
Copy link
Collaborator

The check only failed because of an issues with the backend. Should be fine after rerunning. I think we should merge this PR or revert the commits on main to avoid conflicts with the next release.

I thought the reason we weren't releasing was because MaxNClRegPredicate isn't in pytket 1.14? If that is the case I don't get how the tests are passing?

(I don't think there should be any merge conflicts if we keep the same release branch for the next merge.)

@cqc-melf
Copy link
Collaborator Author

The ci is always using the latest pytket release which picks the 1.15. RC, which includes the missing predicate.

The question is if we want to have a dependency on an pytket rc version? Which is something we should not do from my understanding.

@cqc-melf
Copy link
Collaborator Author

The tests are all fine now

@cqc-melf cqc-melf requested a review from cqc-alec April 28, 2023 07:21
@cqc-melf
Copy link
Collaborator Author

If we are doing new changes to for example the changelog on develop we will have conflicts on the release branch as well when we are updating it with the new changes. I think we should merge this or do a revert on main.

@cqc-alec
Copy link
Collaborator

The ci is always using the latest pytket release which picks the 1.15. RC, which includes the missing predicate.

Oh yes I forgot that the CI picks up the latest pre-release!

The question is if we want to have a dependency on an pytket rc version? Which is something we should not do from my understanding.

No we shouldn't -- so we should hold back on the release.

@cqc-alec
Copy link
Collaborator

If we are doing new changes to for example the changelog on develop we will have conflicts on the release branch as well when we are updating it with the new changes. I think we should merge this or do a revert on main.

OK, but then after merging we should revert the changes from the release branch.

@cqc-melf cqc-melf merged commit 4505770 into develop Apr 28, 2023
@cqc-melf
Copy link
Collaborator Author

If we are doing new changes to for example the changelog on develop we will have conflicts on the release branch as well when we are updating it with the new changes. I think we should merge this or do a revert on main.

OK, but then after merging we should revert the changes from the release branch.

Sounds good, I will do that

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.

2 participants