Skip to content

Commit

Permalink
Merge branch 'alan-turing-institute:develop' into gitea_external_mirror
Browse files Browse the repository at this point in the history
  • Loading branch information
craddm authored Oct 11, 2024
2 parents 36a8cd6 + eede40f commit 53c88a7
Show file tree
Hide file tree
Showing 72 changed files with 1,167 additions and 677 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,15 @@
"bug",
"doc"
]
},
{
"login": "mattwestby",
"name": "mattwestby",
"avatar_url": "https://avatars.githubusercontent.com/u/91054185?v=4",
"profile": "https://github.com/mattwestby",
"contributions": [
"bug"
]
}
],
"contributorsSortAlphabetically": true,
Expand Down
9 changes: 2 additions & 7 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ RUN apt-get update \
&& export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends \
git \
libssl-dev \
python3-sphinx
libssl-dev

# Install Azure-CLI
RUN apt-get update \
Expand All @@ -22,7 +21,7 @@ RUN mkdir -p /etc/apt/keyrings \
&& chmod go+r /etc/apt/keyrings/microsoft.gpg

# Set package versions
ARG AZURE_CLI_VERSION="2.59.0"
ARG AZURE_CLI_VERSION="2.64.0"
ARG DISTRIBUTION

# Add the Azure CLI repository
Expand Down Expand Up @@ -52,10 +51,6 @@ RUN groupadd --gid $USER_GID $USERNAME \
# Set the default user
USER $USERNAME

# Install Sphinx dependencies
COPY ./docs/requirements.txt /build/requirements.txt
RUN pip3 install -r /build/requirements.txt

# Set PATH for pulumi - pulumi installed as feature to work round installing as root
ENV PATH=$PATH:/home/${USERNAME}/.pulumi/bin

