Skip to content

Commit

Permalink
Merge branch 'dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
tsterbak committed Feb 18, 2024
2 parents cf2762b + a4ce78f commit 253b333
Show file tree
Hide file tree
Showing 53 changed files with 1,971 additions and 1,849 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/device-support-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,5 @@ body:
- type: textarea
attributes:
label: Additional context
description: Please provide any additional context or information that might be helpful in adding support for this device.
description: Please provide any additional context or information that might be helpful in adding support for this device.
render: Markdown
6 changes: 3 additions & 3 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- run: black .
- run: ruff openandroidinstaller/ --ignore E501
- run: PYTHONPATH=openandroidinstaller:$(PYTHONPATH) pytest --cov=openandroidinstaller tests/

build:
needs: ci
runs-on: ${{ matrix.os }}
Expand All @@ -43,7 +43,7 @@ jobs:
with:
name: openandroidinstaller-${{ github.ref_name }}-${{ matrix.os }}
path: dist/

build-windows:
needs: ci
runs-on: 'windows-latest'
Expand All @@ -59,7 +59,7 @@ jobs:
with:
name: openandroidinstaller-${{ github.ref_name }}-windows-latest
path: dist/

create-release:
needs:
- build
Expand Down
122 changes: 61 additions & 61 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@ __pycache__
*.py[cod]
*$py.class

# Distribution / packaging
.Python build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg
*.manifest
*.spec
# Distribution / packaging
.Python build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg
*.manifest
*.spec
heimdall/
libusb-windows/
openandroidinstaller/bin/
Expand All @@ -33,17 +33,17 @@ pip-log.txt
pip-delete-this-directory.txt
*.log

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
.pytest_cache/
nosetests.xml
coverage.xml
*.cover
.hypothesis/
# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
.pytest_cache/
nosetests.xml
coverage.xml
*.cover
.hypothesis/

# Translations
*.mo
Expand Down Expand Up @@ -72,42 +72,42 @@ env/
venv/
ENV/

# If you are using PyCharm #
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/dictionaries
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.xml
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/gradle.xml
.idea/**/libraries
*.iws /out/
# If you are using PyCharm #
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/dictionaries
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.xml
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/gradle.xml
.idea/**/libraries
*.iws /out/

# Sublime Text
*.tmlanguage.cache
*.tmPreferences.cache
*.stTheme.cache
*.sublime-workspace
*.sublime-project
*.tmlanguage.cache
*.tmPreferences.cache
*.stTheme.cache
*.sublime-workspace
*.sublime-project

# sftp configuration file
# sftp configuration file
sftp-config.json

# Package control specific files Package
Control.last-run
Control.ca-list
Control.ca-bundle
Control.system-ca-bundle
GitHub.sublime-settings
# Package control specific files Package
Control.last-run
Control.ca-list
Control.ca-bundle
Control.system-ca-bundle
GitHub.sublime-settings

# Visual Studio Code #
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
# Visual Studio Code #
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history
37 changes: 37 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
fail_fast: true
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
hooks:
- id: check-added-large-files
- id: check-ast
- id: check-merge-conflict
- id: check-yaml
- id: detect-private-key
- id: end-of-file-fixer
- id: trailing-whitespace

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

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.2.1
hooks:
# Run the linter.
- id: ruff
args: [ '--ignore', 'E501', '--fix' ]
# Run the formatter.
- id: ruff-format

- repo: https://github.com/python-poetry/poetry
rev: 1.6.1
hooks:
- id: poetry-check
#- id: poetry-lock
- id: poetry-export
#- id: poetry-install
4 changes: 2 additions & 2 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].

Community Impact Guidelines were inspired by
Community Impact Guidelines were inspired by
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].

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

[homepage]: https://www.contributor-covenant.org
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contributing to the OpenAndroidInstaller project
# Contributing to the OpenAndroidInstaller project

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

Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ poetry:
curl -sSL https://install.python-poetry.org | python3 -

install:
poetry install
poetry install --with dev
poetry run python scripts/download-tools.py
poetry run pre-commit install

export:
poetry export -f requirements.txt --output requirements.txt
Expand Down
Loading

0 comments on commit 253b333

Please sign in to comment.