Skip to content

Add Python tests for newer versions #2149

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.

Sign up for GitHub

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

Closed
tonybaloney wants to merge 13 commits into from
Closed

Add Python tests for newer versions #2149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1725087
Update continuous-integration-workflow.yml
tonybaloney Jul 21, 2022
5cd8617
Update pyproject.toml
tonybaloney Jul 21, 2022
60d8236
Don't run linting on all versions
tonybaloney Jul 21, 2022
6203fce
Put mutable default into default_factory with lambda
tonybaloney Jul 21, 2022
081f7e7
Use default factory for mutable types and fix single quotes in YAML
tonybaloney Jul 21, 2022
68541fb
Reformat changed files
tonybaloney Jul 21, 2022
579b6a3
Inline the changes with the existing pattern for default factories
tonybaloney Jul 21, 2022
c80b969
Fix import order in tests
tonybaloney Jul 21, 2022
5bc17ce
Test up to Python 3.10
tonybaloney Jul 21, 2022
243b294
Merge branch 'python_versions' into patch-2
tonybaloney Jul 21, 2022
6c27c54
Update python-requires
tonybaloney Jul 21, 2022
9c32d8d
Merge branch 'python_versions' into patch-2
tonybaloney Jul 21, 2022
3c4d947
Merge branch 'main' into patch-2
tonybaloney Jul 26, 2022
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
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04, windows-2019]
python-version: ["3.8", "3.9", "3.10"]
python-version: ["3.8", "3.9", "3.10", "3.11-dev"]
fail-fast: false
steps:
- name: Checkout repository to $GITHUB_WORKSPACE
Expand Down Expand Up @@ -58,4 +58,4 @@ jobs:

- name: Run ShellCheck
if: runner.os == 'Linux' && matrix.python-version == '3.8'
uses: ludeeus/action-shellcheck@0.5.0
uses: ludeeus/action-shellcheck@0.5.0
2 changes: 1 addition & 1 deletion lisa/environment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def _get_environment_id() -> int:
class EnvironmentMessage(MessageBase):
type: str = "Environment"
name: str = ""
runbook: schema.Environment = schema.Environment()
runbook: schema.Environment = field(default_factory=schema.Environment)
status: EnvironmentStatus = EnvironmentStatus.New


Expand Down
3 changes: 2 additions & 1 deletion lisa/features/nvme.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import re
from dataclasses import dataclass, field
from functools import partial
from typing import Any, List, Type

from dataclasses_json import dataclass_json
Expand Down Expand Up @@ -93,7 +94,7 @@ def _get_device_from_ls(self, force_run: bool = False) -> None:
class NvmeSettings(FeatureSettings):
type: str = "Nvme"
disk_count: search_space.CountSpace = field(
default=search_space.IntRange(min=0),
default_factory=partial(search_space.IntRange, min=0),
metadata=field_metadata(decoder=search_space.decode_count_space),
)

Expand Down
8 changes: 4 additions & 4 deletions lisa/schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,21 +714,21 @@ class NodeSpace(search_space.RequirementMixin, TypedSchema, ExtendableSchemaMixi
name: str = ""
is_default: bool = field(default=False)
node_count: search_space.CountSpace = field(
default=search_space.IntRange(min=1),
default_factory=partial(search_space.IntRange, min=1),
metadata=field_metadata(decoder=search_space.decode_count_space),
)
core_count: search_space.CountSpace = field(
default=search_space.IntRange(min=1),
default_factory=partial(search_space.IntRange, min=1),
metadata=field_metadata(decoder=search_space.decode_count_space),
)
memory_mb: search_space.CountSpace = field(
default=search_space.IntRange(min=512),
default_factory=partial(search_space.IntRange, min=512),
metadata=field_metadata(decoder=search_space.decode_count_space),
)
disk: Optional[DiskOptionSettings] = None
network_interface: Optional[NetworkInterfaceOptionSettings] = None
gpu_count: search_space.CountSpace = field(
default=search_space.IntRange(min=0),
default_factory=partial(search_space.IntRange, min=0),
metadata=field_metadata(decoder=search_space.decode_count_space),
)
# all features on requirement should be included.
Expand Down
5 changes: 3 additions & 2 deletions selftests/test_search_space.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

import logging
import unittest
from dataclasses import dataclass
from dataclasses import dataclass, field
from functools import partial
from typing import Any, List, Optional, TypeVar

from lisa.search_space import (
Expand All @@ -30,7 +31,7 @@ class MockSchema:

@dataclass
class MockItem(RequirementMixin):
number: CountSpace = IntRange(min=1, max=5)
number: CountSpace = field(default_factory=partial(IntRange, min=1, max=5))

def check(self, capability: Any) -> ResultReason:
assert isinstance(capability, MockItem), f"actual: {type(capability)}"
Expand Down