Start upgrading snap, but still working on PySide6/Qt6

This commit is contained in:
Micah Lee 2023-09-05 15:45:04 -07:00
parent 82369d9576
commit 7b40bf8d5f
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
2 changed files with 20 additions and 12 deletions

View File

@ -78,7 +78,16 @@ In `snap/snapcraft.yaml`:
- [ ] The `tor`, `libevent`, `obfs4`, `snowflake-client`, and `meek-client` parts should be updated if necessary - [ ] The `tor`, `libevent`, `obfs4`, `snowflake-client`, and `meek-client` parts should be updated if necessary
- [ ] In the `onionshare` part, in the `override-pull` section, all of the dependencies in the `requirements.txt` file should match the dependencies listed in `cli/pyproject.toml` and `desktop/pyproject.toml`, with the exception of PySide2 - [ ] In the `onionshare` part, in the `override-pull` section, all of the dependencies in the `requirements.txt` file should match the dependencies listed in `cli/pyproject.toml` and `desktop/pyproject.toml`, with the exception of PySide2
- [ ] With every commit to the `main` branch, Snapcraft's CI should trigger builds. Make sure the builds all succeeded at https://snapcraft.io/onionshare/builds (you must be logged in), and test them. You can install them with: `snap install onionshare --edge`
To test locally:
- Install snapcraft with: `sudo snap install snapcraft --classic`
- Build snap with: `snapcraft`
- Install with: `sudo snap install ./onionshare_${VERSION}_amd64.snap --devmode`
To in the edge branch:
With every commit to the `main` branch, Snapcraft's CI should trigger builds. Make sure the builds all succeeded at https://snapcraft.io/onionshare/builds (you must be logged in), and test them. You can install them with: `snap install onionshare --edge`
### Make sure the Flatpak packaging works ### Make sure the Flatpak packaging works

View File

@ -155,17 +155,15 @@ parts:
- libxslt1.1 - libxslt1.1
- libxtst6 - libxtst6
- qtwayland5 - qtwayland5
- python3-pyside2.qtcore
- python3-pyside2.qtgui
- python3-pyside2.qtwidgets
override-pull: | override-pull: |
snapcraftctl pull snapcraftctl pull
rm pyproject.toml poetry.lock rm pyproject.toml poetry.lock
cat > requirements.txt << EOF cat > requirements.txt << EOF
# onionshare_cli # onionshare_cli
click click
flask==2.0.3 flask==2.3.2
flask-socketio==5.3.1 flask-compress==1.13
flask-socketio==5.3.4
psutil psutil
pysocks pysocks
requests[socks] requests[socks]
@ -177,11 +175,12 @@ parts:
colorama colorama
gevent-websocket gevent-websocket
stem==1.8.1 stem==1.8.1
werkzeug==2.3.4
flask-compress
waitress waitress
werkzeug==2.3.4
# onionshare # onionshare
PySide6==6.5.2
qrcode qrcode
packaging
EOF EOF
override-build: | override-build: |
python3 -m venv $SNAPCRAFT_PART_INSTALL python3 -m venv $SNAPCRAFT_PART_INSTALL
@ -196,8 +195,8 @@ parts:
after: [onionshare-cli] after: [onionshare-cli]
tor: tor:
source: https://dist.torproject.org/tor-0.4.7.12.tar.gz source: https://dist.torproject.org/tor-0.4.8.5.tar.gz
source-checksum: sha256/3b5d969712c467851bd028f314343ef15a97ea457191e93ffa97310b05b9e395 source-checksum: sha256/6957cfd14a29eee7555c52f8387a46f2ce2f5fe7dadf93547f1bc74b1657e119
source-type: tar source-type: tar
plugin: autotools plugin: autotools
autotools-configure-parameters: autotools-configure-parameters:
@ -227,7 +226,7 @@ parts:
- go/latest/stable - go/latest/stable
source: https://git.torproject.org/pluggable-transports/snowflake.git source: https://git.torproject.org/pluggable-transports/snowflake.git
source-type: git source-type: git
source-tag: v2.3.1 source-tag: v2.6.0
organize: organize:
bin/client: bin/snowflake-client bin/client: bin/snowflake-client
@ -237,7 +236,7 @@ parts:
- go/latest/stable - go/latest/stable
source: https://git.torproject.org/pluggable-transports/meek.git source: https://git.torproject.org/pluggable-transports/meek.git
source-type: git source-type: git
source-tag: v0.37.0 source-tag: v0.38.0
override-build: | override-build: |
cd meek-client cd meek-client
mkdir -p /build/onionshare/meek-client/install/bin mkdir -p /build/onionshare/meek-client/install/bin