Skip to content

Commit

Permalink
Update dependencies and allow python 3.12.3
Browse files Browse the repository at this point in the history
* rename CountinuosRectangleBorder to ContinuousRectangleBorder as of: flet-dev/website#147
* allows building on [A-Z]ubuntu 24.04
* remove hard-coded python verson in pre commit hooks and update their versions
* add poetry export plugin to address the following warning (still shows up)

Warning: poetry-plugin-export will not be installed by default in a future version of Poetry.
In order to avoid a breaking change and make your automation forward-compatible, please install poetry-plugin-export explicitly. See https://python-poetry.org/docs/plugins/#using-plugins for details on how to install a plugin.
To disable this warning run 'poetry config warnings.export false'.

Signed-off-by: SirRGB <sirrgb@proton.me>
  • Loading branch information
SirRGB committed Dec 8, 2024
1 parent 0a79560 commit 9dc2f7e
Show file tree
Hide file tree
Showing 8 changed files with 2,615 additions and 1,500 deletions.
9 changes: 4 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
fail_fast: true
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
rev: v5.0.0
hooks:
- id: check-added-large-files
- id: check-ast
Expand All @@ -14,13 +14,12 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/psf/black
rev: 22.10.0
rev: 24.10.0
hooks:
- id: black
language_version: python3.10

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.2.1
rev: v0.8.1
hooks:
# Run the linter.
- id: ruff
Expand All @@ -29,7 +28,7 @@ repos:
- id: ruff-format

- repo: https://github.com/python-poetry/poetry
rev: 1.6.1
rev: 1.8.4
hooks:
- id: poetry-check
#- id: poetry-lock
Expand Down
4 changes: 2 additions & 2 deletions openandroidinstaller/views/addon_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
colors,
icons,
)
from flet_core.buttons import CountinuosRectangleBorder
from flet_core.buttons import ContinuousRectangleBorder
from loguru import logger
from styles import Markdown, Text
from views import BaseView
Expand Down Expand Up @@ -78,7 +78,7 @@ def build(self):
TextButton("Close", on_click=self.close_close_explain_addons_dlg),
],
actions_alignment="end",
shape=CountinuosRectangleBorder(radius=0),
shape=ContinuousRectangleBorder(radius=0),
)

# initialize file pickers
Expand Down
4 changes: 2 additions & 2 deletions openandroidinstaller/views/requirements_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
colors,
icons,
)
from flet_core.buttons import CountinuosRectangleBorder
from flet_core.buttons import ContinuousRectangleBorder
from loguru import logger
from styles import Markdown, Text
from views import BaseView
Expand Down Expand Up @@ -94,7 +94,7 @@ def init_visuals(
TextButton("Close", on_click=self.close_find_version_dlg),
],
actions_alignment="end",
shape=CountinuosRectangleBorder(radius=0),
shape=ContinuousRectangleBorder(radius=0),
)

def build(self):
Expand Down
6 changes: 3 additions & 3 deletions openandroidinstaller/views/select_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
colors,
icons,
)
from flet_core.buttons import CountinuosRectangleBorder
from flet_core.buttons import ContinuousRectangleBorder
from loguru import logger
from styles import Markdown, Text
from utils import (
Expand Down Expand Up @@ -90,7 +90,7 @@ def init_visuals(
TextButton("Close", on_click=self.close_close_explain_images_dlg),
],
actions_alignment="end",
shape=CountinuosRectangleBorder(radius=0),
shape=ContinuousRectangleBorder(radius=0),
)

# initialize file pickers
Expand Down Expand Up @@ -375,7 +375,7 @@ def toggle_additional_image_selection(self):
),
],
actions_alignment="end",
shape=CountinuosRectangleBorder(radius=0),
shape=ContinuousRectangleBorder(radius=0),
)

# create help/info button to show the help dialog for the image and recovery selection
Expand Down
4 changes: 2 additions & 2 deletions openandroidinstaller/views/start_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
colors,
icons,
)
from flet_core.buttons import CountinuosRectangleBorder
from flet_core.buttons import ContinuousRectangleBorder
from loguru import logger
from styles import Markdown, Text
from tooling import search_device, SearchResult
Expand Down Expand Up @@ -86,7 +86,7 @@ def init_visuals(
TextButton("Close", on_click=self.close_developer_options_dlg),
],
actions_alignment="end",
shape=CountinuosRectangleBorder(radius=0),
shape=ContinuousRectangleBorder(radius=0),
)

# toggleswitch to allow skipping unlocking the bootloader
Expand Down
2,392 changes: 1,542 additions & 850 deletions poetry.lock

Large diffs are not rendered by default.

9 changes: 3 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ homepage = "https://openandroidinstaller.org"
include = ["openandroidinstaller/bin/*", "openandroidinstaller/bin/*/*"]

[tool.poetry.dependencies]
python = ">=3.11,<3.12"
python = ">=3.11,<=3.12.3"
click = "^8.1.3"
flet = "^0.7.4"
flet = "^0.24.1"
pyinstaller = "^5.3"
Pillow = "^10.0.1"
PyYAML = "^6.0"
Expand All @@ -35,7 +35,7 @@ pytest-subprocess = "^1.5.0"
mypy = "^1.0.0"

[build-system]
requires = ["poetry-core>=1.0.0"]
requires = ["poetry-core>=1.0.0", "poetry-plugin-export>=1.0.0"]
build-backend = "poetry.core.masonry.api"

[tool.ruff]
Expand Down Expand Up @@ -76,9 +76,6 @@ indent-width = 4
# Never enforce `E501`. line length
#exclude = ["E501"]

# Assume Python 3.8
target-version = "py38"

[tool.ruff.lint]
# Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`) codes by default.
# Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
Expand Down
1,687 changes: 1,057 additions & 630 deletions requirements.txt

Large diffs are not rendered by default.

0 comments on commit 9dc2f7e

Please sign in to comment.