From 5c37493c06b4b7b01a0c5fd8a5866b19dc62ab1f Mon Sep 17 00:00:00 2001 From: Goffi Date: Fri, 18 Jun 2021 13:03:32 +0200 Subject: [PATCH 1/4] misc: added freedesktop metadata files --- misc/README | 6 +++ misc/org.libervia.LiberviaCLI.metainfo.xml | 59 ++++++++++++++++++++++ misc/org.libervia.LiberviaTUI.desktop | 8 +++ misc/org.libervia.LiberviaTUI.metainfo.xml | 55 ++++++++++++++++++++ 4 files changed, 128 insertions(+) create mode 100644 misc/org.libervia.LiberviaCLI.metainfo.xml create mode 100644 misc/org.libervia.LiberviaTUI.desktop create mode 100644 misc/org.libervia.LiberviaTUI.metainfo.xml diff --git a/misc/README b/misc/README index fa44eafc..edae0357 100644 --- a/misc/README +++ b/misc/README @@ -13,3 +13,9 @@ compinit * org.libervia.Libervia.service: This file is used by D-Bus to know how to launch the backend, you have to put in in D-Bus services dir (usually /usr/share/dbus-1/services) + +* org.libervia.Libervia*.metainfo.xml: + AppStream metadata as specified at https://www.freedesktop.org/software/appstream/docs/ + +* org.libervia.LiberviaTUI.desktop: + Desktop entry for TUI frontend as specified at https://specifications.freedesktop.org/desktop-entry-spec/ diff --git a/misc/org.libervia.LiberviaCLI.metainfo.xml b/misc/org.libervia.LiberviaCLI.metainfo.xml new file mode 100644 index 00000000..c8187e63 --- /dev/null +++ b/misc/org.libervia.LiberviaCLI.metainfo.xml @@ -0,0 +1,59 @@ + + + + org.libervia.LiberviaCLI + FSFAP + AGPL-3.0-or-later + Libervia CLI (jp) + Multi-purpose communication ecosystem (CLI frontend) - XMPP standard + + Network + Chat + FileTransfer + ConsoleOnly + + +

Libervia is a multi-purpose communication ecosystem.

+

It offers many tools to communicate and collaborate (instant messaging, blogging, file sharing, photos albums, forums, events, etc.). + It is multi-purposes, but also multi-frontends (you can use it on desktop, mobile devices, web browser, or terminal) and multi-platforms.

+

Libervia is made with a strong sense of ethics (see social contract), is decentralized (you can run your own service, keep your important data yourself, while still being able to communicate with the rest of the network), and use a standard communication protocol (XMPP), making it compatible with many other software.

+

This part is the Command Line Interface frontend. You can use it to work with any XMPP based service, do scripts, etc. A REPL shell is included.

+ + + + The list of room commands seen + https://repos.goffi.org/sat_docs/raw-file/tip/screenshots/0.7/jp_commands_list.png + + + REPL shell used to retrieve last blog post + https://repos.goffi.org/sat_docs/raw-file/tip/screenshots/0.7/jp_shell_blog.png + + + https://salut-a-toi.org + https://bugs.goffi.org + Libervia + + libervia-cli + + + + +

"La Commune" release.

+

This version is the first "general audience" one, and introduce Cagou (desktop/mobile interface), OMEMO end-to-end encryption, advanced file sharing, and many other features.

+ + https://www.goffi.org/b/N29CuUQS4U4TK36JFuTQ5Q/salut-commune + + + + intense + intense + intense + + diff --git a/misc/org.libervia.LiberviaTUI.desktop b/misc/org.libervia.LiberviaTUI.desktop new file mode 100644 index 00000000..9b55e366 --- /dev/null +++ b/misc/org.libervia.LiberviaTUI.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Libervia TUI (Primitivus) +Comment=console frontend for Libervia (XMPP) +Exec=libervia-tui +Icon=org.libervia.LiberviaTUI +Categories=Network;InstantMessaging;Chat;FileTransfer;RemoteAccess; +Keywords=xmpp;chat;messaging;im;file;sharing;communication;jabber;social;network;decentralization;console; diff --git a/misc/org.libervia.LiberviaTUI.metainfo.xml b/misc/org.libervia.LiberviaTUI.metainfo.xml new file mode 100644 index 00000000..fe940543 --- /dev/null +++ b/misc/org.libervia.LiberviaTUI.metainfo.xml @@ -0,0 +1,55 @@ + + + + org.libervia.LiberviaTUI + FSFAP + AGPL-3.0-or-later + Libervia TUI (Primitivus) + Multi-purpose communication ecosystem (TUI frontend) - XMPP standard + + Network + Chat + FileTransfer + ConsoleOnly + + +

Libervia is a multi-purpose communication ecosystem.

+

It offers many tools to communicate and collaborate (instant messaging, blogging, file sharing, photos albums, forums, events, etc.). + It is multi-purposes, but also multi-frontends (you can use it on desktop, mobile devices, web browser, or terminal) and multi-platforms.

