diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ac4287b..0062a84 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,37 +65,6 @@ jobs: path: | dist_actions/Syncplay_${{ env.VER }}.dmg - snapcraft: - name: Build Snap - runs-on: ubuntu-18.04 - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Install Snapcraft with LXD - uses: samuelmeuli/action-snapcraft@v1 - with: - use_lxd: true - - - name: Build - run: sg lxd -c 'snapcraft --use-lxd' - - - name: Prepare for deployment - run: | - ls -al - export VER="$(cat syncplay/__init__.py | awk '/version/ {gsub("\047", "", $3); print $NF}')" - echo "VER=$VER" >> $GITHUB_ENV - mkdir dist_actions - mv syncplay_build_amd64.snap dist_actions/syncplay_${VER}_amd64.snap - ls -al dist_actions - - - name: Deploy - uses: actions/upload-artifact@v2 - with: - name: syncplay_${{ env.VER }}_amd64.snap - path: | - dist_actions/syncplay_${{ env.VER }}_amd64.snap - appimage: name: Build AppImage runs-on: ubuntu-latest diff --git a/setup.py b/setup.py index 2ddc616..63bfc57 100644 --- a/setup.py +++ b/setup.py @@ -9,11 +9,8 @@ def read(fname): with open(fname, 'r') as f: return f.read() -if os.getenv('SNAPCRAFT_PART_BUILD', None) is not None: - installRequirements = ["pyasn1"] + read('requirements.txt').splitlines() -else: - installRequirements = read('requirements.txt').splitlines() +\ - read('requirements_gui.txt').splitlines() +installRequirements = read('requirements.txt').splitlines() +\ + read('requirements_gui.txt').splitlines() setuptools.setup( name="syncplay", @@ -55,7 +52,7 @@ setuptools.setup( "Natural Language :: German", "Natural Language :: Italian", "Natural Language :: Russian", - "Natural Language :: Spanish", + "Natural Language :: Spanish", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", diff --git a/snapcraft.yaml b/snapcraft.yaml deleted file mode 100644 index 0088292..0000000 --- a/snapcraft.yaml +++ /dev/null @@ -1,64 +0,0 @@ -name: syncplay -summary: Syncplay -version: build -adopt-info: syncplay -summary: Client/server to synchronize media playback on many computers -description: | - Syncplay synchronises the position and play state of multiple media players - so that the viewers can watch the same thing at the same time. This means that - when one person pauses/unpauses playback or seeks (jumps position) within their - media player then this will be replicated across all media players connected to - the same server and in the same 'room' (viewing session). When a new person - joins they will also be synchronised. Syncplay also includes text-based chat so - you can discuss a video as you watch it (or you could use third-party Voice over - IP software to talk over a video). - -confinement: classic -icon: syncplay/resources/syncplay.png -grade: stable -base: core18 - -apps: - syncplay: - command: python3 $SNAP/bin/syncplay - desktop: lib/python3.6/site-packages/syncplay/resources/syncplay.desktop - environment: - LIBGL_DRIVERS_PATH: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/dri - - syncplay-server: - command: bin/syncplay-server - desktop: lib/python3.6/site-packages/syncplay/resources/syncplay-server.desktop - -parts: - syncplay: - plugin: python - python-version: python3 - source: . - stage-packages: - - libnss3 - - libxcomposite1 - - libxcursor1 - - libxtst6 - - libxrandr2 - - libglu1-mesa - - libgles2-mesa - - fontconfig - - libxkbcommon0 - - libxkbcommon-x11-0 - - libxi6 - - libegl1 - - shared-mime-info - - libgdk-pixbuf2.0-0 - - locales-all - - libxslt1.1 - - xfonts-base - - xfonts-scalable - python-packages: - - pyside2 - override-pull: | - snapcraftctl pull - snapcraftctl set-version $(cat syncplay/__init__.py | awk '/version/ {gsub("\047", "", $3); print $NF}') - -layout: - /etc/fonts: - bind: $SNAP/pyside/etc/fonts