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 develop changes in 5.0.1rc1 #2246

Merged
merged 51 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
c59dc04
Catch validation errors on config upload
craddm Sep 27, 2024
1178622
Provide more readable error message for config validation errors
craddm Sep 27, 2024
25096d9
Merge branch 'alan-turing-institute:develop' into config-upload-errors
craddm Sep 30, 2024
1f89c0a
Fix linting
craddm Sep 30, 2024
d498e07
Update desktop icon URLs for shared, input, and output drives
craddm Oct 7, 2024
a249069
Merge branch 'alan-turing-institute:develop' into icon-paths
craddm Oct 7, 2024
c5ce29f
Remove desktop files for gitea/hedgedoc
JimMadge Oct 7, 2024
a88a5d8
Merge remote-tracking branch 'upstream/develop' into config-upload-er…
craddm Oct 7, 2024
f275f5d
Merge pull request #2227 from craddm/icon-paths
JimMadge Oct 7, 2024
ae63b04
Add fixture for config with missing field
craddm Oct 7, 2024
b2bf1ff
add test for error from missing config field
craddm Oct 7, 2024
dbdb22c
make working test of validation error
craddm Oct 7, 2024
877c41a
Add test of log messages from config validation errors
craddm Oct 8, 2024
c67912e
lint:fmt
craddm Oct 8, 2024
a1ad35a
Use replace method to create config with missing field
craddm Oct 8, 2024
0aad910
Merge remote-tracking branch 'upstream/develop' into config-upload-er…
craddm Oct 8, 2024
35736db
Add list of supported SRE regions
JimMadge Oct 8, 2024
11817fb
Add lychee exception
JimMadge Oct 8, 2024
934ec49
Correct removal of text from example SRE config
craddm Oct 8, 2024
567d30e
Merge pull request #2211 from craddm/config-upload-errors
JimMadge Oct 8, 2024
5835a3c
Add strip ansi method
JimMadge Oct 8, 2024
fdb6da3
Add test
JimMadge Oct 8, 2024
1f3e751
Add test for alternative escape char formats
JimMadge Oct 8, 2024
42d46c1
Correct indentation
JimMadge Oct 8, 2024
2b9c619
Merge pull request #2230 from alan-turing-institute/supported_regions
JimMadge Oct 9, 2024
0f9d353
Merge pull request #2226 from alan-turing-institute/duplicate_desktop…
JimMadge Oct 9, 2024
eede40f
Merge pull request #2231 from alan-turing-institute/ansi_logfile
JimMadge Oct 9, 2024
96223c8
User simpler of checking if SRE is deployed
craddm Oct 9, 2024
c2782f8
Add option for 'internet' in place of IP
JimMadge Oct 10, 2024
4f506b2
Add tests for IP validator
JimMadge Oct 10, 2024
01b1c14
Change user addresses to list or service tag
JimMadge Oct 10, 2024
0b05ebc
Add comma
JimMadge Oct 10, 2024
705488e
Handle ip list or service tag in component resource
JimMadge Oct 10, 2024
3d519e3
Merge branch 'alan-turing-institute:develop' into simplify-available
craddm Oct 11, 2024
507081a
Add documentation of the command to management page
craddm Oct 11, 2024
5927b6f
Fix linting
craddm Oct 11, 2024
c1ad179
fix more linting
craddm Oct 11, 2024
9dc9bc3
Bump the production-dependencies group with 10 updates
dependabot[bot] Oct 14, 2024
cf74c77
[dependabot skip] :wrench: Update Python requirements files
dependabot[bot] Oct 14, 2024
e8d112d
Bump lycheeverse/lychee-action from 1.10.0 to 2.0.1
dependabot[bot] Oct 14, 2024
e101078
Merge pull request #2236 from alan-turing-institute/dependabot/github…
JimMadge Oct 14, 2024
acb2fcf
Add tests for Internet tag for user IPs
JimMadge Oct 15, 2024
41c4d5b
Merge pull request #2235 from alan-turing-institute/dependabot/pip/pr…
JimMadge Oct 15, 2024
2b996da
Merge remote-tracking branch 'origin/develop' into internet
JimMadge Oct 15, 2024
5068e5a
Fix linting
JimMadge Oct 15, 2024
ea23e1b
Merge pull request #2234 from craddm/simplify-available
craddm Oct 15, 2024
727f43d
Merge pull request #2233 from alan-turing-institute/internet
JimMadge Oct 16, 2024
6c32cb4
Bump lycheeverse/lychee-action from 2.0.1 to 2.0.2
dependabot[bot] Oct 21, 2024
d56249d
Merge pull request #2245 from alan-turing-institute/dependabot/github…
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
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 .github/workflows/build_documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
run: hatch run docs:build

