Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitallowed
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ poetry.lock:.*asttokens = ">=2.1.0"

src/mesh_sandbox/common/messaging.py:.*def try_parse_authorisation_token\(auth_token: str\) -> Optional\[AuthoriseHeaderParts\]:
src/mesh_sandbox/common/messaging.py:.*auth_token = auth_token.*
poetry.lock:.*:pytokens = ".*"
8 changes: 4 additions & 4 deletions .github/workflows/merge-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ jobs:
fetch-depth: 0

- name: setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version-file: "pyproject.toml"

- name: setup poetry
uses: abatilo/actions-poetry@0dd19c9498c3dc8728967849d0d2eae428a8a3d8
with:
poetry-version: 1.5.1
poetry-version: 2.1.2

- name: add poetry plugins
run: |
Expand Down Expand Up @@ -123,14 +123,14 @@ jobs:
find . -type f | xargs chmod g+w

- name: setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version-file: "pyproject.toml"

- name: setup poetry
uses: abatilo/actions-poetry@0dd19c9498c3dc8728967849d0d2eae428a8a3d8
with:
poetry-version: 1.5.1
poetry-version: 2.1.2

- name: add poetry plugins
run: |
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ jobs:
PR_BRANCH: ${{ github.head_ref }}

- name: setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version-file: "pyproject.toml"

- name: setup poetry
uses: abatilo/actions-poetry@0dd19c9498c3dc8728967849d0d2eae428a8a3d8
with:
poetry-version: 1.5.1
poetry-version: 2.1.2

- name: add poetry plugins
run: |
Expand Down Expand Up @@ -179,14 +179,14 @@ jobs:
PR_BRANCH: ${{ github.head_ref }}

- name: setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version-file: "pyproject.toml"

- name: setup poetry
uses: abatilo/actions-poetry@0dd19c9498c3dc8728967849d0d2eae428a8a3d8
with:
poetry-version: 1.5.1
poetry-version: 2.1.2

- name: add poetry plugins
run: |
Expand Down Expand Up @@ -215,7 +215,7 @@ jobs:
run: make mypy

- name: hadolint
uses: hadolint/hadolint-action@d292784f8f3eacda47060b259a580467b0ba410c
uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5
with:
dockerfile: "Dockerfile"
recursive: true
Expand Down Expand Up @@ -266,14 +266,14 @@ jobs:
PR_BRANCH: ${{ github.head_ref }}

- name: setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version-file: "pyproject.toml"

- name: setup poetry
uses: abatilo/actions-poetry@0dd19c9498c3dc8728967849d0d2eae428a8a3d8
with:
poetry-version: 1.5.1
poetry-version: 2.1.2

- name: add poetry plugins
run: |
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/scheduled-combine-dependabot-prs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ name: Combine Dependabot PRs
on:
workflow_dispatch: # allows you to manually trigger the workflow
inputs:
ci_required:
type: choice
description: Require a successful build before branches are included
options:
- 'YES'
- 'NO'
required: false
default: 'YES'
ci_required:
type: choice
description: Require a successful build before branches are included
options:
- "YES"
- "NO"
required: false
default: "YES"

# The minimum permissions required to run this Action
permissions:
Expand All @@ -25,7 +25,7 @@ jobs:
steps:
- name: combine-prs
id: combine-prs
uses: actions/combine-prs@v5.2.0
uses: github/combine-prs@v5.2.0
with:
ci_required: ${{ inputs.ci_required == 'YES' }}
labels: dependencies
Expand Down
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,12 @@ delete-hooks:
refresh-hooks: delete-hooks .git/hooks/pre-commit .git/hooks/commit-msg

install:
poetry install --sync
poetry install
poetry sync

install-ci:
poetry install --without local --sync
poetry install --without local
poetry sync

update:
poetry update
Expand Down
1,679 changes: 937 additions & 742 deletions poetry.lock

Large diffs are not rendered by default.

16 changes: 10 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ readme = "README.md"
python = ">=3.11,<3.14.0"
types-python-dateutil = "^2.8.9"
python-dateutil = "^2.8.2"
cryptography = ">=44.0.1,<45"
fastapi = ">=0.110.0,<0.118.0"
cryptography = ">=44.0.1,<47"
fastapi = ">=0.110.0,<0.119.0"
gunicorn = ">=21.2,<24.0"
uvicorn = ">=0.23.2,<0.36.0"
uvicorn = ">=0.23.2,<0.38.0"
mesh-client = "^4.0.1"
typing-extensions = ">=4.10.0"

Expand All @@ -27,11 +27,11 @@ typing-extensions = ">=4.10.0"
# ci / testing dependencies
petname = "^2.6"
pytest = ">=7.2,<9.0"
pytest-asyncio = ">=0.16,<1.2"
pytest-asyncio = ">=0.16,<1.3"
Mesh-Client = "^4.0.1"
mypy = "^1.1.1"
coverage = ">=6.5,<8.0"
httpx = ">=0.27.0,<0.28"
httpx = ">=0.27.0,<0.29"
types-requests = "^2.28.11.4"
pyOpenSSL = ">=24,<26"
types-pyOpenSSL = "^24.0.0.20240130"
Expand All @@ -44,6 +44,11 @@ black = ">=23.9.1,<26.0.0"
[tool.poetry.group.local.dependencies]
ipython = ">=8.11,<10.0"

[tool.poetry.requires-plugins]
poetry-plugin-export = ">=1.8"



[tool.black]
line-length = 120
target-version = ['py39', 'py310']
Expand Down Expand Up @@ -134,7 +139,6 @@ lint.select = [
]
src = ["."]
lint.ignore = [
"PT004",
"UP007",
"UP045"
]
Expand Down
Loading