Skip to content

Commit 2c0bbf0

Browse files
committed
Run all commit hooks and fix linting
1 parent 9475c19 commit 2c0bbf0

49 files changed

Lines changed: 300 additions & 438 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/device-support-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,5 @@ body:
8585
- type: textarea
8686
attributes:
8787
label: Additional context
88-
description: Please provide any additional context or information that might be helpful in adding support for this device.
88+
description: Please provide any additional context or information that might be helpful in adding support for this device.
8989
render: Markdown

.github/workflows/build-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- run: black .
2424
- run: ruff openandroidinstaller/ --ignore E501
2525
- run: PYTHONPATH=openandroidinstaller:$(PYTHONPATH) pytest --cov=openandroidinstaller tests/
26-
26+
2727
build:
2828
needs: ci
2929
runs-on: ${{ matrix.os }}
@@ -43,7 +43,7 @@ jobs:
4343
with:
4444
name: openandroidinstaller-${{ github.ref_name }}-${{ matrix.os }}
4545
path: dist/
46-
46+
4747
build-windows:
4848
needs: ci
4949
runs-on: 'windows-latest'
@@ -59,7 +59,7 @@ jobs:
5959
with:
6060
name: openandroidinstaller-${{ github.ref_name }}-windows-latest
6161
path: dist/
62-
62+
6363
create-release:
6464
needs:
6565
- build

.gitignore

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ __pycache__
55
*.py[cod]
66
*$py.class
77

8-
# Distribution / packaging
9-
.Python build/
10-
develop-eggs/
11-
dist/
12-
downloads/
13-
eggs/
14-
.eggs/
15-
lib/
16-
lib64/
17-
parts/
18-
sdist/
19-
var/
20-
wheels/
21-
*.egg-info/
22-
.installed.cfg
23-
*.egg
24-
*.manifest
25-
*.spec
8+
# Distribution / packaging
9+
.Python build/
10+
develop-eggs/
11+
dist/
12+
downloads/
13+
eggs/
14+
.eggs/
15+
lib/
16+
lib64/
17+
parts/
18+
sdist/
19+
var/
20+
wheels/
21+
*.egg-info/
22+
.installed.cfg
23+
*.egg
24+
*.manifest
25+
*.spec
2626
heimdall/
2727
libusb-windows/
2828
openandroidinstaller/bin/
@@ -33,17 +33,17 @@ pip-log.txt
3333
pip-delete-this-directory.txt
3434
*.log
3535

36-
# Unit test / coverage reports
37-
htmlcov/
38-
.tox/
39-
.coverage
40-
.coverage.*
41-
.cache
42-
.pytest_cache/
43-
nosetests.xml
44-
coverage.xml
45-
*.cover
46-
.hypothesis/
36+
# Unit test / coverage reports
37+
htmlcov/
38+
.tox/
39+
.coverage
40+
.coverage.*
41+
.cache
42+
.pytest_cache/
43+
nosetests.xml
44+
coverage.xml
45+
*.cover
46+
.hypothesis/
4747

4848
# Translations
4949
*.mo
@@ -72,42 +72,42 @@ env/
7272
venv/
7373
ENV/
7474

75-
# If you are using PyCharm #
76-
.idea/**/workspace.xml
77-
.idea/**/tasks.xml
78-
.idea/dictionaries
79-
.idea/**/dataSources/
80-
.idea/**/dataSources.ids
81-
.idea/**/dataSources.xml
82-
.idea/**/dataSources.local.xml
83-
.idea/**/sqlDataSources.xml
84-
.idea/**/dynamic.xml
85-
.idea/**/uiDesigner.xml
86-
.idea/**/gradle.xml
87-
.idea/**/libraries
88-
*.iws /out/
75+
# If you are using PyCharm #
76+
.idea/**/workspace.xml
77+
.idea/**/tasks.xml
78+
.idea/dictionaries
79+
.idea/**/dataSources/
80+
.idea/**/dataSources.ids
81+
.idea/**/dataSources.xml
82+
.idea/**/dataSources.local.xml
83+
.idea/**/sqlDataSources.xml
84+
.idea/**/dynamic.xml
85+
.idea/**/uiDesigner.xml
86+
.idea/**/gradle.xml
87+
.idea/**/libraries
88+
*.iws /out/
8989

9090
# Sublime Text
91-
*.tmlanguage.cache
92-
*.tmPreferences.cache
93-
*.stTheme.cache
94-
*.sublime-workspace
95-
*.sublime-project
91+
*.tmlanguage.cache
92+
*.tmPreferences.cache
93+
*.stTheme.cache
94+
*.sublime-workspace
95+
*.sublime-project
9696

97-
# sftp configuration file
97+
# sftp configuration file
9898
sftp-config.json
9999