- name: Link Checker
uses: lycheeverse/lychee-action@v1.10.0
uses: lycheeverse/lychee-action@v2.0.2
with:
args: --config='./.lychee.toml' --no-progress './docs/build/html/**/*.html'
fail: true # fail on broken links
2 changes: 1 addition & 1 deletion .github/workflows/test_code.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
shell: bash
run: npm install -g markdown-link-check
- name: Link Checker
uses: lycheeverse/lychee-action@v1.10.0
uses: lycheeverse/lychee-action@v2.0.2
with:
args: --config='./.lychee.toml' --no-progress --offline '**/*.md' --exclude-path './docs'
fail: true # fail on broken links
8 changes: 4 additions & 4 deletions .hatch/requirements-docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# - myst-parser==4.0.0
# - pydata-sphinx-theme==0.15.4
# - sphinx-togglebutton==0.3.2
# - sphinx==8.0.2
# - sphinx==8.1.3
#

accessible-pygments==0.0.5
Expand All @@ -20,7 +20,7 @@ beautifulsoup4==4.12.3
# via pydata-sphinx-theme
certifi==2024.8.30
# via requests
charset-normalizer==3.3.2
charset-normalizer==3.4.0
# via requests
docutils==0.21.2
# via
Expand All @@ -42,7 +42,7 @@ markdown-it-py==3.0.0
# via
# mdit-py-plugins
# myst-parser
markupsafe==2.1.5
markupsafe==3.0.2
# via jinja2
mdit-py-plugins==0.4.2
# via myst-parser
Expand All @@ -69,7 +69,7 @@ snowballstemmer==2.2.0
# via sphinx
soupsieve==2.6
# via beautifulsoup4
sphinx==8.0.2
sphinx==8.1.3
# via
# hatch.envs.docs
# myst-parser
Expand Down
30 changes: 15 additions & 15 deletions .hatch/requirements-lint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# This file is autogenerated by hatch-pip-compile with Python 3.12
#
# - ansible-dev-tools==24.9.0
# - ansible==10.4.0
# - black==24.8.0
# - ansible==10.5.0
# - black==24.10.0
# - mypy==1.11.2
# - pandas-stubs==2.2.2.240909
# - pandas-stubs==2.2.3.241009
# - pydantic==2.9.2
# - ruff==0.6.9
# - types-appdirs==1.4.3.5
Expand All @@ -17,7 +17,7 @@

