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 release v5.0.1 into develop #2258

Merged
merged 59 commits into from
Oct 24, 2024
Merged
Changes from 3 commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
d00ee2b
:arrow_down: Downgrade psycopg version to support older MacOS versions
jemrobinson Oct 7, 2024
fddefea
Raise exception if unchangable values are changed
JimMadge Oct 16, 2024
01037af
Compare config value, not config object
JimMadge Oct 17, 2024
1839464
Change variable to option
JimMadge Oct 17, 2024
98942dc
Add tests for ensure_config
JimMadge Oct 17, 2024
b16256f
Update docstring and comments
JimMadge Oct 17, 2024
d8163fc
:memo: Update docs for clarity
jemrobinson Oct 7, 2024
056ee31
:bookmark: Bump to version 5.0.1
jemrobinson Oct 17, 2024
5305897
Add Python 3.13 as a requirement
JimMadge Oct 17, 2024
95a2476
:bug: Set PULUMI_PYTHON_CMD to use the same Python executable that is…
jemrobinson Oct 17, 2024
da03fa7
Merge pull request #2240 from alan-turing-institute/2239-set-pulumi-venv
jemrobinson Oct 18, 2024
adedb35
:wrench: Tell Dependabot to ignore updates to psycopg
jemrobinson Oct 18, 2024
d7da700
Use SHM name instead of description for Entra app
craddm Oct 18, 2024
7140ced
Update tests for entra application
craddm Oct 18, 2024
1c42202
Merge pull request #2243 from craddm/use-shm-name-in-entra
JimMadge Oct 21, 2024
fb4148f
Merge remote-tracking branch 'origin/develop' into develop_changes
JimMadge Oct 21, 2024
1f559b0
Rerun pip-compile
JimMadge Oct 21, 2024
649ebf4
Merge pull request #2246 from alan-turing-institute/develop_changes
JimMadge Oct 22, 2024
2e837a9
Merge pull request #2237 from alan-turing-institute/sub_id_change
JimMadge Oct 22, 2024
83d8ef4
Update shm deploy help text
craddm Oct 22, 2024
58cfd84
:bug: Always recreate the Pulumi Service Principal secret when SHM de…
jemrobinson Oct 22, 2024
cbf0d04
:bug: Move existing value checking into the try/except loop
jemrobinson Oct 22, 2024
209c706
reorder data_ingress sections
craddm Oct 23, 2024
26b16b5
Improve DNS delegation feedback
JimMadge Oct 23, 2024
0b3ad31
Tabulate necessary NS records
JimMadge Oct 23, 2024
62864c8
Use an actual list 🤦
JimMadge Oct 23, 2024
213d47b
Fix linting
JimMadge Oct 23, 2024
7ddc304
update management docs
craddm Oct 23, 2024
3f3511d
Fix linting errors
craddm Oct 23, 2024
f4915cb
delete blank line
craddm Oct 23, 2024
d214143
Merge pull request #2253 from alan-turing-institute/domain_setup
JimMadge Oct 23, 2024
5713c14
:loud_sound: Standardise logging
jemrobinson Oct 23, 2024
9fb7541
Update docs/source/management/index.md
craddm Oct 23, 2024
55795da
Update docs/source/management/index.md
craddm Oct 23, 2024
6e6e7e5
Update SECURITY.md
JimMadge Oct 23, 2024
e8eb8de
:bug: Fix rogue closing tags
jemrobinson Oct 23, 2024
fa7122e
Merge pull request #2255 from alan-turing-institute/minor-logging-update
jemrobinson Oct 23, 2024
a1a13f4
Apply many review suggestions
craddm Oct 23, 2024
89961da
Update docs/source/roles/data_provider_representative/data_ingress.md
craddm Oct 23, 2024
3d2ad85
Remove reference to approval/classification of output
craddm Oct 23, 2024
bd92224
Fix typo
craddm Oct 23, 2024
4862382
Switch to more consistent style of highlighting and labelling menu op…
craddm Oct 23, 2024
d5181b1
fix style of some remaining terms
craddm Oct 23, 2024
829a5f2
Apply review suggestions
craddm Oct 24, 2024
a60d55a
More detailed information about tearing down SHM/SRE, and more detail…
craddm Oct 24, 2024
6fb893e
Fix admonition titles
craddm Oct 24, 2024
e3b1b7b
Reword outputs section
craddm Oct 24, 2024
672e141
Merge remote-tracking branch 'upstream/release-v5.0.1rc1' into doc-up…
craddm Oct 24, 2024
5dee1ed
Update docs/source/management/index.md
craddm Oct 24, 2024
04b8d3a
Update docs/source/management/index.md
craddm Oct 24, 2024
440e30d
Update docs/source/management/index.md
craddm Oct 24, 2024
df08f6d
Update docs/source/management/index.md
craddm Oct 24, 2024
bd02f84
Update docs/source/management/index.md
craddm Oct 24, 2024
4c71226
Update docs/source/management/index.md
craddm Oct 24, 2024
f12de89
Update docs/source/management/index.md
craddm Oct 24, 2024
8a2fd5e
Merge pull request #2254 from craddm/doc-updates
craddm Oct 24, 2024
2e915ef
Merge pull request #2251 from alan-turing-institute/release-v5.0.1rc1
JimMadge Oct 24, 2024
c3a4855
Merge remote-tracking branch 'origin/latest' into merge_release
JimMadge Oct 24, 2024
22901cd
Update requirements files
JimMadge Oct 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .hatch/requirements-docs.txt
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ markdown-it-py==3.0.0
# via
# mdit-py-plugins
# myst-parser
markupsafe==3.0.1
markupsafe==3.0.2
# via jinja2
mdit-py-plugins==0.4.2
# via myst-parser
12 changes: 6 additions & 6 deletions .hatch/requirements-lint.txt
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ ansible-core==2.17.5
# ansible-lint
# molecule
# pytest-ansible
ansible-creator==24.10.0
ansible-creator==24.10.1
# via ansible-dev-tools
ansible-dev-environment==24.9.0
# via ansible-dev-tools
@@ -81,7 +81,7 @@ click-help-colors==0.9.4
# via molecule
colorama==0.4.6
# via tox
cryptography==43.0.1
cryptography==43.0.3
# via ansible-core
distlib==0.3.9
# via
@@ -123,7 +123,7 @@ lockfile==0.12.2
# via python-daemon
markdown-it-py==3.0.0
# via rich
markupsafe==3.0.1
markupsafe==3.0.2
# via jinja2
mdurl==0.1.2
# via markdown-it-py
@@ -233,7 +233,7 @@ rpds-py==0.20.0
# referencing
ruamel-yaml==0.18.6
# via ansible-lint
ruamel-yaml-clib==0.2.8
ruamel-yaml-clib==0.2.12
# via ruamel-yaml
ruff==0.6.9
# via hatch.envs.lint
@@ -242,7 +242,7 @@ subprocess-tee==0.4.2
# ansible-compat
# ansible-dev-environment
# ansible-lint
tox==4.21.2
tox==4.23.0
# via tox-ansible
tox-ansible==24.9.0
# via ansible-dev-tools
@@ -267,7 +267,7 @@ tzdata==2024.2
# via ansible-navigator
urllib3==2.2.3
# via types-requests
virtualenv==20.26.6
virtualenv==20.27.0
# via tox
wcmatch==10.0
# via
6 changes: 3 additions & 3 deletions .hatch/requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# This file is autogenerated by hatch-pip-compile with Python 3.12
#
# [constraints] .hatch/requirements.txt (SHA256: 5fcd366dd7384a272955f8ae7546b65d5821df6f7381f315ec51998aee075503)
# [constraints] .hatch/requirements.txt (SHA256: 12cb2eff6268d97a3d9d63d3ec5d670c6f13a571befda8d279cb7ce6ab9f5bb5)
#
# - appdirs==1.4.4
# - azure-core==1.31.0
@@ -24,8 +24,8 @@
# - cryptography==43.0.1
# - fqdn==1.5.1
# - psycopg[binary]==3.1.19
# - pulumi-azure-native==2.64.3
# - pulumi-azuread==5.53.4
# - pulumi-azure-native==2.66.0
# - pulumi-azuread==6.0.0
# - pulumi-random==4.16.6
# - pulumi==3.136.1
# - pydantic==2.9.2
4 changes: 2 additions & 2 deletions .hatch/requirements.txt
Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@
# - cryptography==43.0.1
# - fqdn==1.5.1
# - psycopg[binary]==3.1.19
# - pulumi-azure-native==2.64.3
# - pulumi-azuread==5.53.4
# - pulumi-azure-native==2.66.0
# - pulumi-azuread==6.0.0
# - pulumi-random==4.16.6
# - pulumi==3.136.1
# - pydantic==2.9.2
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -45,8 +45,8 @@ dependencies = [
"cryptography==43.0.1",
"fqdn==1.5.1",
"psycopg[binary]==3.1.19", # needed for installation on older MacOS versions
"pulumi-azure-native==2.64.3",
"pulumi-azuread==5.53.4",
"pulumi-azure-native==2.66.0",
"pulumi-azuread==6.0.0",
"pulumi-random==4.16.6",
"pulumi==3.136.1",
"pydantic==2.9.2",