100-
# Package control specific files Package
101-
Control.last-run
102-
Control.ca-list
103-
Control.ca-bundle
104-
Control.system-ca-bundle
105-
GitHub.sublime-settings
100+
# Package control specific files Package
101+
Control.last-run
102+
Control.ca-list
103+
Control.ca-bundle
104+
Control.system-ca-bundle
105+
GitHub.sublime-settings
106106

107-
# Visual Studio Code #
108-
.vscode/*
109-
!.vscode/settings.json
110-
!.vscode/tasks.json
111-
!.vscode/launch.json
112-
!.vscode/extensions.json
107+
# Visual Studio Code #
108+
.vscode/*
109+
!.vscode/settings.json
110+
!.vscode/tasks.json
111+
!.vscode/launch.json
112+
!.vscode/extensions.json
113113
.history

.pre-commit-config.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# See https://pre-commit.com for more information
22
# See https://pre-commit.com/hooks.html for more hooks
3+
fail_fast: true
34
repos:
45
- repo: https://github.com/pre-commit/pre-commit-hooks
56
rev: v3.2.0
@@ -12,11 +13,6 @@ repos:
1213
- id: end-of-file-fixer
1314
- id: trailing-whitespace
1415

15-
- repo: https://github.com/asottile/reorder_python_imports
16-
rev: v3.9.0
17-
hooks:
18-
- id: reorder-python-imports
19-
2016
- repo: https://github.com/psf/black
2117
rev: 22.10.0
2218
hooks:
@@ -28,6 +24,7 @@ repos:
2824
hooks:
2925
# Run the linter.
3026
- id: ruff
27+
args: [ '--ignore', 'E501', '--fix' ]
3128
# Run the formatter.
3229
- id: ruff-format
3330

CODE_OF_CONDUCT.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage],
119119
version 2.0, available at
120120
[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
121121

122-
Community Impact Guidelines were inspired by
122+
Community Impact Guidelines were inspired by
123123
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
124124

125125
For answers to common questions about this code of conduct, see the FAQ at
126-
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
126+
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
127127
at [https://www.contributor-covenant.org/translations][translations].
128128

129129
[homepage]: https://www.contributor-covenant.org

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Contributing to the OpenAndroidInstaller project
1+
# Contributing to the OpenAndroidInstaller project
22

33
💖 First of all: thank you for contributing to the OpenAndroidInstaller! Great that you are here!
44

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ poetry:
1616
curl -sSL https://install.python-poetry.org | python3 -
1717

1818
install:
19-
poetry install
19+
poetry install --with dev
2020
poetry run python scripts/download-tools.py
2121
poetry run pre-commit install
2222

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<component type="desktop-application">
33
<id>org.openandroidinstaller.OpenAndroidInstaller</id>
4-
4+
55
<name>OpenAndroidInstaller</name>
66
<summary> Makes installing alternative Android distributions nice and easy. </summary>
7-
7+
88
<metadata_license>CC-BY-SA-4.0</metadata_license>
99
<project_license>GPL-3.0-or-later</project_license>
10-
10+
1111
<description>
1212
<p>
1313
The OpenAndroidInstaller project helps Android users to keep their smartphone&apos;s operating system up to date with free software and to continue using the device even though the manufacturer no longer offers updates. With a graphical installation software, users are easily guided through the installation process of free Android operating systems like LineageOS.
1414
</p>
1515
</description>
16-
16+
1717
<launchable type="desktop-id">org.openandroidinstaller.OpenAndroidInstaller.desktop</launchable>
1818
</component>

flatpak/org.openandroidinstaller.OpenAndroidInstaller.desktop

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Version=1.0
33
Type=Application
44

55
Name=OpenAndroidInstaller
6-
Comment= Makes installing alternative Android distributions nice and easy.
6+
Comment= Makes installing alternative Android distributions nice and easy.
77
Categories=Utility;FileTools;
88

99
Icon=org.openandroidinstaller.OpenAndroidInstaller

openandroidinstaller/app_state.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
"""This file contains a class and function to manage the app state over various steps."""
2-
32
# This file is part of OpenAndroidInstaller.
43
# OpenAndroidInstaller is free software: you can redistribute it and/or modify it under the terms of
54
# the GNU General Public License as published by the Free Software Foundation,
65
# either version 3 of the License, or (at your option) any later version.
7-
86
# OpenAndroidInstaller is distributed in the hope that it will be useful, but WITHOUT ANY
97
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
108
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
11-
129
# You should have received a copy of the GNU General Public License along with OpenAndroidInstaller.
1310
# If not, see <https://www.gnu.org/licenses/>."""
1411
# Author: Tobias Sterbak
15-
1612
import copy
1713
from pathlib import Path
1814
from typing import List, Optional
19-
from loguru import logger
2015

21-
from installer_config import _load_config, Step
16+
from installer_config import Step, _load_config
17+
from loguru import logger
2218

2319

2420
class AppState:

0 commit comments

Comments
 (0)