annotated-types==0.7.0
# via pydantic
ansible==10.4.0
ansible==10.5.0
# via hatch.envs.lint
ansible-builder==3.1.0
# via
Expand All @@ -29,14 +29,14 @@ ansible-compat==24.9.1
# ansible-lint
# molecule
# pytest-ansible
ansible-core==2.17.4
ansible-core==2.17.5
# via
# ansible
# ansible-compat
# ansible-lint
# molecule
# pytest-ansible
ansible-creator==24.9.0
ansible-creator==24.10.1
# via ansible-dev-tools
ansible-dev-environment==24.9.0
# via ansible-dev-tools
Expand All @@ -58,7 +58,7 @@ attrs==24.2.0
# referencing
bindep==2.11.0
# via ansible-builder
black==24.8.0
black==24.10.0
# via
# hatch.envs.lint
# ansible-lint
Expand All @@ -81,9 +81,9 @@ 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.8
distlib==0.3.9
# via
# ansible-sign
# virtualenv
Expand Down Expand Up @@ -117,13 +117,13 @@ jsonschema==4.23.0
# ansible-lint
# ansible-navigator
# molecule
jsonschema-specifications==2023.12.1
jsonschema-specifications==2024.10.1
# via jsonschema
lockfile==0.12.2
# via python-daemon
markdown-it-py==3.0.0
# via rich
markupsafe==2.1.5
markupsafe==3.0.2
# via jinja2
mdurl==0.1.2
# via markdown-it-py
Expand Down Expand Up @@ -153,7 +153,7 @@ packaging==24.1
# pytest
# pytest-ansible
# tox
pandas-stubs==2.2.2.240909
pandas-stubs==2.2.3.241009
# via hatch.envs.lint
parsley==1.3
# via bindep
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
35 changes: 17 additions & 18 deletions .hatch/requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#
# This file is autogenerated by hatch-pip-compile with Python 3.12
#
# [constraints] .hatch/requirements.txt (SHA256: f892a9714607641735b83f480e2c234b2ab8e1dffd2d59ad4188c887c06b24de)
# [constraints] .hatch/requirements.txt (SHA256: 12cb2eff6268d97a3d9d63d3ec5d670c6f13a571befda8d279cb7ce6ab9f5bb5)
#
# - appdirs==1.4.4
# - azure-core==1.31.0
# - azure-identity==1.18.0
# - azure-identity==1.19.0
# - azure-keyvault-certificates==4.8.0
# - azure-keyvault-keys==4.9.0
# - azure-keyvault-secrets==4.8.0
Expand All @@ -19,15 +19,15 @@
# - azure-mgmt-storage==21.2.1
# - azure-storage-blob==12.23.1
# - azure-storage-file-datalake==12.17.0
# - azure-storage-file-share==12.18.0
# - azure-storage-file-share==12.19.0
# - chevron==0.14.0
# - 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.135.1
# - pulumi==3.136.1
# - pydantic==2.9.2
# - pyjwt[crypto]==2.9.0
# - pytz==2024.2
Expand All @@ -36,7 +36,7 @@
# - simple-acme-dns==3.1.0
# - typer==0.12.5
# - websocket-client==1.8.0
# - coverage==7.6.1
# - coverage==7.6.3
# - freezegun==1.5.1
# - pytest-mock==3.14.0
# - pytest==8.3.3
Expand Down Expand Up @@ -87,7 +87,7 @@ azure-core==1.31.0
# azure-storage-file-datalake
# azure-storage-file-share
# msrest
azure-identity==1.18.0
azure-identity==1.19.0
# via
# -c .hatch/requirements.txt
# hatch.envs.test
Expand Down Expand Up @@ -155,7 +155,7 @@ azure-storage-file-datalake==12.17.0
# via
# -c .hatch/requirements.txt
# hatch.envs.test
azure-storage-file-share==12.18.0
azure-storage-file-share==12.19.0
# via
# -c .hatch/requirements.txt
# hatch.envs.test
Expand All @@ -168,7 +168,7 @@ cffi==1.17.1
# via
# -c .hatch/requirements.txt
# cryptography
charset-normalizer==3.3.2
charset-normalizer==3.4.0
# via
# -c .hatch/requirements.txt
# requests
Expand All @@ -180,7 +180,7 @@ click==8.1.7
# via
# -c .hatch/requirements.txt
# typer
coverage==7.6.1
coverage==7.6.3
# via hatch.envs.test
cryptography==43.0.1
# via
Expand All @@ -195,7 +195,7 @@ cryptography==43.0.1
# msal
# pyjwt
# pyopenssl
debugpy==1.8.6
debugpy==1.8.7
# via
# -c .hatch/requirements.txt
# pulumi
Expand All @@ -213,7 +213,7 @@ fqdn==1.5.1
# hatch.envs.test
freezegun==1.5.1
# via hatch.envs.test
grpcio==1.60.2
grpcio==1.66.2
# via
# -c .hatch/requirements.txt
# pulumi
Expand All @@ -223,7 +223,7 @@ idna==3.10
# requests
iniconfig==2.0.0
# via pytest
isodate==0.6.1
isodate==0.7.2
# via
# -c .hatch/requirements.txt
# azure-keyvault-certificates
Expand Down Expand Up @@ -295,18 +295,18 @@ psycopg-binary==3.1.19
# via
# -c .hatch/requirements.txt
# psycopg
pulumi==3.135.1
pulumi==3.136.1
# via
# -c .hatch/requirements.txt
# hatch.envs.test
# pulumi-azure-native
# pulumi-azuread
# pulumi-random
pulumi-azure-native==2.64.3
pulumi-azure-native==2.66.0
# via
# -c .hatch/requirements.txt
# hatch.envs.test
pulumi-azuread==5.53.4
pulumi-azuread==6.0.0
JimMadge marked this conversation as resolved.
Show resolved Hide resolved
# via
# -c .hatch/requirements.txt
# hatch.envs.test
Expand Down Expand Up @@ -402,7 +402,6 @@ six==1.16.0
# via
# -c .hatch/requirements.txt
# azure-core
# isodate
# pulumi
# python-dateutil
typer==0.12.5
Expand Down
Loading
Loading