From f3d05f7efcb4fb03573fb4b529f5ec597c4dc647 Mon Sep 17 00:00:00 2001 From: delewer <108271242+IMDelewer@users.noreply.github.com> Date: Mon, 23 Mar 2026 13:09:30 +0700 Subject: [PATCH] chore: pyproject optimization (#292) --- .github/workflows/build.yml | 8 +++--- README.md | 15 +++-------- proxy/__init__.py | 2 +- pyproject.toml | 54 +++++++++++-------------------------- 4 files changed, 25 insertions(+), 54 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0cb1ffa..ce7bc08 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: cache: "pip" - name: Install dependencies - run: pip install ".[win10]" + run: pip install . - name: Install pyinstaller run: pip install "pyinstaller==6.13.0" @@ -62,7 +62,7 @@ jobs: cache: "pip" - name: Install dependencies (Win7-compatible) - run: pip install ".[win7]" + run: pip install . - name: Install pyinstaller run: pip install "pyinstaller==5.13.2" @@ -174,7 +174,7 @@ jobs: -w wheelhouse/universal2 python3.12 -m pip install --no-deps wheelhouse/universal2/*.whl - python3.12 -m pip install ".[macos]" + python3.12 -m pip install . python3.12 -m pip install pyinstaller==6.13.0 - name: Create macOS icon from ICO @@ -276,7 +276,7 @@ jobs: - name: Install dependencies run: | .venv/bin/pip install --upgrade pip - .venv/bin/pip install ".[linux]" + .venv/bin/pip install . .venv/bin/pip install "pyinstaller==6.13.0" - name: Build binary with PyInstaller diff --git a/README.md b/README.md index 6b90841..a44043b 100644 --- a/README.md +++ b/README.md @@ -91,31 +91,24 @@ pip install -e . tg-ws-proxy ``` -### Windows 10+ +### Windows 7/10+ ```bash -pip install -e ".[win10]" -tg-ws-proxy-tray-win -``` - -### Windows 7 - -```bash -pip install -e ".[win7]" +pip install -e . tg-ws-proxy-tray-win ``` ### macOS ```bash -pip install -e ".[macos]" +pip install -e . tg-ws-proxy-tray-macos ``` ### Linux ```bash -pip install -e ".[linux]" +pip install -e . tg-ws-proxy-tray-linux ``` diff --git a/proxy/__init__.py b/proxy/__init__.py index f74f503..9e2406e 100644 --- a/proxy/__init__.py +++ b/proxy/__init__.py @@ -1 +1 @@ -__version__ = "1.1.3" \ No newline at end of file +__version__ = "1.3.0" \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index bbd9c1a..0524036 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,59 +18,37 @@ authors = [ keywords = [ "telegram", + "tdesktop", "proxy", - "websocket" + "bypass", + "websocket", + "socks5", ] classifiers = [ "Development Status :: 5 - Production/Stable", "Environment :: Console", - "Environment :: MacOS X :: Cocoa", - "Environment :: Win32 (MS Windows)", - "Environment :: X11 Applications :: GTK", "Intended Audience :: Customer Service", "Programming Language :: Python :: 3", "License :: OSI Approved :: MIT License", - "Operating System :: MacOS :: MacOS X", - "Operating System :: Microsoft :: Windows", - "Operating System :: POSIX :: Linux", + "Operating System :: OS Independent", "Topic :: System :: Networking :: Firewalls", ] dependencies = [ + "pyperclip==1.9.0", + + "psutil==5.9.8; platform_system == 'Windows' and python_version < '3.9'", "cryptography==41.0.7; platform_system == 'Windows' and python_version < '3.9'", + "Pillow==10.4.0; platform_system == 'Windows' and python_version < '3.9'", + + "psutil==7.0.0; platform_system != 'Windows' or python_version >= '3.9'", "cryptography==46.0.5; platform_system != 'Windows' or python_version >= '3.9'", -] + "Pillow==12.1.1; (platform_system != 'Windows' or python_version >= '3.9') and platform_system != 'Darwin'", -[project.optional-dependencies] -win7 = [ - "customtkinter==5.2.2", - "Pillow==10.4.0", - "psutil==5.9.8", - "pystray==0.19.5", - "pyperclip==1.9.0", -] - -win10 = [ - "customtkinter==5.2.2", - "Pillow==12.1.1", - "psutil==7.0.0", - "pystray==0.19.5", - "pyperclip==1.9.0", -] - -macos = [ - "Pillow==12.1.0", - "psutil==7.0.0", - "pyperclip==1.9.0", - "rumps==0.4.0", -] - -linux = [ - "customtkinter==5.2.2", - "Pillow==12.1.1", - "psutil==7.0.0", - "pystray==0.19.5", - "pyperclip==1.9.0", + "customtkinter==5.2.2; platform_system != 'Darwin'", + "pystray==0.19.5; platform_system != 'Darwin'", + "rumps==0.4.0; platform_system == 'Darwin'", + "Pillow==12.1.0; platform_system == 'Darwin'", ] [project.scripts]