+

Libervia is made with a strong sense of ethics (see social contract), is decentralized (you can run your own service, keep your important data yourself, while still being able to communicate with the rest of the network), and use a standard communication protocol (XMPP), making it compatible with many other software.

+

This part is the Terminal User Interface frontend.

+ + + + A chat conversation seen with Primitivus + https://repos.goffi.org/sat_docs/raw-file/tip/screenshots/0.7/primitivus_chat.png + + + https://salut-a-toi.org + https://bugs.goffi.org + Libervia + + libervia-tui + + + + +

"La Commune" release.

+

This version is the first "general audience" one, and introduce Cagou (desktop/mobile interface), OMEMO end-to-end encryption, advanced file sharing, and many other features.

+ + https://www.goffi.org/b/N29CuUQS4U4TK36JFuTQ5Q/salut-commune + + + + intense + intense + intense + + From ddf227b88c09301256f78680d1e1e89ecd0d5be5 Mon Sep 17 00:00:00 2001 From: Goffi Date: Fri, 18 Jun 2021 14:38:51 +0200 Subject: [PATCH 2/4] install: set upper limit for dependencies versions --- setup.py | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/setup.py b/setup.py index a794f8b4..db79a003 100644 --- a/setup.py +++ b/setup.py @@ -23,35 +23,35 @@ import os NAME = 'sat' install_requires = [ - 'babel', - 'dbus-python', - 'html2text', + 'babel < 3', + 'dbus-python < 1.3', + 'html2text < 2020.2', 'jinja2>=2.10.3', - 'langid', + 'langid < 2', 'lxml >= 3.1.0', 'markdown >= 3.0', - 'miniupnpc', - 'mutagen', - 'netifaces', + 'miniupnpc < 2.1', + 'mutagen < 2', + 'netifaces < 0.12', 'pillow >= 6.0.0', - 'progressbar2', - 'cryptography', - 'pygments', - 'pygobject', - 'pyopenssl', - 'python-dateutil', - 'python-potr', - 'pyxdg', - 'sat_tmp >= 0.7.0a4', - 'shortuuid', - 'twisted[tls] >= 20.3.0', - 'treq', - 'urwid >= 1.2.0', - 'urwid-satext >= 0.7.0a2', - 'wokkel >= 0.7.1', - 'omemo >= 0.11.0', - 'omemo-backend-signal', - 'pyyaml', + 'progressbar2 < 3.54', + 'cryptography < 3.5', + 'pygments < 3', + 'pygobject < 1.2', + 'pyopenssl < 21.0.0', + 'python-dateutil < 3', + 'python-potr < 1.1', + 'pyxdg < 0.30', + 'sat_tmp >= 0.8.0b1, < 0.9', + 'shortuuid < 1.1', + 'twisted[tls] >= 20.3.0, < 21.3.0', + 'treq < 22.0.0', + 'urwid >= 1.2.0, < 3', + 'urwid-satext >= 0.8.0b1, < 0.9', + 'wokkel >= 18.0.0, < 19.0.0', + 'omemo >= 0.11.0, < 0.13.0', + 'omemo-backend-signal < 0.3', + 'pyyaml < 5.5.0', ] extras_require = { From 7a7ea682e9317ed89109ab44aa512caaa5e5eca7 Mon Sep 17 00:00:00 2001 From: Goffi Date: Fri, 18 Jun 2021 14:44:01 +0200 Subject: [PATCH 3/4] /!\ package is being renamed to libervia-backend following global name change /!\ --- setup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index db79a003..8e77735e 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,9 @@ from setuptools import setup, find_packages import os -NAME = 'sat' +NAME = "libervia-backend" +# NOTE: directory is still "sat" for compatibility reason, should be changed for 0.9 +DIR_NAME = "sat" install_requires = [ 'babel < 3', @@ -60,7 +62,7 @@ extras_require = { DBUS_DIR = 'dbus-1/services' DBUS_FILE = 'misc/org.libervia.Libervia.service' -with open(os.path.join(NAME, 'VERSION')) as f: +with open(os.path.join(DIR_NAME, 'VERSION')) as f: VERSION = f.read().strip() is_dev_version = VERSION.endswith('D') if is_dev_version: From 89dfeaa1554b697cdcd4c801b28169e6b7e54cc6 Mon Sep 17 00:00:00 2001 From: Goffi Date: Fri, 18 Jun 2021 15:08:40 +0200 Subject: [PATCH 4/4] install: fix pygobject dependency --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8e77735e..1884c5b8 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ install_requires = [ 'progressbar2 < 3.54', 'cryptography < 3.5', 'pygments < 3', - 'pygobject < 1.2', + 'pygobject < 3.40.1', 'pyopenssl < 21.0.0', 'python-dateutil < 3', 'python-potr < 1.1',