From 08d15fd3f11eb871dd124f0bb1dd1fefd263595a Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Mon, 31 May 2021 10:36:07 -0700 Subject: Update version strings, docs, and release.md for version 2.3.2 --- RELEASE.md | 3 ++- cli/onionshare_cli/resources/version.txt | 2 +- desktop/pyproject.toml | 2 +- desktop/src/org.onionshare.OnionShare.appdata.xml | 4 ++-- desktop/src/setup.py | 2 +- docs/gettext/.doctrees/advanced.doctree | Bin 30414 -> 30413 bytes docs/gettext/.doctrees/develop.doctree | Bin 37737 -> 37736 bytes docs/gettext/.doctrees/environment.pickle | Bin 37844 -> 37841 bytes docs/gettext/.doctrees/features.doctree | Bin 47170 -> 47169 bytes docs/gettext/.doctrees/help.doctree | Bin 7680 -> 7679 bytes docs/gettext/.doctrees/index.doctree | Bin 3440 -> 3439 bytes docs/gettext/.doctrees/install.doctree | Bin 20614 -> 20613 bytes docs/gettext/.doctrees/security.doctree | Bin 13527 -> 13526 bytes docs/gettext/.doctrees/tor.doctree | Bin 30115 -> 30114 bytes docs/gettext/advanced.pot | 2 +- docs/gettext/develop.pot | 2 +- docs/gettext/features.pot | 2 +- docs/gettext/help.pot | 2 +- docs/gettext/index.pot | 2 +- docs/gettext/install.pot | 2 +- docs/gettext/security.pot | 2 +- docs/gettext/sphinx.pot | 2 +- docs/gettext/tor.pot | 2 +- snap/snapcraft.yaml | 15 +++++++++------ 24 files changed, 25 insertions(+), 21 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index e69a8184..72cef7dd 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -14,7 +14,7 @@ Before making a release, you must update the version in these places: - [ ] `docs/source/conf.py` (`version` at the top, and the `versions` list too) - [ ] `snap/snapcraft.yaml` -If you update flask-socketio, ensure that you also update the [socket.io.min.js](https://github.com/micahflee/onionshare/blob/develop/cli/onionshare_cli/resources/static/js/socket.io.min.js) file to a version that is [supported](https://flask-socketio.readthedocs.io/en/latest/#version-compatibility) by the updated version of flask-socketio. +If you update `flask-socketio`, ensure that you also update the [socket.io.min.js](https://github.com/micahflee/onionshare/blob/develop/cli/onionshare_cli/resources/static/js/socket.io.min.js) file to a version that is [supported](https://flask-socketio.readthedocs.io/en/latest/#version-compatibility) by the updated version of `flask-socketio`. Use tor binaries from the latest Tor Browser: @@ -28,6 +28,7 @@ Update the documentation: Finalize localization: - [ ] Merge all the translations from weblate +- [ ] In `docs` run `poetry run ./check-weblate.py [API_KEY]` to see which translations are >90% in the app and docs - [ ] Edit `cli/onionshare_cli/settings.py`, make sure `self.available_locales` lists only locales that are >90% translated - [ ] Edit `docs/source/conf.py`, make sure `languages` lists only languages that are >90% translated - [ ] Edit `docs/build.sh` and make sure `LOCALES=` lists the same languages as above, in `docs/source/conf.py` diff --git a/cli/onionshare_cli/resources/version.txt b/cli/onionshare_cli/resources/version.txt index 4ba9db07..e7034819 100644 --- a/cli/onionshare_cli/resources/version.txt +++ b/cli/onionshare_cli/resources/version.txt @@ -1 +1 @@ -2.3.2.dev1 \ No newline at end of file +2.3.2 \ No newline at end of file diff --git a/desktop/pyproject.toml b/desktop/pyproject.toml index 3b31a1bd..a39aa94d 100644 --- a/desktop/pyproject.toml +++ b/desktop/pyproject.toml @@ -1,7 +1,7 @@ [tool.briefcase] project_name = "OnionShare" bundle = "org.onionshare" -version = "2.3.2.dev1" +version = "2.3.2" url = "https://onionshare.org" license = "GPLv3" author = 'Micah Lee' diff --git a/desktop/src/org.onionshare.OnionShare.appdata.xml b/desktop/src/org.onionshare.OnionShare.appdata.xml index 049609ee..5ae702ff 100644 --- a/desktop/src/org.onionshare.OnionShare.appdata.xml +++ b/desktop/src/org.onionshare.OnionShare.appdata.xml @@ -13,7 +13,7 @@ org.onionshare.OnionShare.desktop - https://raw.githubusercontent.com/micahflee/onionshare/master/docs/source/_static/screenshots/tabs.png + https://docs.onionshare.org/2.3.2/en/_images/tabs.png Types of services that OnionShare supports @@ -24,6 +24,6 @@ micah@micahflee.com - + diff --git a/desktop/src/setup.py b/desktop/src/setup.py index 82a5f98a..060fa93c 100644 --- a/desktop/src/setup.py +++ b/desktop/src/setup.py @@ -20,7 +20,7 @@ along with this program. If not, see . """ import setuptools -version = "2.3.1" +version = "2.3.2" setuptools.setup( name="onionshare", diff --git a/docs/gettext/.doctrees/advanced.doctree b/docs/gettext/.doctrees/advanced.doctree index 0b23bda0..29e035cc 100644 Binary files a/docs/gettext/.doctrees/advanced.doctree and b/docs/gettext/.doctrees/advanced.doctree differ diff --git a/docs/gettext/.doctrees/develop.doctree b/docs/gettext/.doctrees/develop.doctree index 45a2d587..5a17cbfd 100644 Binary files a/docs/gettext/.doctrees/develop.doctree and b/docs/gettext/.doctrees/develop.doctree differ diff --git a/docs/gettext/.doctrees/environment.pickle b/docs/gettext/.doctrees/environment.pickle index ba79cd05..4263632b 100644 Binary files a/docs/gettext/.doctrees/environment.pickle and b/docs/gettext/.doctrees/environment.pickle differ diff --git a/docs/gettext/.doctrees/features.doctree b/docs/gettext/.doctrees/features.doctree index 9411a3a0..00a9a3ba 100644 Binary files a/docs/gettext/.doctrees/features.doctree and b/docs/gettext/.doctrees/features.doctree differ diff --git a/docs/gettext/.doctrees/help.doctree b/docs/gettext/.doctrees/help.doctree index bfb05b4f..d5c54b91 100644 Binary files a/docs/gettext/.doctrees/help.doctree and b/docs/gettext/.doctrees/help.doctree differ diff --git a/docs/gettext/.doctrees/index.doctree b/docs/gettext/.doctrees/index.doctree index 0907fdee..173f9f45 100644 Binary files a/docs/gettext/.doctrees/index.doctree and b/docs/gettext/.doctrees/index.doctree differ diff --git a/docs/gettext/.doctrees/install.doctree b/docs/gettext/.doctrees/install.doctree index 6c9b9ade..2c4cbb22 100644 Binary files a/docs/gettext/.doctrees/install.doctree and b/docs/gettext/.doctrees/install.doctree differ diff --git a/docs/gettext/.doctrees/security.doctree b/docs/gettext/.doctrees/security.doctree index 48200490..ed5e9f68 100644 Binary files a/docs/gettext/.doctrees/security.doctree and b/docs/gettext/.doctrees/security.doctree differ diff --git a/docs/gettext/.doctrees/tor.doctree b/docs/gettext/.doctrees/tor.doctree index 332a20d0..8bbdadd5 100644 Binary files a/docs/gettext/.doctrees/tor.doctree and b/docs/gettext/.doctrees/tor.doctree differ diff --git a/docs/gettext/advanced.pot b/docs/gettext/advanced.pot index ecb4bcc9..78bc92ca 100644 --- a/docs/gettext/advanced.pot +++ b/docs/gettext/advanced.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OnionShare 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 11:33-0400\n" +"POT-Creation-Date: 2021-05-31 10:12-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/docs/gettext/develop.pot b/docs/gettext/develop.pot index 3822530c..57cfdb8e 100644 --- a/docs/gettext/develop.pot +++ b/docs/gettext/develop.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OnionShare 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 11:33-0400\n" +"POT-Creation-Date: 2021-05-31 10:12-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/docs/gettext/features.pot b/docs/gettext/features.pot index 0ca234b0..32470e11 100644 --- a/docs/gettext/features.pot +++ b/docs/gettext/features.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OnionShare 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 11:33-0400\n" +"POT-Creation-Date: 2021-05-31 10:12-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/docs/gettext/help.pot b/docs/gettext/help.pot index c2172a2f..6081589d 100644 --- a/docs/gettext/help.pot +++ b/docs/gettext/help.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OnionShare 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 11:33-0400\n" +"POT-Creation-Date: 2021-05-31 10:12-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/docs/gettext/index.pot b/docs/gettext/index.pot index dbabad62..0d30e83d 100644 --- a/docs/gettext/index.pot +++ b/docs/gettext/index.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OnionShare 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 11:33-0400\n" +"POT-Creation-Date: 2021-05-31 10:12-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/docs/gettext/install.pot b/docs/gettext/install.pot index f9b9242e..2a4bd757 100644 --- a/docs/gettext/install.pot +++ b/docs/gettext/install.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OnionShare 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 11:33-0400\n" +"POT-Creation-Date: 2021-05-31 10:12-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/docs/gettext/security.pot b/docs/gettext/security.pot index 4dfa7776..60c6d4b6 100644 --- a/docs/gettext/security.pot +++ b/docs/gettext/security.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OnionShare 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 11:33-0400\n" +"POT-Creation-Date: 2021-05-31 10:12-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/docs/gettext/sphinx.pot b/docs/gettext/sphinx.pot index e367403f..c4770634 100644 --- a/docs/gettext/sphinx.pot +++ b/docs/gettext/sphinx.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OnionShare 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 11:33-0400\n" +"POT-Creation-Date: 2021-05-31 10:12-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/docs/gettext/tor.pot b/docs/gettext/tor.pot index 66d64a75..55131838 100644 --- a/docs/gettext/tor.pot +++ b/docs/gettext/tor.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OnionShare 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 11:33-0400\n" +"POT-Creation-Date: 2021-05-31 10:12-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 3c049e59..8da81749 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: onionshare base: core18 -version: '2.3.2.dev1' +version: '2.3.2' summary: Securely and anonymously share files, host websites, and chat using Tor description: | OnionShare lets you securely and anonymously send and receive files. It works by starting @@ -8,7 +8,7 @@ description: | web address so others can download files from you, or upload files to you. It does _not_ require setting up a separate server or using a third party file-sharing service. -grade: devel # stable or devel +grade: stable # stable or devel confinement: strict apps: @@ -40,7 +40,7 @@ parts: python-version: python3 python-packages: - psutil - - pyside2==5.15.2 + - pyside2 == 5.15.2 - qrcode stage-packages: - libasound2 @@ -114,21 +114,24 @@ parts: - click - flask - flask-httpauth - - flask-socketio + - flask-socketio == 5.0.1 - pycryptodome + - psutil - pysocks - requests - stem - urllib3 - eventlet + - setuptools + - colorama stage: - -usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 - -usr/share/doc/libssl1.1/changelog.Debian.gz after: [tor, obfs4] tor: - source: https://dist.torproject.org/tor-0.4.5.7.tar.gz - source-checksum: sha256/447fcaaa133e2ef22427e98098a60a9c495edf9ff3e0dd13f484b9ad0185f074 + source: https://dist.torproject.org/tor-0.4.5.8.tar.gz + source-checksum: sha256/57ded091e8bcdcebb0013fe7ef4a4439827cb169358c7874fd05fa00d813e227 source-type: tar plugin: autotools build-packages: -- cgit v1.2.3-54-g00ecf From 5b072fb6fd88a28e898a7565046aa3e9cdfeaed3 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Mon, 31 May 2021 12:20:21 -0700 Subject: Add note to desktop readme for Ubuntu 20.04 --- desktop/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/desktop/README.md b/desktop/README.md index 97d0fd30..eb91e315 100644 --- a/desktop/README.md +++ b/desktop/README.md @@ -15,6 +15,8 @@ cd onionshare/desktop If you're using Linux, install `tor` and `obfs4proxy` from either the [official Debian repository](https://support.torproject.org/apt/tor-deb-repo/), or from your package manager. +In Ubuntu 20.04 you also need the `libxcb-xinerama0` package installed. + #### macOS Download and install Python 3.8.6 from https://www.python.org/downloads/release/python-386/. I downloaded `python-3.8.6-macosx10.9.pkg`. (You may need to also run `/Applications/Python\ 3.8/Install\ Certificates.command`.) -- cgit v1.2.3-54-g00ecf From 1599ff06c887c38b933dc336d0579b1616843709 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Mon, 31 May 2021 14:08:29 -0700 Subject: Fix encoding issues in snapcraft --- snap/snapcraft.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 8da81749..f99242b1 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -23,6 +23,8 @@ apps: - removable-media extensions: - gnome-3-34 + environment: + LANG: C.UTF-8 cli: common-id: org.onionshare.OnionShareCli @@ -32,6 +34,8 @@ apps: - network - network-bind - removable-media + environment: + LANG: C.UTF-8 parts: onionshare: -- cgit v1.2.3-54-g00ecf