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

Fix ci #61

Merged
merged 3 commits into from
May 31, 2024
Merged

Fix ci #61

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
0b6014b
ci: python versions should match pyproject.toml
aentwist May 30, 2024
9a32634
ci: upgrade setup-python from v1/2 to v5
aentwist May 30, 2024
147ed12
ci(deps)!: flake8 should work
aentwist May 30, 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
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@ jobs:
runs-on: "${{ matrix.os }}"
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
# Should match the python versions in pyproject.toml and publish.yml
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
os: [windows-latest, ubuntu-latest, macos-latest]
env:
OS: ${{ matrix.os }}
PYTHON: ${{ matrix.python-version }}
steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,16 @@ jobs:
runs-on: "${{ matrix.os }}"
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10"]
# Should match the python versions in pyproject.toml and ci.yml
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
os: [windows-latest, ubuntu-latest, macos-latest]
env:
OS: ${{ matrix.os }}
PYTHON: ${{ matrix.python-version }}
steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down Expand Up @@ -49,9 +50,10 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: "3.10"
# Use the latest python version we support
python-version: "3.12"
- name: Install dependencies
run: |
python -m pip install --upgrade pip poetry
Expand All @@ -69,9 +71,10 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: "3.10"
# Just use the latest python version we support
python-version: "3.12"
- name: Install dependencies
run: |
python -m pip install --upgrade pip poetry
Expand Down
42 changes: 21 additions & 21 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ packages = [
py-scrcpy = "scrcpy_ui:main"

[tool.poetry.dependencies]
python = ">=3.8,<3.13"
# Should match the python versions in .github/workflows/ci.yml and publish.yml
python = ">=3.8.1,<3.13"
av = "^12"
opencv-python = "^4.5.0"
adbutils = "^1.0.8"
Expand All @@ -27,7 +28,7 @@ PySide6 = { version = "^6.0.0", optional = true }
ui = ["PySide6"]

[tool.poetry.dev-dependencies]
flake8 = "^4.0.1"
flake8 = "^7"
isort = "*"
black = "^22.3.0"
pytest = "^7.1.2"
Expand Down
Loading