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

Fix PyInstaller conflicts #108

Merged
merged 3 commits into from
Feb 2, 2025
Merged

Conversation

Game4Move78
Copy link
Contributor

@Game4Move78 Game4Move78 commented Feb 2, 2025

Project specifies a Python version range of >=3.8,<4.0, but PyInstaller requires >=3.8, <3.13 or >=3.8, <3.14 depending on the version.

To avoid the following conflict:

The current project's supported Python range (>=3.8,<4.0) is not compatible with some of the required packages Python requirement:
  - pyinstaller requires Python <3.13,>=3.8, so it will not be satisfied for Python >=3.13,<4.0
  - pyinstaller requires Python <3.14,>=3.8, so it will not be satisfied for Python >=3.14,<4.0
  - pyinstaller requires Python <3.13,>=3.8, so it will not be satisfied for Python >=3.13,<4.0
  - pyinstaller requires Python <3.13,>=3.8, so it will not be satisfied for Python >=3.13,<4.0
  - pyinstaller requires Python <3.13,>=3.8, so it will not be satisfied for Python >=3.13,<4.0
  - pyinstaller requires Python <3.14,>=3.8, so it will not be satisfied for Python >=3.14,<4.0
  - pyinstaller requires Python <3.14,>=3.8, so it will not be satisfied for Python >=3.14,<4.0

Related to PR ActivityWatch/aw-qt#106.


Important

Update python_version in pyproject.toml to resolve PyInstaller conflicts.

  • Compatibility:
    • Updates python_version in [tool.mypy] to ^3.8,<3.14 in pyproject.toml to resolve conflicts with PyInstaller's Python version requirements.
  • Context:

This description was created by Ellipsis for a0fd126. It will automatically update as commits are pushed.

Copy link

@ellipsis-dev ellipsis-dev bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ Changes requested. Reviewed everything up to a0fd126 in 35 seconds

More details
  • Looked at 13 lines of code in 1 files
  • Skipped 0 files when reviewing.
  • Skipped posting 0 drafted comments based on config settings.

Workflow ID: wflow_ujAb8Sru0yH78F26


Want Ellipsis to fix these issues? Tag @ellipsis-dev in a comment. You can customize Ellipsis with 👍 / 👎 feedback, review rules, user-specific overrides, quiet mode, and more.

pyproject.toml Outdated
@@ -39,7 +39,7 @@ pyinstaller = ">=6.6"
types-click = "*"

[tool.mypy]
python_version = 3.8
python_version = "^3.8,<3.14" # PyInstaller needs <3.14
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The python_version field in mypy should specify a single version, not a range. Consider setting it to a specific version like 3.8.

@Game4Move78 Game4Move78 force-pushed the patch-2 branch 3 times, most recently from f96973b to de80e98 Compare February 2, 2025 16:13
@ErikBjare ErikBjare merged commit 143a62d into ActivityWatch:master Feb 2, 2025
3 checks passed
@ErikBjare
Copy link
Member

Thanks!

@Game4Move78
Copy link
Contributor Author

Game4Move78 commented Feb 2, 2025

One more issue. The lock file as it is will throw errors with Python 3.13.1 due to rpds-py being set to version 0.18.1 which seems to pull in an older version of PyO3, which added Python 3.13 support in v0.22.5

error: the configured Python interpreter version (3.13) is newer than PyO3's maximum supported version (3.12)

Running poetry update rpds-py to update rpds-py to 0.20.1 and then regenerating the lockfile fixes this.

@ErikBjare
Copy link
Member

Cleaning up all that stuff today, thanks for the report!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants