Skip to content

Commit

Permalink
Merge branch 'main' into mermaid-plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
tcarmet authored Apr 9, 2024
2 parents 868e310 + 7e869d8 commit 4bbc5a9
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 57 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
}
},
"remoteUser": "vscode",
"postCreateCommand": "poetry install --no-interaction --no-ansi --no-root --group=docs --group=dev",
"postCreateCommand": "poetry install --no-interaction --no-ansi --no-root --with docs,dev",
"postAttachCommand": {},
"portsAttributes": {
"6379": {
Expand Down
10 changes: 10 additions & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,13 @@ coverage:
codecov:
notify:
wait_for_ci: true

flag_management:
default_rules:
carryforward: true
statuses:
- type: project
target: auto
threshold: 1%
- type: patch
target: 80%
4 changes: 2 additions & 2 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ markdown_extensions:
- pymdownx.highlight:
anchor_linenums: true
- pymdownx.emoji:
emoji_index: !!python/name:materialx.emoji.twemoji
emoji_generator: !!python/name:materialx.emoji.to_svg
emoji_index: !!python/name:material.extensions.emoji.twemoji
emoji_generator: !!python/name:material.extensions.emoji.to_svg
- pymdownx.inlinehilite
- pymdownx.snippets
- pymdownx.superfences:
Expand Down
95 changes: 49 additions & 46 deletions poetry.lock

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ python = "^3.11"
fastapi = "^0.110.0"
uvicorn = { extras = ["standard"], version = "^0.29.0" }
pydantic = ">=1.10.2,<2.0"
redis-om = "^0.2.1"
redis-om = "^0.2.2"
rq = "^1.16.1"
pyyaml = "^6.0.1"
redis = "^4.6.0"
docker = "^7.0.0"
google-cloud-compute = "^1.18.0"
boto3 = "^1.28.85"
botocore = "^1.31.85"
boto3-stubs = { extras = ["ec2"], version = "^1.34.70" }
boto3-stubs = { extras = ["ec2"], version = "^1.34.75" }
githubkit = { extras = ["auth-app"], version = "^0.11.3" }
rq-scheduler = "^0.13.1"

Expand All @@ -30,20 +30,20 @@ rq-scheduler = "^0.13.1"
optional = true

[tool.poetry.group.docs.dependencies]
mkdocs-material = "^9.5.15"
mkdocs-material = "^9.5.16"
mkdocs = "^1.5.3"

[tool.poetry.group.dev.dependencies]
connexion = "^3.0.5"
pytest = "^8.1.1"
pytest-cov = "^5.0.0"
hypothesis = "^6.99.13"
pyright = "^1.1.355"
hypothesis = "^6.100.0"
pyright = "^1.1.356"
black = "^24.3.0"
isort = "^5.13.2"
ruff = "^0.3.4"
ruff = "^0.3.5"
yamllint = "^1.35.1"
types-redis = "^4.6.0.20240218"
types-redis = "^4.6.0.20240311"


[build-system]
Expand Down
6 changes: 5 additions & 1 deletion runner_manager/models/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,11 @@ def configure_instance(self, runner: Runner) -> AwsInstance:
TagSpecificationTypeDef(
ResourceType="instance",
Tags=tags,
)
),
TagSpecificationTypeDef(
ResourceType="volume",
Tags=tags,
),
]
return AwsInstance(
ImageId=self.image,
Expand Down
1 change: 1 addition & 0 deletions tests/unit/backend/test_aws.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ def test_aws_instance_config(runner: Runner):
assert TagTypeDef(Key="test", Value="test") in tags
assert TagTypeDef(Key="Name", Value=runner.name) in tags
assert runner.encoded_jit_config in instance["UserData"]
assert instance["TagSpecifications"][1]["ResourceType"] == "volume"


@mark.skipif(not os.getenv("AWS_ACCESS_KEY_ID"), reason="AWS credentials not found")
Expand Down

0 comments on commit 4bbc5a9

Please sign in to comment.