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.

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

Jump to bottom

chore(deps): update development dependencies (non-major) #1638

Closed
wants to merge 3 commits into from
Closed

chore(deps): update development dependencies (non-major) #1638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
158968c
chore(deps): update development dependencies (non-major)
renovate[bot] May 8, 2024
185eb0e
style: fix new pyright issues
lengau May 8, 2024
03eacae
Merge branch 'main' into renovate/dev-dependencies
lengau May 8, 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
20 changes: 11 additions & 9 deletions charmcraft/models/project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,10 +569,10 @@ def validate_each_part(cls, item):
class BasesCharm(CharmcraftProject):
"""Model for defining a charm."""

type: Literal["charm"]
type: Literal["charm"] # pyright: ignore[reportIncompatibleVariableOverride]
name: models.ProjectName
summary: CharmcraftSummaryStr
description: str
summary: CharmcraftSummaryStr # pyright: ignore[reportIncompatibleVariableOverride]
description: str # pyright: ignore[reportIncompatibleVariableOverride]

# This is defined this way because using conlist makes mypy sad and using
# a ConstrainedList child class has pydontic issues. This appears to be
Expand Down Expand Up @@ -635,16 +635,18 @@ def _check_base_is_legacy(base: BaseDict) -> bool:
class PlatformCharm(CharmcraftProject):
"""Model for defining a charm using Platforms."""

type: Literal["charm"]
type: Literal["charm"] # pyright: ignore[reportIncompatibleVariableOverride]
name: models.ProjectName
summary: CharmcraftSummaryStr
description: str
summary: CharmcraftSummaryStr # pyright: ignore[reportIncompatibleVariableOverride]
description: str # pyright: ignore[reportIncompatibleVariableOverride]

base: BaseStr
base: BaseStr # pyright: ignore[reportGeneralTypeIssues]
build_base: BuildBaseStr | None = None
platforms: dict[str, Platform | None]
platforms: dict[ # pyright: ignore[reportGeneralTypeIssues,reportIncompatibleVariableOverride]
str, Platform | None
]

parts: dict[str, dict[str, Any]] # craft-parts parts
parts: dict[str, dict[str, Any]] # pyright: ignore[reportGeneralTypeIssues]

actions: dict[str, Any] | None
assumes: list[str | dict[str, list | dict]] | None
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ lint = [
]
types = [
"mypy[reports]~=1.5",
"pyright==1.1.354",
"pyright==1.1.361",
"types-python-dateutil",
"types-requests<2.31.0.20240312", # Frozen until we can get urllib3 v2
"types-requests<2.31.0.20240407", # Frozen until we can get urllib3 v2
"types-setuptools",
"types-tabulate",
"types-urllib3",
Expand Down
Loading