Expand Down
1 change: 0 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
},
"extensions": [
"github.vscode-pull-request-github",
"ms-vscode.azure-account",
"ms-python.python",
"christian-kohler.path-intellisense"
],
Expand Down
8 changes: 3 additions & 5 deletions .hatch/requirements-docs.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
#
# - emoji==2.13.0
# - emoji==2.14.0
# - myst-parser==4.0.0
# - pydata-sphinx-theme==0.15.4
# - sphinx-togglebutton==0.3.2
Expand All @@ -28,7 +28,7 @@ docutils==0.21.2
# pydata-sphinx-theme
# sphinx
# sphinx-togglebutton
emoji==2.13.0
emoji==2.14.0
# via hatch.envs.docs
idna==3.10
# via requests
Expand Down Expand Up @@ -90,9 +90,7 @@ sphinxcontrib-qthelp==2.0.0
sphinxcontrib-serializinghtml==2.0.0
# via sphinx
typing-extensions==4.12.2
# via
# emoji
# pydata-sphinx-theme
# via pydata-sphinx-theme
urllib3==2.2.3
# via requests
wheel==0.44.0
Expand Down
22 changes: 11 additions & 11 deletions .hatch/requirements-lint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
# - mypy==1.11.2
# - pandas-stubs==2.2.2.240909
# - pydantic==2.9.2
# - ruff==0.6.7
# - ruff==0.6.9
# - types-appdirs==1.4.3.5
# - types-chevron==0.14.2.20240310
# - types-pytz==2024.2.0.20240913
# - types-pytz==2024.2.0.20241003
# - types-pyyaml==6.0.12.20240917
# - types-requests==2.32.0.20240914
#
Expand Down Expand Up @@ -62,7 +62,7 @@ black==24.8.0
# via
# hatch.envs.lint
# ansible-lint
bracex==2.5
bracex==2.5.post1
# via wcmatch
cachetools==5.5.0
# via tox
Expand Down Expand Up @@ -135,7 +135,7 @@ mypy-extensions==1.0.0
# via
# black
# mypy
numpy==2.1.1
numpy==2.1.2
# via pandas-stubs
onigurumacffi==1.3.0
# via ansible-navigator
Expand Down Expand Up @@ -222,7 +222,7 @@ referencing==0.35.1
# jsonschema-specifications
resolvelib==1.0.1
# via ansible-core
rich==13.8.1
rich==13.9.2
# via
# ansible-lint
# enrich
Expand All @@ -235,22 +235,22 @@ ruamel-yaml==0.18.6
# via ansible-lint
ruamel-yaml-clib==0.2.8
# via ruamel-yaml
ruff==0.6.7
ruff==0.6.9
# via hatch.envs.lint
subprocess-tee==0.4.2
# via
# ansible-compat
# ansible-dev-environment
# ansible-lint
tox==4.20.0
tox==4.21.2
# via tox-ansible
tox-ansible==24.9.0
# via ansible-dev-tools
types-appdirs==1.4.3.5
# via hatch.envs.lint
types-chevron==0.14.2.20240310
# via hatch.envs.lint
types-pytz==2024.2.0.20240913
types-pytz==2024.2.0.20241003
# via
# hatch.envs.lint
# pandas-stubs
Expand All @@ -263,13 +263,13 @@ typing-extensions==4.12.2
# mypy
# pydantic
# pydantic-core
tzdata==2024.1
tzdata==2024.2
# via ansible-navigator
urllib3==2.2.3
# via types-requests
virtualenv==20.26.5
virtualenv==20.26.6
# via tox
wcmatch==9.0
wcmatch==10.0
# via
# ansible-lint
# molecule
Expand Down
42 changes: 27 additions & 15 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: 8b759a5b8831c68c9bc2082b978e8406ff4ee3c40eca455b217a671533e23d46)
# [constraints] .hatch/requirements.txt (SHA256: f892a9714607641735b83f480e2c234b2ab8e1dffd2d59ad4188c887c06b24de)
#
# - appdirs==1.4.4
# - azure-core==1.31.0
Expand All @@ -17,21 +17,22 @@
# - azure-mgmt-rdbms==10.1.0
# - azure-mgmt-resource==23.1.1
# - azure-mgmt-storage==21.2.1
# - azure-storage-blob==12.23.0
# - azure-storage-blob==12.23.1
# - azure-storage-file-datalake==12.17.0
# - azure-storage-file-share==12.18.0
# - chevron==0.14.0
# - cryptography==43.0.1
# - fqdn==1.5.1
# - psycopg==3.2.2
# - pulumi-azure-native==2.62.0
# - pulumi-random==4.16.5
# - pulumi==3.133.0
# - psycopg[binary]==3.2.3
# - pulumi-azure-native==2.64.3
# - pulumi-azuread==5.53.4
# - pulumi-random==4.16.6
# - pulumi==3.135.1
# - pydantic==2.9.2
# - pyjwt[crypto]==2.9.0
# - pytz==2024.2
# - pyyaml==6.0.2
# - rich==13.8.1
# - rich==13.9.2
# - simple-acme-dns==3.1.0
# - typer==0.12.5
# - websocket-client==1.8.0
Expand Down Expand Up @@ -145,7 +146,7 @@ azure-mgmt-storage==21.2.1
# via
# -c .hatch/requirements.txt
# hatch.envs.test
azure-storage-blob==12.23.0
azure-storage-blob==12.23.1
# via
# -c .hatch/requirements.txt
# hatch.envs.test
Expand Down Expand Up @@ -194,11 +195,11 @@ cryptography==43.0.1
# msal
# pyjwt
# pyopenssl
debugpy==1.8.5
debugpy==1.8.6
# via
# -c .hatch/requirements.txt
# pulumi
dill==0.3.8
dill==0.3.9
# via
# -c .hatch/requirements.txt
# pulumi
Expand Down Expand Up @@ -274,6 +275,7 @@ parver==0.5
# via
# -c .hatch/requirements.txt
# pulumi-azure-native
# pulumi-azuread
# pulumi-random
pluggy==1.5.0
# via pytest
Expand All @@ -285,21 +287,30 @@ protobuf==4.25.5
# via
# -c .hatch/requirements.txt
# pulumi
psycopg==3.2.2
psycopg==3.2.3
# via
# -c .hatch/requirements.txt
# hatch.envs.test
pulumi==3.133.0
psycopg-binary==3.2.3
# via
# -c .hatch/requirements.txt
# psycopg
pulumi==3.135.1
# via
# -c .hatch/requirements.txt
# hatch.envs.test
# pulumi-azure-native
# pulumi-azuread
# pulumi-random
pulumi-azure-native==2.62.0
pulumi-azure-native==2.64.3
# via
# -c .hatch/requirements.txt
# hatch.envs.test
pulumi-azuread==5.53.4
# via
# -c .hatch/requirements.txt
# hatch.envs.test
pulumi-random==4.16.5
pulumi-random==4.16.6
# via
# -c .hatch/requirements.txt
# hatch.envs.test
Expand Down Expand Up @@ -367,7 +378,7 @@ requests-oauthlib==2.0.0
# via
# -c .hatch/requirements.txt
# msrest
rich==13.8.1
rich==13.9.2
# via
# -c .hatch/requirements.txt
# hatch.envs.test
Expand All @@ -377,6 +388,7 @@ semver==2.13.0
# -c .hatch/requirements.txt
# pulumi
# pulumi-azure-native
# pulumi-azuread
# pulumi-random
shellingham==1.5.4
# via
Expand Down
36 changes: 22 additions & 14 deletions .hatch/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,22 @@
# - azure-mgmt-rdbms==10.1.0
# - azure-mgmt-resource==23.1.1
# - azure-mgmt-storage==21.2.1
# - azure-storage-blob==12.23.0
# - azure-storage-blob==12.23.1
# - azure-storage-file-datalake==12.17.0
# - azure-storage-file-share==12.18.0
# - chevron==0.14.0
# - cryptography==43.0.1
# - fqdn==1.5.1
# - psycopg==3.2.2
# - pulumi-azure-native==2.62.0
# - pulumi-random==4.16.5
# - pulumi==3.133.0
# - psycopg[binary]==3.2.3
# - pulumi-azure-native==2.64.3
# - pulumi-azuread==5.53.4
# - pulumi-random==4.16.6
# - pulumi==3.135.1
# - pydantic==2.9.2
# - pyjwt[crypto]==2.9.0
# - pytz==2024.2
# - pyyaml==6.0.2
# - rich==13.8.1
# - rich==13.9.2
# - simple-acme-dns==3.1.0
# - typer==0.12.5
# - websocket-client==1.8.0
Expand Down Expand Up @@ -101,7 +102,7 @@ azure-mgmt-resource==23.1.1
# via hatch.envs.default
azure-mgmt-storage==21.2.1
# via hatch.envs.default
azure-storage-blob==12.23.0
azure-storage-blob==12.23.1
# via
# hatch.envs.default
# azure-storage-file-datalake
Expand Down Expand Up @@ -133,9 +134,9 @@ cryptography==43.0.1
# msal
# pyjwt
# pyopenssl
debugpy==1.8.5
debugpy==1.8.6
# via pulumi
dill==0.3.8
dill==0.3.9
# via pulumi
dnspython==2.6.1
# via simple-acme-dns
Expand Down Expand Up @@ -181,21 +182,27 @@ oauthlib==3.2.2
parver==0.5
# via
# pulumi-azure-native
# pulumi-azuread
# pulumi-random
portalocker==2.10.1
# via msal-extensions
protobuf==4.25.5
# via pulumi
psycopg==3.2.2
psycopg==3.2.3
# via hatch.envs.default
pulumi==3.133.0
psycopg-binary==3.2.3
# via psycopg
pulumi==3.135.1
# via
# hatch.envs.default
# pulumi-azure-native
# pulumi-azuread
# pulumi-random
pulumi-azure-native==2.62.0
pulumi-azure-native==2.64.3
# via hatch.envs.default
pulumi-random==4.16.5
pulumi-azuread==5.53.4
# via hatch.envs.default
pulumi-random==4.16.6
# via hatch.envs.default
pycparser==2.22
# via cffi
Expand Down Expand Up @@ -233,14 +240,15 @@ requests==2.32.3
# requests-oauthlib
requests-oauthlib==2.0.0
# via msrest
rich==13.8.1
rich==13.9.2
# via
# hatch.envs.default
# typer
semver==2.13.0
# via
# pulumi
# pulumi-azure-native
# pulumi-azuread
# pulumi-random
shellingham==1.5.4
# via typer
Expand Down
1 change: 1 addition & 0 deletions .lychee.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ glob_ignore_case = false
# Exclude URLs and mail addresses from checking (supports regex).
# exclude = [ '.*\.github.com\.*' ]
exclude = [
'code\.visualstudio\.com', # 403
'doi\.org', # 403
'entra.microsoft\.com', # Requires authentication (403)
'example\.org', # domain used for examples only
Expand Down
Loading

0 comments on commit 53c88a7

Please sign in to comment.