From d4091dbde641dc9796b51e032ea23a0ba5c1fcbb Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Wed, 3 Aug 2011 17:00:51 -0700 Subject: Integrate a modified version of Dave Cridland's Suelta SASL library. --- setup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 19047925..a61d9e56 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,6 @@ packages = [ 'sleekxmpp', 'sleekxmpp/xmlstream', 'sleekxmpp/xmlstream/matcher', 'sleekxmpp/xmlstream/handler', - 'sleekxmpp/thirdparty', 'sleekxmpp/plugins', 'sleekxmpp/plugins/xep_0009', 'sleekxmpp/plugins/xep_0009/stanza', @@ -58,6 +57,12 @@ packages = [ 'sleekxmpp', 'sleekxmpp/plugins/xep_0092', 'sleekxmpp/plugins/xep_0128', 'sleekxmpp/plugins/xep_0199', + 'sleekxmpp/features', + 'sleekxmpp/features/feature_mechanisms', + 'sleekxmpp/features/feature_mechanisms/stanza', + 'sleekxmpp/thirdparty', + 'sleekxmpp/thirdparty/suelta', + 'sleekxmpp/thirdparty/suelta/mechanisms', ] if sys.version_info < (3, 0): -- cgit v1.2.3 From db92fa23303f1115ef8bf938efb6d686d9c3fa0a Mon Sep 17 00:00:00 2001 From: Nathan Fritz Date: Wed, 3 Aug 2011 18:11:00 -0700 Subject: started transition to xep_0060 rewrite --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 19047925..a03b8694 100644 --- a/setup.py +++ b/setup.py @@ -53,6 +53,7 @@ packages = [ 'sleekxmpp', 'sleekxmpp/plugins/xep_0030/stanza', 'sleekxmpp/plugins/xep_0050', 'sleekxmpp/plugins/xep_0059', + 'sleekxmpp/plugins/xep_0060', 'sleekxmpp/plugins/xep_0085', 'sleekxmpp/plugins/xep_0086', 'sleekxmpp/plugins/xep_0092', -- cgit v1.2.3 From afeb8a679a9895726eea5669b73c83d57bb03dff Mon Sep 17 00:00:00 2001 From: Nathan Fritz Date: Wed, 3 Aug 2011 18:30:46 -0700 Subject: updated setup.py to include stream features plugins --- setup.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index a61d9e56..f6ee4490 100644 --- a/setup.py +++ b/setup.py @@ -60,6 +60,9 @@ packages = [ 'sleekxmpp', 'sleekxmpp/features', 'sleekxmpp/features/feature_mechanisms', 'sleekxmpp/features/feature_mechanisms/stanza', + 'sleekxmpp/features/feature_starttls', + 'sleekxmpp/features/feature_bind', + 'sleekxmpp/features/feature_session', 'sleekxmpp/thirdparty', 'sleekxmpp/thirdparty/suelta', 'sleekxmpp/thirdparty/suelta/mechanisms', -- cgit v1.2.3 From 9ffdba8643ca8e52a30ce227331cd772a5fea6d1 Mon Sep 17 00:00:00 2001 From: Nathan Fritz Date: Wed, 3 Aug 2011 23:56:24 -0700 Subject: the great xep_0060 re-organization in preperation for rewrite --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e83676f2..572dd1f0 100644 --- a/setup.py +++ b/setup.py @@ -53,6 +53,7 @@ packages = [ 'sleekxmpp', 'sleekxmpp/plugins/xep_0050', 'sleekxmpp/plugins/xep_0059', 'sleekxmpp/plugins/xep_0060', + 'sleekxmpp/plugins/xep_0060/stanza', 'sleekxmpp/plugins/xep_0085', 'sleekxmpp/plugins/xep_0086', 'sleekxmpp/plugins/xep_0092', -- cgit v1.2.3 From a0767f6af61bc9c54b2526cd51aef7af4e383e90 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Thu, 4 Aug 2011 00:07:30 -0700 Subject: Sadly, dateutil is not actually part of the standard lib. Thus, using the XEP-0082 and XEP-0202 introduces a dependency on the dateutil package (installable using pip install python-dateutil). Maybe we'll be able to rework how these plugins work to avoid needing dateutil, but for now this will have to do. --- setup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 572dd1f0..48d88690 100644 --- a/setup.py +++ b/setup.py @@ -54,11 +54,15 @@ packages = [ 'sleekxmpp', 'sleekxmpp/plugins/xep_0059', 'sleekxmpp/plugins/xep_0060', 'sleekxmpp/plugins/xep_0060/stanza', + 'sleekxmpp/plugins/xep_0066', 'sleekxmpp/plugins/xep_0085', 'sleekxmpp/plugins/xep_0086', 'sleekxmpp/plugins/xep_0092', 'sleekxmpp/plugins/xep_0128', - 'sleekxmpp/plugins/xep_0199', + 'sleekxmpp/plugins/xep_0202', + 'sleekxmpp/plugins/xep_0203', + 'sleekxmpp/plugins/xep_0224', + 'sleekxmpp/plugins/xep_0249', 'sleekxmpp/features', 'sleekxmpp/features/feature_mechanisms', 'sleekxmpp/features/feature_mechanisms/stanza', -- cgit v1.2.3 From b9764cc120c48576be1fe6cadb11813d12f91f4c Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Thu, 4 Aug 2011 11:41:36 -0700 Subject: Clean up and unify tostring once and for all. Packaging for Python3 just got easier. --- setup.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 572dd1f0..42b7dfab 100644 --- a/setup.py +++ b/setup.py @@ -70,11 +70,6 @@ packages = [ 'sleekxmpp', 'sleekxmpp/thirdparty/suelta/mechanisms', ] -if sys.version_info < (3, 0): - py_modules = ['sleekxmpp.xmlstream.tostring.tostring26'] -else: - py_modules = ['sleekxmpp.xmlstream.tostring.tostring'] - setup( name = "sleekxmpp", version = VERSION, @@ -86,7 +81,6 @@ setup( license = 'MIT', platforms = [ 'any' ], packages = packages, - py_modules = py_modules, requires = [ 'tlslite', 'pythondns' ], ) -- cgit v1.2.3 From 940e3eba35deab4c0d965dbbac4a57a534bd3681 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Thu, 4 Aug 2011 21:56:35 -0700 Subject: Make sure setup.py has all of the plugins. XEP-0199 got dropped during a cut/paste for 203 and 204. --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index be9a0d32..3ccac3af 100644 --- a/setup.py +++ b/setup.py @@ -59,6 +59,7 @@ packages = [ 'sleekxmpp', 'sleekxmpp/plugins/xep_0086', 'sleekxmpp/plugins/xep_0092', 'sleekxmpp/plugins/xep_0128', + 'sleekxmpp/plugins/xep_0199', 'sleekxmpp/plugins/xep_0202', 'sleekxmpp/plugins/xep_0203', 'sleekxmpp/plugins/xep_0224', -- cgit v1.2.3 From 08cb5f42e7a37ac20928bbb6e62a35acc1de0f78 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Fri, 5 Aug 2011 09:00:55 -0700 Subject: Update the info in setup.py I thought I had done this a long time ago, but it must have been in a lost branch. *shrug* It's too late for Beta6, so I've manually updated the PyPI entry. --- setup.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3ccac3af..b997106c 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# Copyright (C) 2007-2008 Nathanael C. Fritz +# Copyright (C) 2007-2011 Nathanael C. Fritz # All Rights Reserved # # This software is licensed as described in the README file, @@ -29,13 +29,16 @@ import sleekxmpp VERSION = sleekxmpp.__version__ DESCRIPTION = 'SleekXMPP is an elegant Python library for XMPP (aka Jabber, Google Talk, etc).' -LONG_DESCRIPTION = """ -SleekXMPP is an elegant Python library for XMPP (aka Jabber, Google Talk, etc). -""" +with open('README') as readme: + LONG_DESCRIPTION = '\n'.join(readme) CLASSIFIERS = [ 'Intended Audience :: Developers', - 'License :: OSI Approved :: MIT', + 'License :: OSI Approved :: MIT License', 'Programming Language :: Python', + 'Programming Language :: Python 2.6', + 'Programming Language :: Python 2.7', + 'Programming Language :: Python 3.1', + 'Programming Language :: Python 3.2', 'Topic :: Software Development :: Libraries :: Python Modules', ] @@ -82,7 +85,7 @@ setup( long_description = LONG_DESCRIPTION, author = 'Nathanael Fritz', author_email = 'fritzy [at] netflint.net', - url = 'http://code.google.com/p/sleekxmpp', + url = 'http://github.com/fritzy/SleekXMPP', license = 'MIT', platforms = [ 'any' ], packages = packages, -- cgit v1.2.3 From 75f23d11301f09a29db4d0cc185dd5ffdc4a18fe Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Sat, 6 Aug 2011 00:45:18 -0700 Subject: Fix XEP-0078 using the new stream feature workflow. Honestly, this is mainly just a demo/proof of concept that we can handle dependencies and ordering issues with stream features. DON'T use XEP-0078 if you are able to use the normal SASL method, which should be the case unless you are dealing with a very old XMPP server implementation. --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index b997106c..e3b3aa9a 100644 --- a/setup.py +++ b/setup.py @@ -58,6 +58,7 @@ packages = [ 'sleekxmpp', 'sleekxmpp/plugins/xep_0060', 'sleekxmpp/plugins/xep_0060/stanza', 'sleekxmpp/plugins/xep_0066', + 'sleekxmpp/plugins/xep_0078', 'sleekxmpp/plugins/xep_0085', 'sleekxmpp/plugins/xep_0086', 'sleekxmpp/plugins/xep_0092', -- cgit v1.2.3