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

Merge 'latest' into 'develop' #1593

Merged
merged 45 commits into from
Sep 11, 2023
Merged

Conversation

craddm
Copy link
Contributor

@craddm craddm commented Sep 11, 2023

✅ Checklist

  • You have given your pull request a meaningful title (e.g. Enable foobar integration rather than 515 foobar).
  • You are targeting the appropriate branch. If you're not certain which one this is, it should be develop.
  • Your branch is up-to-date with the target branch (it probably was when you started, but it may have changed since then).
  • You have marked this pull request as a draft and added '[WIP]' to the title if needed (if you're not yet ready to merge).
  • You have formatted your code using appropriate automated tools (for example ./tests/AutoFormat_Powershell.ps1 -TargetPath <path to file or directory> for Powershell).

⤴️ Summary

Merges the latest branch into the develop branch. The merge conflicts were too complex to resolve automatically. I performed the merge locally, but cannot push directly to the main repo

🌂 Related issues

🔬 Tests

jemrobinson and others added 30 commits October 24, 2022 11:41
…ute/update-package-resolution

Use pip-compile for package resolution
…ip-tools-executable

Add pip-tools to NON_IMPORTABLE_PACKAGES
Add May 2023 DSG to versioning
…ute/add-may-dsg

Add May 2023 DSG to versioning
…elease-v4.1.0

Release v4.1.0 cloud init changes
Fix deployment issues with MSSQL and PyPi mirrors
@craddm craddm marked this pull request as ready for review September 11, 2023 11:37
Copy link
Member

@jemrobinson jemrobinson left a comment

Choose a reason for hiding this comment

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

LGTM

@jemrobinson jemrobinson merged commit 3f0f501 into alan-turing-institute:develop Sep 11, 2023
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.

4 participants