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.

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

Chore update Python to 3.12.1 #584

Merged
merged 2 commits into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
description: "Python version to use when building binaries."
type: string
required: false
default: "3.11.6"
default: "3.12.1"
checkout_branch:
description: "Branch to checkout."
type: string
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:
run: |
git fetch origin ${{ inputs.checkout_branch }}
python -m pip install --upgrade pip
pip install -e .[build]
pip install -e .[whl_cp312]
python -m tools.build bdist_msi

- name: Create hashes file and set outputs
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@

Subsearch is an automated subtitle downloader and extractor with support for many [languages](https://github.com/vagabondHustler/subsearch/discussions/558). It allows users to search and download subtitles for movies and TV shows with a single click from the context menu. The application features a graphical user interface for configuring options, such as selecting which websites to search on, choosing the subtitle language, applying filters for hearing-impaired, among [other options](https://github.com/vagabondHustler/subsearch/discussions/556).


## Preview <a name = "preview"></a>

<div align="center">
Expand Down Expand Up @@ -80,12 +79,15 @@ Requires Python 3.10+

#### Clone from github <a name = "clone"></a>

Requires Python 3.10+
Requires Python *3.10+

- Clone the Subsearch repository by running `git clone https://github.com/vagabondHustler/subsearch.git`.
- Install Subsearch by running `pip install -e .` or `pip install -e .[build,lint,tests,tools,type]` for optional dependencies.
- Install Subsearch by running `pip install -e .` or *`pip install -e .[build,lint,tests,tools,type]` for optional dependencies.
- Build the executable and MSI installer by running `python -m tools.cx_freeze_build bdist_msi`.

> [!IMPORTANT]
> ###### For python 3.12+ use `whl_cp312` instead of `build`, more info [here](https://github.com/marcelotduarte/cx_Freeze/issues/2153).

#### Windows installer <a name = "msi"></a>

Requires windows 10/11, probably works on 8.
Expand All @@ -112,7 +114,6 @@ More about potentially unwanted applications (PUA) can be found [here](https://s

I would like to express my gratitude to the following repositories for providing templates, scripts, inspiration, themes, and solutions to similar problems:


- [zavoloklom/material-design-iconic-font](https://github.com/zavoloklom/material-design-iconic-font) // icons
- [rdbende/Sun-Valley-ttk-theme](https://github.com/rdbende/Sun-Valley-ttk-theme) // base theme
- [TransparentLC](https://github.com/TransparentLC) // spritesheet_generator.js
22 changes: 20 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,27 @@
version = {attr = "subsearch.data.__version__"}

[project.optional-dependencies]
build = ["build==1.0.3", "cx_Freeze==6.15.12", "twine==4.0.2", "psutil==5.9.7"]
build = [
"build==1.0.3",
"cx_Freeze==6.15.12",
"twine==4.0.2",
"psutil==5.9.7",
]
whl_cp312 = [
"build==1.0.3",
"cx_Freeze @ https://marcelotduarte.github.io/packages/cx-freeze/cx_Freeze-6.16.0.dev13-cp312-cp312-win_amd64.whl",
"cx_Logging @ https://marcelotduarte.github.io/packages/cx-logging/cx_Logging-3.1.0-cp312-cp312-win_amd64.whl",
"lief @ https://marcelotduarte.github.io/packages/lief/lief-0.14.0-cp312-cp312-win_amd64.whl",
"twine==4.0.2",
"psutil==5.9.7",
]
lint = ["black==23.12.1", "isort==5.13.2"]
tests = ["pytest-cov==4.1.0", "pytest==7.4.4", "tox==4.12.1", "python-dotenv==1.0.0"]
tests = [
"pytest-cov==4.1.0",
"pytest==7.4.4",
"tox==4.12.1",
"python-dotenv==1.0.0",
]
tools = ["pyperclip==1.8.2"]
type = ["mypy==1.8.0"]

Expand Down
10 changes: 5 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ minversion = 4.0
env_list =
py310
py311
; py312
py312
labels =
test = py310, py311

[gh-actions]
python =
3.10: py310
3.11: py311
; 3.12: py312
3.12: py312

[testenv]
description = run the test suite with pytest
Expand All @@ -27,6 +27,6 @@ commands = pytest --cov
description = Python 3.11
commands = pytest --cov

; [testenv:py312]
; description = Python 3.12
; commands = pytest --cov
[testenv:py312]
description = Python 3.12
commands = pytest --cov
Loading