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

Synchronise with Exscientia fork #31

Merged
merged 16 commits into from
Mar 29, 2023
Merged

Synchronise with Exscientia fork #31

merged 16 commits into from
Mar 29, 2023

Conversation

lohedges
Copy link
Contributor

@lohedges lohedges commented Mar 29, 2023

This PR synchronises the repository with the Exscientia fork. I've needed to manually fix some files since their fork is still based on the old Michellab repository, so some files were more recent due to me backporting updates from here to that repo. (Note that the first 7 commits are me backporting the 2023.1.0 release to michellab, which I have had to undo.)

In future I think that this should be handled as a PR from their side, since the checklist below is a little meaningless if I am filling it on their behalf.

(At present they are still forked from michellab. Their is a GitHub process to transfer a fork, but it seems like their ticket hasn't been dealt with yet. A quicker solution might be for them to delete their existing fork (keeping a local copy), fork the new repository, update their local remote, then re-push all feature branches and tags to the new fork.)

Checklist:

  • I confirm that I have merged the latest version of devel into this branch before issuing this pull request (e.g. by running git pull origin devel): [y]
  • I confirm that I have added a test for any new functionality in this pull request: [y]
  • I confirm that I have added documentation (e.g. a new tutorial page or detailed guide) for any new functionality in this pull request: [y]
  • I confirm that I have permission to release this code under the GPL3 license: [y]

Suggested reviewers:

@chryswoods

@lohedges lohedges added enhancement New feature or request exscientia Related to work with Exscientia labels Mar 29, 2023
@lohedges lohedges requested a review from chryswoods March 29, 2023 14:40
@lohedges
Copy link
Contributor Author

Looks like actions is down at the moment. Hopefully the CI will automatically trigger when it comes back up.

@lohedges lohedges temporarily deployed to biosimspace-build March 29, 2023 14:49 — with GitHub Actions Inactive
@lohedges lohedges temporarily deployed to biosimspace-build March 29, 2023 14:49 — with GitHub Actions Inactive
@lohedges lohedges temporarily deployed to biosimspace-build March 29, 2023 14:49 — with GitHub Actions Inactive
chryswoods
chryswoods previously approved these changes Mar 29, 2023
Copy link
Contributor

@chryswoods chryswoods 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 to go :-)

@lohedges
Copy link
Contributor Author

The usual case of sandpit tests not being guarded against missing packages. I thought I had checked, but apparently not. Will fix and re-run the CI overnight. Just need to update the CHANGELOG tomorrow and make sure tutorials and demos still work as expected.

Almost there.

@lohedges lohedges temporarily deployed to biosimspace-build March 29, 2023 18:38 — with GitHub Actions Inactive
@lohedges lohedges temporarily deployed to biosimspace-build March 29, 2023 18:38 — with GitHub Actions Inactive
@lohedges lohedges temporarily deployed to biosimspace-build March 29, 2023 18:38 — with GitHub Actions Inactive
@lohedges lohedges temporarily deployed to biosimspace-build March 29, 2023 18:38 — with GitHub Actions Inactive
@lohedges lohedges temporarily deployed to biosimspace-build March 29, 2023 18:38 — with GitHub Actions Inactive
@lohedges lohedges temporarily deployed to biosimspace-build March 29, 2023 18:38 — with GitHub Actions Inactive
@lohedges lohedges temporarily deployed to biosimspace-build March 29, 2023 18:38 — with GitHub Actions Inactive
@lohedges lohedges temporarily deployed to biosimspace-build March 29, 2023 18:38 — with GitHub Actions Inactive
@lohedges lohedges temporarily deployed to biosimspace-build March 29, 2023 18:38 — with GitHub Actions Inactive
@lohedges lohedges merged commit 5c833e1 into devel Mar 29, 2023
@lohedges lohedges deleted the sync_exscientia branch March 29, 2023 19:33
lohedges pushed a commit that referenced this pull request Dec 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request exscientia Related to work with Exscientia
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants