Skip to content

Commit 253b333

Browse files
authored
Merge branch 'dev' into main
2 parents cf2762b + a4ce78f commit 253b333

Some content is hidden

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

53 files changed

+1971
-1849
lines changed

.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: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# See https://pre-commit.com for more information
2+
# See https://pre-commit.com/hooks.html for more hooks
3+
fail_fast: true
4+
repos:
5+
- repo: https://github.com/pre-commit/pre-commit-hooks
6+
rev: v3.2.0
7+
hooks:
8+
- id: check-added-large-files
9+
- id: check-ast
10+
- id: check-merge-conflict
11+
- id: check-yaml
12+
- id: detect-private-key
13+
- id: end-of-file-fixer
14+
- id: trailing-whitespace
15+
16+
- repo: https://github.com/psf/black
17+
rev: 22.10.0
18+
hooks:
19+
- id: black
20+
language_version: python3.10
21+
22+
- repo: https://github.com/astral-sh/ruff-pre-commit
23+
rev: v0.2.1
24+
hooks:
25+
# Run the linter.
26+
- id: ruff
27+
args: [ '--ignore', 'E501', '--fix' ]
28+
# Run the formatter.
29+
- id: ruff-format
30+
31+
- repo: https://github.com/python-poetry/poetry
32+
rev: 1.6.1
33+
hooks:
34+
- id: poetry-check
35+
#- id: poetry-lock
36+
- id: poetry-export
37+
#- id: poetry-install

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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ 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
21+
poetry run pre-commit install
2122

2223
export:
2324
poetry export -f requirements.txt --output requirements.txt

0 commit comments

Comments
 (0)