From 7e2c1da1d20c7132b056e2b34d1520a4888a9b29 Mon Sep 17 00:00:00 2001 From: Srevin Saju Date: Thu, 24 Sep 2020 18:43:14 +0300 Subject: [PATCH] chore: release v4.7.3 :tada: --- guiscrcpy/version.py | 2 +- setup.py | 67 ++++++++++++++++++------------------- snap/snapcraft.yaml | 80 +++++++++++++++++++++++--------------------- 3 files changed, 75 insertions(+), 74 deletions(-) diff --git a/guiscrcpy/version.py b/guiscrcpy/version.py index a9be753a..0fa7d464 100644 --- a/guiscrcpy/version.py +++ b/guiscrcpy/version.py @@ -20,4 +20,4 @@ """ -VERSION = 'v4.7.3' +VERSION = "v4.7.3" diff --git a/setup.py b/setup.py index 0a81eeaa..c9ff7ecf 100755 --- a/setup.py +++ b/setup.py @@ -19,61 +19,60 @@ along with this program. If not, see . """ -import os -import platform -from setuptools import find_packages from setuptools import setup +from setuptools import find_packages +import os +import platform try: this_directory = os.path.abspath(os.path.dirname(__file__)) - with open(os.path.join(this_directory, "README.md"), - encoding="utf-8") as f: + with open( + os.path.join(this_directory, 'README.md'), + encoding='utf-8' + ) as f: long_description = f.read() except FileNotFoundError: - long_description = "Open Source Android Screen Mirroring System by @srevinsaju" + long_description = \ + "Open Source Android Screen Mirroring System by @srevinsaju" -requirements = ["PyQt5>=5.14,<5.16", "pynput", "qtpy", "click", "colorama"] -if platform.system() == "Windows": - requirements.extend(["pywin32", "psutil"]) -elif platform.system() == "Linux": - requirements.extend(["psutil", "cairosvg"]) +requirements = ['PyQt5>=5.14,<5.16', 'pynput', 'qtpy', 'click', 'colorama'] +if platform.system() == 'Windows': + requirements.extend(['pywin32', 'psutil']) +elif platform.system() == 'Linux': + requirements.extend(['psutil', 'cairosvg']) data_files = [ - ("share/applications", ["guiscrcpy.desktop"]), - ("share/icons/hicolor/scalable/apps", ["appimage/guiscrcpy.png"]), -] + ('share/applications', ['guiscrcpy.desktop']), + ('share/icons/hicolor/scalable/apps', ['appimage/guiscrcpy.png']), + ] setup( - name='guiscrcpy', - version='v4.7.3', - description='An Open Source - Fast - Android Screen Mirroring system.', + name="guiscrcpy", + version="v4.7.3", + description="An Open Source - Fast - Android Screen Mirroring system.", long_description=long_description, - long_description_content_type="text/markdown", - license="GPL v3", - author="srevinsaju", + long_description_content_type='text/markdown', + license='GPL v3', + author='srevinsaju', author_email="srevin03@gmail.com", packages=find_packages(), data_files=data_files, - extras_require={ - "pyqt5": "PyQt5", - "pyside2": "PySide2" - }, + extras_require={'pyqt5': 'PyQt5', 'pyside2': 'PySide2'}, url="https://srevinsaju.github.io/guiscrcpy", download_url="https://github.com/srevinsaju/guiscrcpy/archive/master.zip", include_package_data=True, install_requires=requirements, scripts=["scripts/guiscrcpy"], - entry_points={"console_scripts": - ["guiscrcpy = guiscrcpy.cli:cli"]}, # noqa: E501 + entry_points={'console_scripts': ['guiscrcpy = guiscrcpy.cli:cli']}, # noqa: E501 classifiers=[ - "Operating System :: OS Independent", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.8", - "Operating System :: MacOS :: MacOS X", - "Operating System :: Microsoft :: Windows", - "Operating System :: POSIX", - "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", + 'Operating System :: OS Independent', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.8', + 'Operating System :: MacOS :: MacOS X', + 'Operating System :: Microsoft :: Windows', + 'Operating System :: POSIX', + 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)' ], ) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 4070125a..592b2f9e 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -2,15 +2,15 @@ name: guiscrcpy version: v4.7.3 summary: An opensource GUI for android screen mirroring description: | - A full fledged GUI integration for the award winning open source scrcpy, for + A full fledged GUI integration for the award winning open source scrcpy, for Android Screen mirroring -grade: stable -confinement: strict +grade: stable +confinement: strict base: core18 architectures: - - build-on: amd64 +- build-on: amd64 apps: scrcpy: @@ -21,83 +21,85 @@ apps: LIBGL_DRIVERS_PATH: "$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/dri" SCRCPY_SERVER_PATH: "$SNAP/usr/local/share/scrcpy/scrcpy-server" - adb: + adb: command: usr/bin/adb environment: LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/android/" guiscrcpy: command: bin/guiscrcpy - environment: + environment: PATH: $SNAP/lib:$SNAP/usr/lib:$SNAP/bin:$SNAP/usr/bin:$SNAP/usr/local/bin:$PATH GUISCRCPY_SCRCPY: "$SNAP/usr/local/bin/scrcpy" GUISCRCPY_ADB: "$SNAP/usr/bin/adb" SCRCPY_SERVER_PATH: "$SNAP/usr/local/share/scrcpy/scrcpy-server" GUISCRCPY_SNAP: "TRUE" command-chain: &command-chain-common - - bin/debian-multiarch-triplet-provider-launch - - bin/classic-launch - - bin/desktop-launch - - bin/guiscrcpy + - bin/debian-multiarch-triplet-provider-launch + - bin/classic-launch + - bin/desktop-launch + - bin/guiscrcpy desktop: share/applications/guiscrcpy.desktop parts: + debian-multiarch-triplet-provider-launch: plugin: nil stage-snaps: - - debian-multiarch-triplet-provider-launch + - debian-multiarch-triplet-provider-launch classic-launch: plugin: nil stage-snaps: - - classic-launch + - classic-launch # Remote part for support of various desktop technologies # Refer: https://github.com/ubuntu/snapcraft-desktop-helpers/blob/master/snapcraft.yaml desktop-qt5: build-packages: - - build-essential - - qtbase5-dev - - dpkg-dev + - build-essential + - qtbase5-dev + - dpkg-dev make-parameters: - - FLAVOR=qt5 + - FLAVOR=qt5 plugin: make source: https://github.com/ubuntu/snapcraft-desktop-helpers.git source-subdir: qt stage-packages: - - libxkbcommon0 - - ttf-ubuntu-font-family - - dmz-cursor-theme - - light-themes - - adwaita-icon-theme - - gnome-themes-standard - - shared-mime-info - - libqt5gui5 - - libgdk-pixbuf2.0-0 - - libqt5svg5 - - try: - - appmenu-qt5 - - locales-all - - xdg-user-dirs - - fcitx-frontend-qt5 + - libxkbcommon0 + - ttf-ubuntu-font-family + - dmz-cursor-theme + - light-themes + - adwaita-icon-theme + - gnome-themes-standard + - shared-mime-info + - libqt5gui5 + - libgdk-pixbuf2.0-0 + - libqt5svg5 + - try: + - appmenu-qt5 + - locales-all + - xdg-user-dirs + - fcitx-frontend-qt5 scrcpy-server: plugin: nil - override-pull: wget https://github.com/Genymobile/scrcpy/releases/download/v1.15.1/scrcpy-server-v1.15.1 + override-pull: + wget https://github.com/Genymobile/scrcpy/releases/download/v1.15.1/scrcpy-server-v1.15.1 override-build: | mkdir -p $SNAPCRAFT_PART_INSTALL/usr/local/share/scrcpy/ cp scrcpy-server-v1.15.1 $SNAPCRAFT_PART_INSTALL/usr/local/share/scrcpy/scrcpy-server scrcpy: source: https://github.com/Genymobile/scrcpy.git plugin: meson - meson-parameters: + meson-parameters: - --buildtype=release - - --strip + - --strip - -Db_lto=true - -Dcompile_server=false override-pull: | - snapcraftctl pull - snapcraftctl set-version $(git describe --tag) + snapcraftctl pull + snapcraftctl set-version $(git describe --tag) build-packages: - make - gcc @@ -117,8 +119,7 @@ parts: - adb guiscrcpy: - after: - [desktop-qt5, classic-launch, debian-multiarch-triplet-provider-launch] + after: [desktop-qt5, classic-launch, debian-multiarch-triplet-provider-launch] # See 'snapcraft plugins' plugin: python python-version: python3 @@ -139,5 +140,6 @@ plugs: adb: interface: content target: $SNAP/usr/bin + # some parts are inherited from https://github.com/sisco311/scrcpy-snap/blob/master/snap/snapcraft.yaml -# Thanks @sisco311 for the amazing snap!! +# Thanks @sisco311 for the amazing snap!!