Merge development updates into 5.0.1rc1 release branch

alan-turing-institute / data-safe-haven

https://data-safe-haven.readthedocs.io

BSD 3-Clause "New" or "Revised" License

61 stars 15 forks source link

Merge development updates into 5.0.1rc1 release branch #2241

Closed JimMadge closed 1 month ago

JimMadge commented 1 month ago

:white_check_mark: 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).

:vertical_traffic_light: Depends on

:arrow_heading_up: Summary

:closed_umbrella: Related issues

:microscope: Tests

JimMadge commented 1 month ago

I would guess it is the psycopg downgrade that is causing a conflict here.

jemrobinson commented 1 month ago

Are you sure this is a good idea? We need to make sure that rc1 is tested and produces a deployment that actually works. The current branch I think meets these requirements.

JimMadge commented 1 month ago

Are you sure this is a good idea? We need to make sure that rc1 is tested and produces a deployment that actually works. The current branch I think meets these requirements.

Probably 😅. I don't think it is really a rc, it is a pointer to where a team are currently testing. The milestone isn't finished yet and work towards that is still going on on develop.

craddm commented 1 month ago

I agree with Jim; this rc1 felt more like laying down a marker for where we were at when TRESA were starting testing rather than a genuine release candidate

JimMadge commented 1 month ago

Closing due to merge conflicts on develop, I'll do the merge on a new branch and open a PR from that.