From effcee07bf3490350768e946f2fba2dc182931a4 Mon Sep 17 00:00:00 2001 From: Goffi Date: Tue, 12 Jul 2016 23:29:43 +0200 Subject: [PATCH 1/8] installation: updated urwid-satext minimal version to 0.6.1 + added service_identity which is needed by Twisted for proper TLS check --- README4PACKAGERS | 6 +++--- setup.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README4PACKAGERS b/README4PACKAGERS index 90ba4260..1e3cc4ae 100644 --- a/README4PACKAGERS +++ b/README4PACKAGERS @@ -28,7 +28,7 @@ Wokkel >= 0.7.1 XDG zope.interface -Recommended: Mutagen, markdown, html2text, netifaces, miniupnp +Recommended: Mutagen, markdown, html2text, netifaces, miniupnp, service-identity -------------------------------- Dependencies for the Jp frontend @@ -43,7 +43,7 @@ Dependencies for the Primitivus frontend ---------------------------------------- Urwid >= 1.2.0 -Urwid-satext >= 0.4.1 +Urwid-satext >= 0.6.1 GObject 2 (not imported directly in Primitivus, but needed for Urwid's main loop) DBus @@ -74,7 +74,7 @@ Several project have been made around SàT, they are all available at http://rep - Urwid SàText: Widgets for urwid library, designed for SàT but can be useful for other projects. Mandatory for Primitivus. -The following ones are not needed in a distribution, because they are in too early a stage of development, or not useful for general purpose: +The following ones are not needed in a distribution, because they are in a too early stage of development, or not useful for general purpose: - Bellaciao: a Qt frontend, at an early stage of development. diff --git a/setup.py b/setup.py index 623b1a37..1ebd88a6 100644 --- a/setup.py +++ b/setup.py @@ -304,6 +304,6 @@ setup(name=NAME, ], scripts=['frontends/src/jp/jp', 'frontends/src/primitivus/primitivus', ], zip_safe=False, - install_requires=['twisted >= 15.2.0', 'wokkel >= 0.7.1', 'progressbar', 'urwid >= 1.2.0', 'urwid-satext >= 0.4.0', 'mutagen', 'pillow', 'lxml >= 3.1.0', 'pyxdg', 'markdown', 'html2text', 'pycrypto >= 2.6.1', 'python-potr', 'PyOpenSSL'], + install_requires=['twisted >= 15.2.0', 'wokkel >= 0.7.1', 'progressbar', 'urwid >= 1.2.0', 'urwid-satext >= 0.6.1', 'mutagen', 'pillow', 'lxml >= 3.1.0', 'pyxdg', 'markdown', 'html2text', 'pycrypto >= 2.6.1', 'python-potr', 'PyOpenSSL', 'service_identity'], cmdclass={'install': CustomInstall}, ) From ec8a5fbffbd9feb4f62711e3827c46fe47586b93 Mon Sep 17 00:00:00 2001 From: Goffi Date: Tue, 12 Jul 2016 23:30:13 +0200 Subject: [PATCH 2/8] version update (0.6.1) --- CHANGELOG | 2 +- README | 2 +- setup.py | 2 +- src/core/constants.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 7016973d..824966ad 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,6 @@ All theses changelogs are not exhaustive, please check the mercurial repository for more details. -v 0.6.1 (xx/xx/2016): +v 0.6.1 (12/07/2016): - minimum Twisted version is now 15.2.0 - removed pyfeed and xe dependencies - added mutagen to recommended in README4PACKAGERS diff --git a/README b/README index 4d012500..ddfb4c0c 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -SàT v0.6.0 +SàT v0.6.1 (c) Jérôme Poisson aka Goffi 2008-2016 (c) Adrien Cossa aka Souliane 2013-2016 diff --git a/setup.py b/setup.py index 1ebd88a6..1daa2e2e 100644 --- a/setup.py +++ b/setup.py @@ -279,7 +279,7 @@ if sys.argv[1].lower() in ['egg_info', 'install']: preinstall_check(install_opt) setup(name=NAME, - version='0.6.0', + version='0.6.1', description=u'Salut à Toi multi-frontend XMPP client', long_description=u'Salut à Toi (SàT) is a XMPP client based on a daemon/frontend architecture. Its multi-frontends (desktop, web, console interface, CLI, etc) and multi-purposes (instant messaging, microblogging, games, file sharing, etc).', author='Association « Salut à Toi »', diff --git a/src/core/constants.py b/src/core/constants.py index f94ccc39..9501e08c 100644 --- a/src/core/constants.py +++ b/src/core/constants.py @@ -31,7 +31,7 @@ class Const(object): APP_NAME_SHORT = u'SàT' APP_NAME_FILE = u'sat' APP_NAME_FULL = u'%s (%s)' % (APP_NAME_SHORT, APP_NAME) - APP_VERSION = u'0.6.0D' # Please add 'D' at the end for dev versions + APP_VERSION = u'0.6.1' # Please add 'D' at the end for dev versions APP_URL = u'http://salut-a-toi.org' From 8e58ed8302e71674f2a9e8f000d4ba6a93e7ea60 Mon Sep 17 00:00:00 2001 From: Goffi Date: Tue, 12 Jul 2016 23:31:22 +0200 Subject: [PATCH 3/8] added 0.6.1 tag From 84ed024c752675835752c0fadaaac171040dac10 Mon Sep 17 00:00:00 2001 From: Goffi Date: Tue, 12 Jul 2016 23:43:26 +0200 Subject: [PATCH 4/8] fixed exclusion of vim's undo file in MANIFEST.in --- MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/MANIFEST.in b/MANIFEST.in index 86a43e55..5aed5e77 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,4 +7,5 @@ global-include *.sh include src/sat.* include frontends/src/jp/jp frontends/src/primitivus/primitivus include src/bridge/bridge_constructor/mediawiki_template.tpl +global-exclude *.un~ prune src/bridge/bridge_constructor/generated From 04de24fe9fda0a84dd5f407cf5f7dd461fa3cecf Mon Sep 17 00:00:00 2001 From: Goffi Date: Tue, 12 Jul 2016 23:43:37 +0200 Subject: [PATCH 5/8] Added tag 0.6.1 for changeset 30e83614af48 From cea460cdef0c51920420dc7bd166f5a6d40f7684 Mon Sep 17 00:00:00 2001 From: Goffi Date: Wed, 13 Jul 2016 10:45:28 +0200 Subject: [PATCH 6/8] installation (MANIFEST): added misc directory --- MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/MANIFEST.in b/MANIFEST.in index 5aed5e77..9620f6f5 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,6 +5,7 @@ global-include *.po *.mo global-include CHANGELOG COPYING* INSTALL README* global-include *.sh include src/sat.* +include misc include frontends/src/jp/jp frontends/src/primitivus/primitivus include src/bridge/bridge_constructor/mediawiki_template.tpl global-exclude *.un~ From f19ee4a928f91f5e0debf0594a67796dac42af46 Mon Sep 17 00:00:00 2001 From: Goffi Date: Wed, 13 Jul 2016 10:46:05 +0200 Subject: [PATCH 7/8] Added tag 0.6.1 for changeset 3a16a7479660 From cd5e05bd1fa1a3a4a1e18898202732ac1559d9c1 Mon Sep 17 00:00:00 2001 From: Goffi Date: Wed, 13 Jul 2016 11:01:07 +0200 Subject: [PATCH 8/8] installation (setup.py): changed version to 0.6.1.1 so new archive with fixed MANIFEST can be uploaded on pypi --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1daa2e2e..41026934 100644 --- a/setup.py +++ b/setup.py @@ -279,7 +279,7 @@ if sys.argv[1].lower() in ['egg_info', 'install']: preinstall_check(install_opt) setup(name=NAME, - version='0.6.1', + version='0.6.1.1', description=u'Salut à Toi multi-frontend XMPP client', long_description=u'Salut à Toi (SàT) is a XMPP client based on a daemon/frontend architecture. Its multi-frontends (desktop, web, console interface, CLI, etc) and multi-purposes (instant messaging, microblogging, games, file sharing, etc).', author='Association « Salut à Toi »',