diff --git a/Pipfile.lock b/Pipfile.lock index b074956..a777762 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "f018bc2d21d6dc296af872daca484440360496dc7fd3746880da2fe2996ed0ce" + "sha256": "ffa02059c0bee3c21617e14fe892e9988a2b0be10ad1f440a352922d21fb5ede" }, "pipfile-spec": 6, "requires": { @@ -354,22 +354,23 @@ "version": "==0.6.0" }, "urllib3": { + "extras": [], + "hashes": [ + "sha256:91056c15fa70756691db97756772bb1eb9678fa585d9184f24534b100dc60f4a", + "sha256:e7983572181f5e1522d9c98453462384ee92a0be7fac5f1413a1e35c56cc0461" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", + "version": "==1.25.10" + }, + "webencodings": { "editable": true, "extras": [ "chromecast", "keyring", "server" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", "path": "." }, - "webencodings": { - "hashes": [ - "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78", - "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923" - ], - "version": "==0.5.1" - }, "zeroconf": { "hashes": [ "sha256:c08dbb90c116626cb6c5f19ebd14cd4846cffe7151f338c19215e6938d334980", @@ -825,6 +826,14 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==2.24.0" }, + "requirements-parser": { + "hashes": [ + "sha256:5963ee895c2d05ae9f58d3fc641082fb38021618979d6a152b6b1398bd7d4ed4", + "sha256:76650b4a9d98fc65edf008a7920c076bb2a76c08eaae230ce4cfc6f51ea6a773" + ], + "index": "pypi", + "version": "==0.2.0" + }, "rope": { "hashes": [ "sha256:658ad6705f43dcf3d6df379da9486529cf30e02d9ea14c5682aa80eb33b649e1" @@ -967,14 +976,13 @@ "version": "==3.7.4.3" }, "urllib3": { - "editable": true, - "extras": [ - "chromecast", - "keyring", - "server" + "extras": [], + "hashes": [ + "sha256:91056c15fa70756691db97756772bb1eb9678fa585d9184f24534b100dc60f4a", + "sha256:e7983572181f5e1522d9c98453462384ee92a0be7fac5f1413a1e35c56cc0461" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", - "path": "." + "version": "==1.25.10" } } } diff --git a/cicd/flatpak-build/Dockerfile b/cicd/flatpak-build/Dockerfile index 050074f..2b17e96 100644 --- a/cicd/flatpak-build/Dockerfile +++ b/cicd/flatpak-build/Dockerfile @@ -11,7 +11,7 @@ RUN dnf -y update && \ RUN flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo -RUN flatpak install -y org.gnome.Platform//3.36 && \ - flatpak install -y org.gnome.Sdk//3.36 +RUN flatpak install -y org.gnome.Platform//3.38 && \ + flatpak install -y org.gnome.Sdk//3.38 RUN pip3 install requirements-parser diff --git a/flatpak/app.sublimemusic.SublimeMusic.json b/flatpak/app.sublimemusic.SublimeMusic.json index 8033b44..98b2fac 100644 --- a/flatpak/app.sublimemusic.SublimeMusic.json +++ b/flatpak/app.sublimemusic.SublimeMusic.json @@ -1,7 +1,7 @@ { "app-id": "app.sublimemusic.SublimeMusic", "runtime": "org.gnome.Platform", - "runtime-version": "3.36", + "runtime-version": "3.38", "sdk": "org.gnome.Sdk", "command": "sublime-music", "rename-icon": "sublime-music", @@ -74,51 +74,6 @@ } ], "modules": [ - { - "name": "python-3.8", - "sources": [ - { - "type": "archive", - "url": "https://www.python.org/ftp/python/3.8.5/Python-3.8.5.tar.xz", - "sha256": "e3003ed57db17e617acb382b0cade29a248c6026b1bd8aad1f976e9af66a83b0" - } - ], - "config-opts": [ - "--enable-shared", - "--with-ensurepip=yes", - "--with-system-expat", - "--with-system-ffi", - "--enable-loadable-sqlite-extensions", - "--with-dbmliborder=gdbm", - "--enable-unicode=ucs4" - ], - "post-install": [ - "chmod 644 $FLATPAK_DEST/lib/libpython3.8.so.1.0" - ], - "cleanup": [ - "/bin/2to3*", - "/bin/easy_install*", - "/bin/idle*", - "/bin/pydoc*", - "/bin/python*-config", - "/bin/pyvenv*", - "/include", - "/lib/pkgconfig", - "/lib/python*/config", - "/share", - "/lib/python*/test", - "/lib/python*/*/test", - "/lib/python*/*/tests", - "/lib/python*/lib-tk/test", - "/lib/python*/lib-dynload/_*_test.*.so", - "/lib/python*/lib-dynload/_test*.*.so", - "/lib/python*/idlelib", - "/lib/python*/tkinter*", - "/lib/python*/turtle*", - "/lib/python*/lib2to3*", - "/lib/python3.8/config/libpython3.8.a" - ] - }, "pypi-dependencies.json", { "name": "libmpv", diff --git a/flatpak/flatpak-requirements.txt b/flatpak/flatpak-requirements.txt index d9d979f..0de36c7 100644 --- a/flatpak/flatpak-requirements.txt +++ b/flatpak/flatpak-requirements.txt @@ -1,22 +1,25 @@ +bleach==3.2.1 bottle==0.12.18 casttube==0.2.1 certifi==2020.6.20 chardet==3.0.4 -dataclasses-json==0.5.1 +dataclasses-json==0.5. deepdiff==5.0.2 fuzzywuzzy==0.18.0 idna==2.10 ifaddr==0.1.7 jeepney==0.4.3 marshmallow-enum==1.5.1 -marshmallow==3.7.1 +marshmallow==3.8.0 mypy-extensions==0.4.3 ordered-set==4.0.2 +packaging==20.4 peewee==3.13.3 -protobuf==3.12.2 +protobuf==3.13.0 pycairo==1.19.1 -pychromecast==7.1.2 +pychromecast==7.3.0 pycparser==2.20 +pyparsing==2.4.7 python-dateutil==2.8.1 python-levenshtein==0.12.0 python-mpv==0.5.2 @@ -24,7 +27,6 @@ requests==2.24.0 semver==2.10.2 six==1.15.0 stringcase==1.2.0 -typing-extensions==3.7.4.2 typing-inspect==0.6.0 urllib3==1.25.10 -zeroconf==0.28.0 +zeroconf==0.28.5 diff --git a/flatpak/flatpak_build.sh b/flatpak/flatpak_build.sh index 886e7a9..96308a7 100755 --- a/flatpak/flatpak_build.sh +++ b/flatpak/flatpak_build.sh @@ -7,8 +7,8 @@ APPID=app.sublimemusic.SublimeMusic # TODO move these to the Docker container pip3 install requirements-parser -flatpak install -y org.gnome.Platform//3.36 -flatpak install -y org.gnome.Sdk//3.36 +flatpak install -y org.gnome.Platform//3.38 +flatpak install -y org.gnome.Sdk//3.38 rm -rf flatpak-builder-tools git clone https://github.com/flatpak/flatpak-builder-tools.git