[Pkg-privacy-commits] [Git][pkg-privacy-team/onionshare][debian/experimental] 11 commits: finally merge the 0001 patch correctly.
Hefee (@hefee)
hefee at debian.org
Fri May 3 12:17:23 BST 2024
Hefee pushed to branch debian/experimental at Privacy Maintainers / onionshare
Commits:
18ddbde4 by Sandro Knauß at 2024-05-03T09:59:17+02:00
finally merge the 0001 patch correctly.
- - - - -
e259b198 by Sandro Knauß at 2024-05-03T09:59:23+02:00
update patch hunks.
- - - - -
78fa5cb7 by Sandro Knauß at 2024-05-03T09:59:23+02:00
Make the gui tests finally pass.
- - - - -
bde055b7 by Sandro Knauß at 2024-05-03T09:59:23+02:00
Autopkgtest for checking if we use PyQt and not PySide2/6.
- - - - -
9f15356b by Sandro Knauß at 2024-05-03T09:59:23+02:00
Bump Standards-Version to 4.7.0 (no changes needed).
- - - - -
799a5bb6 by Sandro Knauß at 2024-05-03T09:59:23+02:00
Update copyright year.
- - - - -
14c4a9bc by Sandro Knauß at 2024-05-03T09:59:23+02:00
Delete not needed lintian-overrides
- - - - -
e4629a64 by Sandro Knauß at 2024-05-03T09:59:23+02:00
Added Forwarded info on patches, where known.
- - - - -
7f1663a1 by Sandro Knauß at 2024-05-03T09:59:23+02:00
add lintian-override for d/missing-sources.
- - - - -
93b80210 by Sandro Knauß at 2024-05-03T09:59:23+02:00
fix typo.
- - - - -
28d5df0c by Sandro Knauß at 2024-05-03T09:59:23+02:00
Release to unstable.
- - - - -
14 changed files:
- debian/changelog
- debian/control
- debian/copyright
- debian/onionshare-cli.lintian-overrides
- debian/patches/0001-Make-it-compatible-with-Flask-version-inside-Debian.patch
- debian/patches/0002-Use-QtPy-instead-of-directly-PySide6.patch
- debian/patches/0005-add-dependency-on-QtPy-instead-of-PySide6.patch → debian/patches/0003-add-dependency-on-QtPy-instead-of-PySide6.patch
- debian/patches/0003-Fix-methods-that-need-int-as-argument-and-not-float.patch → debian/patches/0004-Fix-methods-that-need-int-as-argument-and-not-float.patch
- debian/patches/0004-add-pytest.ini-to-make-sure-pytest-can-find-all-test.patch → debian/patches/0005-add-pytest.ini-to-make-sure-pytest-can-find-all-test.patch
- debian/patches/0006-Do-not-install-onionshare_cli-script.patch
- debian/patches/series
- debian/rules
- debian/source/lintian-overrides
- debian/tests/control
Changes:
=====================================
debian/changelog
=====================================
@@ -1,9 +1,10 @@
-onionshare (2.6.2-1) UNRELEASED; urgency=medium
+onionshare (2.6.2-1) unstable; urgency=medium
+ * Team upload.
[ Sandro Knauß ]
* New upstream release 2.6.2.
* Add missing dependencies for tests.
- * Bump Standards-Version to 4.6.2 (no changes needed).
+ * Bump Standards-Version to 4.7.0 (no changes needed).
* Set upstream metadata fields: Bug-Submit.
* Update patch hunks.
* Add patches to use QtPy instead of PySide6.
@@ -12,8 +13,11 @@ onionshare (2.6.2-1) UNRELEASED; urgency=medium
* Actually make pybuild to execute the tests successfully.
* Do not install onionshare_cli script within onionshre package.
* Remove 0002-werkzeug-3.0.1-compat.patch: 2.6.1 already use Flask 3.X.
+ * Autopkgtest for checking if we use PyQt and not PySide2/6.
+ * Update copyright year.
+ * Delete not needed lintian-overrides
- -- Sandro Knauß <hefee at debian.org> Thu, 02 May 2024 21:01:45 +0200
+ -- Sandro Knauß <hefee at debian.org> Fri, 03 May 2024 01:57:53 +0200
onionshare (2.6-7) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -35,7 +35,7 @@ Build-Depends:
tor <!nocheck>,
xauth <!nocheck>,
xvfb <!nocheck>
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
Homepage: https://onionshare.org
Vcs-Git: https://salsa.debian.org/pkg-privacy-team/onionshare.git
Vcs-Browser: https://salsa.debian.org/pkg-privacy-team/onionshare
=====================================
debian/copyright
=====================================
@@ -4,11 +4,11 @@ Source: https://github.com/onionshare/onionshare
Upstream-Contact: https://github.com/onionshare/onionshare/issues
Files: *
-Copyright: 2014-2022, Micah Lee <micah at micahflee.com>
+Copyright: 2014-2024, Micah Lee <micah at micahflee.com>
License: GPL-3.0+
Files: debian/*
-Copyright: 2014-2022, Debian Privacy Tools Maintainers <pkg-privacy-maintainers at lists.alioth.debian.org>
+Copyright: 2014-2024, Debian Privacy Tools Maintainers <pkg-privacy-maintainers at lists.alioth.debian.org>
License: GPL-3.0
Files: cli/onionshare_cli/resources/static/js/jquery-3.5.1.min.js
=====================================
debian/onionshare-cli.lintian-overrides
=====================================
@@ -1,5 +1,5 @@
# we need a special jquery versian and we ship the source in debian/missing-sources/
embedded-javascript-library please use libjs-jquery *
-# That are actuall resource files and no documenation
+# That are actuall resource files and no documentation
package-contains-documentation-outside-usr-share-doc [usr/share/onionshare-cli/version.txt]
package-contains-documentation-outside-usr-share-doc [usr/share/onionshare-cli/wordlist.txt]
=====================================
debian/patches/0001-Make-it-compatible-with-Flask-version-inside-Debian.patch
=====================================
@@ -8,13 +8,14 @@ Forwarded: not-needed
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cli/pyproject.toml b/cli/pyproject.toml
-index 5b458aa..bc5dcdd 100644
+index 5b8c302..fd7690f 100644
--- a/cli/pyproject.toml
+++ b/cli/pyproject.toml
@@ -18,7 +18,7 @@ classifiers = [
[tool.poetry.dependencies]
python = ">=3.8,<3.12"
click = "*"
+-flask = "2.3.2"
+flask = "3.*"
flask-compress = "^1.13"
flask-socketio = "5.3.4"
=====================================
debian/patches/0002-Use-QtPy-instead-of-directly-PySide6.patch
=====================================
@@ -2,6 +2,7 @@ From: =?utf-8?q?Sandro_Knau=C3=9F?= <hefee at debian.org>
Date: Wed, 6 Mar 2024 03:38:26 +0100
Subject: Use QtPy instead of directly PySide6.
+Forwarded: https://github.com/onionshare/onionshare/pull/1887
---
desktop/onionshare/__init__.py | 6 +++---
desktop/onionshare/connection_tab.py | 2 +-
@@ -169,7 +170,7 @@ index c03ecaa..ba99e8a 100644
from ... import strings
from ...widgets import Alert, AddFileDialog
diff --git a/desktop/onionshare/tab/mode/history.py b/desktop/onionshare/tab/mode/history.py
-index 3afdfc1..1468b53 100644
+index ad8af09..c8ec97c 100644
--- a/desktop/onionshare/tab/mode/history.py
+++ b/desktop/onionshare/tab/mode/history.py
@@ -22,7 +22,7 @@ import time
@@ -178,9 +179,9 @@ index 3afdfc1..1468b53 100644
from datetime import datetime
-from PySide6 import QtCore, QtWidgets, QtGui
+from qtpy import QtCore, QtWidgets, QtGui
+ from urllib.parse import unquote
from ... import strings
- from ...widgets import Alert
diff --git a/desktop/onionshare/tab/mode/mode_settings_widget.py b/desktop/onionshare/tab/mode/mode_settings_widget.py
index 9a8cd44..315adde 100644
--- a/desktop/onionshare/tab/mode/mode_settings_widget.py
=====================================
debian/patches/0005-add-dependency-on-QtPy-instead-of-PySide6.patch → debian/patches/0003-add-dependency-on-QtPy-instead-of-PySide6.patch
=====================================
@@ -2,12 +2,13 @@ From: =?utf-8?q?Sandro_Knau=C3=9F?= <hefee at debian.org>
Date: Wed, 6 Mar 2024 20:59:01 +0100
Subject: add dependency on QtPy instead of PySide6.
+Forwarded: https://github.com/onionshare/onionshare/pull/1887
---
desktop/pyproject.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/desktop/pyproject.toml b/desktop/pyproject.toml
-index d5745ed..3e66570 100644
+index 85a0c7d..69f554b 100644
--- a/desktop/pyproject.toml
+++ b/desktop/pyproject.toml
@@ -8,7 +8,7 @@ license = "GPLv3+"
=====================================
debian/patches/0003-Fix-methods-that-need-int-as-argument-and-not-float.patch → debian/patches/0004-Fix-methods-that-need-int-as-argument-and-not-float.patch
=====================================
@@ -25,10 +25,10 @@ index 9473d30..204d323 100644
painter.setBrush(QtGui.QColor(self.bg_color))
painter.drawRoundedRect(x, y, self.w, self.h, self.h / 2, self.h / 2)
diff --git a/desktop/onionshare/tab/mode/history.py b/desktop/onionshare/tab/mode/history.py
-index 1468b53..166bc15 100644
+index c8ec97c..ad38754 100644
--- a/desktop/onionshare/tab/mode/history.py
+++ b/desktop/onionshare/tab/mode/history.py
-@@ -121,7 +121,7 @@ class ShareHistoryItem(HistoryItem):
+@@ -122,7 +122,7 @@ class ShareHistoryItem(HistoryItem):
self.progress_bar.setAttribute(QtCore.Qt.WA_DeleteOnClose)
self.progress_bar.setAlignment(QtCore.Qt.AlignHCenter)
self.progress_bar.setMinimum(0)
@@ -37,7 +37,7 @@ index 1468b53..166bc15 100644
self.progress_bar.setValue(0)
self.progress_bar.setStyleSheet(
self.common.gui.css["downloads_uploads_progress_bar"]
-@@ -140,7 +140,7 @@ class ShareHistoryItem(HistoryItem):
+@@ -141,7 +141,7 @@ class ShareHistoryItem(HistoryItem):
def update(self, downloaded_bytes):
self.downloaded_bytes = downloaded_bytes
@@ -46,7 +46,7 @@ index 1468b53..166bc15 100644
if (downloaded_bytes / 1024) == (self.progress_bar.total_bytes / 1024):
pb_fmt = strings._("gui_all_modes_progress_complete").format(
self.common.format_seconds(time.time() - self.started)
-@@ -392,8 +392,8 @@ class ReceiveHistoryItem(HistoryItem):
+@@ -393,8 +393,8 @@ class ReceiveHistoryItem(HistoryItem):
total_uploaded_bytes += data["progress"][filename]["uploaded_bytes"]
# Update the progress bar
@@ -57,7 +57,7 @@ index 1468b53..166bc15 100644
elapsed = datetime.now() - self.started
if elapsed.seconds < 10:
-@@ -526,7 +526,7 @@ class IndividualFileHistoryItem(HistoryItem):
+@@ -529,7 +529,7 @@ class IndividualFileHistoryItem(HistoryItem):
else:
self.total_bytes = data["filesize"]
self.progress_bar.setMinimum(0)
@@ -66,7 +66,7 @@ index 1468b53..166bc15 100644
self.progress_bar.total_bytes = data["filesize"]
# Start at 0
-@@ -535,7 +535,7 @@ class IndividualFileHistoryItem(HistoryItem):
+@@ -538,7 +538,7 @@ class IndividualFileHistoryItem(HistoryItem):
def update(self, downloaded_bytes):
self.downloaded_bytes = downloaded_bytes
=====================================
debian/patches/0004-add-pytest.ini-to-make-sure-pytest-can-find-all-test.patch → debian/patches/0005-add-pytest.ini-to-make-sure-pytest-can-find-all-test.patch
=====================================
=====================================
debian/patches/0006-Do-not-install-onionshare_cli-script.patch
=====================================
@@ -7,7 +7,7 @@ Subject: Do not install onionshare_cli script.
1 file changed, 1 deletion(-)
diff --git a/desktop/pyproject.toml b/desktop/pyproject.toml
-index 3e66570..c979a3e 100644
+index 69f554b..d4f0290 100644
--- a/desktop/pyproject.toml
+++ b/desktop/pyproject.toml
@@ -28,4 +28,3 @@ build-backend = "poetry.core.masonry.api"
=====================================
debian/patches/series
=====================================
@@ -1,6 +1,6 @@
0001-Make-it-compatible-with-Flask-version-inside-Debian.patch
0002-Use-QtPy-instead-of-directly-PySide6.patch
-0003-Fix-methods-that-need-int-as-argument-and-not-float.patch
-0004-add-pytest.ini-to-make-sure-pytest-can-find-all-test.patch
-0005-add-dependency-on-QtPy-instead-of-PySide6.patch
+0003-add-dependency-on-QtPy-instead-of-PySide6.patch
+0004-Fix-methods-that-need-int-as-argument-and-not-float.patch
+0005-add-pytest.ini-to-make-sure-pytest-can-find-all-test.patch
0006-Do-not-install-onionshare_cli-script.patch
=====================================
debian/rules
=====================================
@@ -52,10 +52,19 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
# Pybuild export http_proxy=http://127.0.0.1:9/, https_proxy=https://127.0.0.1:9/
# The tests are failing because of this pybuild give advice that if
# network access is blocked by this, to export empty proxy variables.
- export http_proxy=
- export https_proxy=
-
- PYBUILD_NAME=onionshare PYTHONPATH="$(CURDIR)/cli" QT_QPA_PLATFORM=offscreen QT_DEBUG_PLUGINS=1 HOME=/tmp xvfb-run dh_auto_test --buildsystem=pybuild --sourcedirectory desktop
+
+ # You need to run the tests not as root as otherwise
+ # some tests fail because they need chmod 400 to be effective to
+ # generate an error.
+ # Finally the tests need also a writeable home.
+
+ $(eval TESTHOME = $(shell mktemp -d))
+ $(eval ENV = QT_QPA_PLATFORM=offscreen QT_DEBUG_PLUGINS=1 HOME=$(TESTHOME) http_proxy= https_proxy=)
+ PYBUILD_NAME=onionshare PYTHONPATH="$(CURDIR)/cli" pybuild \
+ --dir desktop \
+ --test --test-custom \
+ --test-args="$(ENV) xvfb-run python{version} -m pytest tests"
+ rm -rf $(TESTHOME)
else
@echo "** tests disabled"
endif
=====================================
debian/source/lintian-overrides
=====================================
@@ -1,2 +1,5 @@
-# socket.io.js shipts very long line although it is the non compressed form.
-source-is-missing [debian/missing-sources/socket.io.js]
+# Those prebuilt javascript object wil lbe replaced with version from debian/missing-sources
+source-contains-prebuilt-javascript-object [cli/onionshare_cli/resources/static/js/jquery-3.5.1.min.js]
+source-contains-prebuilt-javascript-object [cli/onionshare_cli/resources/static/js/socket.io.js]
+source-contains-prebuilt-javascript-object [cli/onionshare_cli/resources/static/js/socket.io.min.js]
+
=====================================
debian/tests/control
=====================================
@@ -27,3 +27,8 @@ Test-Command: XDG_CONFIG_HOME="$AUTOPKGTEST_TMP" xvfb-run -- onionshare --help
Depends: onionshare, xvfb, xauth
Restrictions: allow-stderr, superficial,
Features: test-name=onionshare_help
+
+Test-Command: ! grep -r --include "*.py" "^\s*\(import\|from\)\s\+PySide[26]" /usr/lib/python3/dist-packages/onionshare/
+Depends: onionshare
+Restrictions: allow-stderr,
+Features: test-name=check_if_we_use_only_qyqt
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/onionshare/-/compare/2fd22e297f3d7b57f289586c6f43bdd338aba95e...28d5df0c66a3c8e61b68e2c7e8a534b30f1457d9
--
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/onionshare/-/compare/2fd22e297f3d7b57f289586c6f43bdd338aba95e...28d5df0c66a3c8e61b68e2c7e8a534b30f1457d9
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20240503/c887de25/attachment-0001.htm>
More information about the Pkg-privacy-commits
mailing list