[Python-modules-commits] r24680 - in packages/stomper/trunk/debian (8 files)

laarmen-guest at users.alioth.debian.org laarmen-guest at users.alioth.debian.org
Thu Jun 6 16:20:09 UTC 2013


    Date: Thursday, June 6, 2013 @ 16:19:47
  Author: laarmen-guest
Revision: 24680

Store doc and examples in /usr/share/doc/stomper
Run tests at build time
Fix typos in doc

Added:
  packages/stomper/trunk/debian/doc
  packages/stomper/trunk/debian/examples
  packages/stomper/trunk/debian/patches/
  packages/stomper/trunk/debian/patches/fix_typos
  packages/stomper/trunk/debian/patches/remove_package_data
  packages/stomper/trunk/debian/patches/series
Modified:
  packages/stomper/trunk/debian/control
  packages/stomper/trunk/debian/rules

Modified: packages/stomper/trunk/debian/control
===================================================================
--- packages/stomper/trunk/debian/control	2013-06-06 12:11:25 UTC (rev 24679)
+++ packages/stomper/trunk/debian/control	2013-06-06 16:19:47 UTC (rev 24680)
@@ -24,5 +24,7 @@
  messages can be easily generated and parsed, however its up to the user to do
  the sending and receiving.
  .
- The STOMP protocol specification can be found at
+ The Streaming Text Oriented Messaging Protocol is a text-based protocol
+ vaguely similar to HTTP, intended for message oriented middleware. Its
+ protocol specification can be found at
  http://stomp.github.io/

Added: packages/stomper/trunk/debian/doc
===================================================================
--- packages/stomper/trunk/debian/doc	                        (rev 0)
+++ packages/stomper/trunk/debian/doc	2013-06-06 16:19:47 UTC (rev 24680)
@@ -0,0 +1 @@
+lib/stomper/doc/stomper.stx

Added: packages/stomper/trunk/debian/examples
===================================================================
--- packages/stomper/trunk/debian/examples	                        (rev 0)
+++ packages/stomper/trunk/debian/examples	2013-06-06 16:19:47 UTC (rev 24680)
@@ -0,0 +1 @@
+lib/stomper/examples/*

Added: packages/stomper/trunk/debian/patches/fix_typos
===================================================================
--- packages/stomper/trunk/debian/patches/fix_typos	                        (rev 0)
+++ packages/stomper/trunk/debian/patches/fix_typos	2013-06-06 16:19:47 UTC (rev 24680)
@@ -0,0 +1,234 @@
+From: Simon Chopin <chopin.simon at gmail.com>
+Date: Thu, 6 Jun 2013 16:53:11 +0200
+Subject: Fix various typos
+Forwarded: https://github.com/oisinmulvihill/stomper/pull/2
+
+diff --git a/README.md b/README.md
+index ae4e5c1..b2eb900 100644
+--- a/README.md
++++ b/README.md
+@@ -20,7 +20,7 @@ Introduction
+ This is a python client implementation of the STOMP protocol.
+ 
+ The client is attempting to be transport layer neutral. This module provides
+-functions to create and parse STOMP messages in a programatic fashion. The
++functions to create and parse STOMP messages in a programmatic fashion. The
+ messages can be easily generated and parsed, however its up to the user to do
+ the sending and receiving. The STOMP protocol specification can be found here:
+ 
+@@ -28,7 +28,7 @@ the sending and receiving. The STOMP protocol specification can be found here:
+ 
+ I've looked at the stomp client by Jason R. Briggs. I've based some of the
+ 'function to message' generation on how his client does it. The client can
+-be found at the follow address however it isn't a dependancy.
++be found at the follow address however it isn't a dependency.
+ 
+ - `stompy <http://www.briggs.net.nz/log/projects/stomppy>`_
+ 
+@@ -83,7 +83,7 @@ Roger Hoover. This removes the extra line ending which can cause problems.
+ 0.2.4
+ ~~~~~
+ 
+-OM: A minor relase fixing the problem whereby uuid would be installed on python2.5+. It
++OM: A minor release fixing the problem whereby uuid would be installed on python2.5+. It
+ is not needed after python2.4 as it comes with python. Arfrever Frehtes Taifersar Arahesis
+ contributed the fix for this.
+ 
+diff --git a/lib/stomper.egg-info/PKG-INFO b/lib/stomper.egg-info/PKG-INFO
+index f73cfc2..6a87896 100644
+--- a/lib/stomper.egg-info/PKG-INFO
++++ b/lib/stomper.egg-info/PKG-INFO
+@@ -26,7 +26,7 @@ Description: =======
+         This is a python client implementation of the STOMP protocol. 
+         
+         The client is attempting to be transport layer neutral. This module provides 
+-        functions to create and parse STOMP messages in a programatic fashion. The 
++        functions to create and parse STOMP messages in a programmatic fashion. The 
+         messages can be easily generated and parsed, however its up to the user to do
+         the sending and receiving. The STOMP protocol specification can be found here:
+         
+@@ -82,7 +82,7 @@ Description: =======
+         0.2.4
+         ~~~~~
+         
+-        OM: A minor relase fixing the problem whereby uuid would be installed on python2.5+. It 
++        OM: A minor release fixing the problem whereby uuid would be installed on python2.5+. It 
+         is not needed after python2.4 as it comes with python. Arfrever Frehtes Taifersar Arahesis 
+         contributed the fix for this.
+         
+diff --git a/lib/stomper/__init__.py b/lib/stomper/__init__.py
+index ee98b1f..ebfab22 100644
+--- a/lib/stomper/__init__.py
++++ b/lib/stomper/__init__.py
+@@ -2,7 +2,7 @@
+ This is a python client implementation of the STOMP protocol.
+ 
+ It aims to be transport layer neutral. This module provides functions to
+-create and parse STOMP messages in a programatic fashion.
++create and parse STOMP messages in a programmatic fashion.
+ 
+ The examples package contains two examples using twisted as the transport
+ framework. Other frameworks can be used and I may add other examples as
+@@ -39,7 +39,7 @@ import doc
+ import utils
+ import stompbuffer
+ 
+-# This is used as a return from message reponses functions.
++# This is used as a return from message responses functions.
+ # It is used more for readability more then anything or reason.
+ NO_RESPONSE_NEEDED = ''
+ 
+@@ -79,7 +79,7 @@ class Frame(object):
+ 
+     The method unpack() is used to read a STOMP message into
+     a frame instance. It uses the unpack_frame(...) function
+-    to do the intial parsing.
++    to do the initial parsing.
+ 
+     The frame has three important member variables:
+ 
+@@ -128,12 +128,12 @@ class Frame(object):
+         headers = ''.join(
+             ['%s:%s\n' % (f, v) for f, v in self.headers.items()]
+         )
+-        stomp_mesage = "%s\n%s\n%s%s\n" % (self._cmd, headers, self.body, NULL)
++        stomp_message = "%s\n%s\n%s%s\n" % (self._cmd, headers, self.body, NULL)
+ 
+ #        import pprint
+-#        print "stomp_mesage: ", pprint.pprint(stomp_mesage)
++#        print "stomp_message: ", pprint.pprint(stomp_message)
+ 
+-        return stomp_mesage
++        return stomp_message
+ 
+ 
+     def unpack(self, message):
+@@ -287,7 +287,7 @@ def commit(transactionid):
+     """STOMP commit command.
+ 
+     Do whatever is required to make the series of actions
+-    permenant for this transactionid.
++    permanent for this transactionid.
+ 
+     transactionid:
+         This is the id that all actions in this transaction.
+@@ -425,9 +425,9 @@ class Engine(object):
+ 
+ 
+     def connected(self, msg):
+-        """No reponse is needed to a connected frame.
++        """No response is needed to a connected frame.
+ 
+-        This method stores the session id as a the
++        This method stores the session id as the
+         member sessionId for later use.
+ 
+         returned:
+@@ -445,7 +445,7 @@ class Engine(object):
+ 
+         Override this method to handle received messages.
+ 
+-        This function will generate an acknowlege message
++        This function will generate an acknowledge message
+         for the given message and transaction (if present).
+ 
+         """
+diff --git a/lib/stomper/doc/stomper.stx b/lib/stomper/doc/stomper.stx
+index 3a86140..c0c1235 100644
+--- a/lib/stomper/doc/stomper.stx
++++ b/lib/stomper/doc/stomper.stx
+@@ -20,7 +20,7 @@ Introduction
+ This is a python client implementation of the STOMP protocol.
+ 
+ The client is attempting to be transport layer neutral. This module provides
+-functions to create and parse STOMP messages in a programatic fashion. The
++functions to create and parse STOMP messages in a programmatic fashion. The
+ messages can be easily generated and parsed, however its up to the user to do
+ the sending and receiving. The STOMP protocol specification can be found here:
+ 
+@@ -83,7 +83,7 @@ Roger Hoover. This removes the extra line ending which can cause problems.
+ 0.2.4
+ ~~~~~
+ 
+-OM: A minor relase fixing the problem whereby uuid would be installed on python2.5+. It
++OM: A minor release fixing the problem whereby uuid would be installed on python2.5+. It
+ is not needed after python2.4 as it comes with python. Arfrever Frehtes Taifersar Arahesis
+ contributed the fix for this.
+ 
+diff --git a/lib/stomper/examples/sender.py b/lib/stomper/examples/sender.py
+index 63d7df0..a6b1aed 100644
+--- a/lib/stomper/examples/sender.py
++++ b/lib/stomper/examples/sender.py
+@@ -57,7 +57,7 @@ class StompProtocol(Protocol, stomper.Engine):
+ 
+         # ActiveMQ specific headers:
+         #
+-        # prevent the messages we send comming back to us.
++        # prevent the messages we send coming back to us.
+         f.headers['activemq.noLocal'] = 'true'
+         
+         return f.pack()
+diff --git a/lib/stomper/examples/stompbuffer-tx.py b/lib/stomper/examples/stompbuffer-tx.py
+index 38bb725..769f774 100644
+--- a/lib/stomper/examples/stompbuffer-tx.py
++++ b/lib/stomper/examples/stompbuffer-tx.py
+@@ -36,7 +36,7 @@ class StompProtocol(Protocol, stomper.Engine):
+         """
+         stomper.Engine.connected(self, msg)
+ 
+-        self.log.info("Connected: session %s. Begining say hello." % msg['headers']['session'])
++        self.log.info("Connected: session %s. Beginning say hello." % msg['headers']['session'])
+         
+         def setup_looping_call():
+             lc = LoopingCall(self.send)
+diff --git a/lib/stomper/examples/stomper_usage.py b/lib/stomper/examples/stomper_usage.py
+index 266e6c8..8b0fd77 100644
+--- a/lib/stomper/examples/stomper_usage.py
++++ b/lib/stomper/examples/stomper_usage.py
+@@ -44,7 +44,7 @@ resp = responder.react(stomper.unpack_frame(response))
+ # just returns an empty string.
+ 
+ 
+-# After a successfull connect you might want to subscribe
++# After a successful connect you might want to subscribe
+ # for messages from a destination and tell the server you'll
+ # acknowledge all messages.
+ #
+diff --git a/lib/stomper/tests/teststompbuffer.py b/lib/stomper/tests/teststompbuffer.py
+index 4448c82..500dece 100644
+--- a/lib/stomper/tests/teststompbuffer.py
++++ b/lib/stomper/tests/teststompbuffer.py
+@@ -128,7 +128,7 @@ class StompBufferTestCase ( unittest.TestCase ):
+         msg1 = self.putAndGetText()
+         msg2 = self.sb.getOneMessage()
+         self.failUnless ( msg2 is None )
+-        # Veryify that in fact the buffer is empty.
++        # Verify that in fact the buffer is empty.
+         self.failUnless ( self.sb.bufferIsEmpty() )
+ 
+ 
+@@ -141,7 +141,7 @@ class StompBufferTestCase ( unittest.TestCase ):
+         msg1 = self.putAndGetBinary()
+         msg2 = self.sb.getOneMessage()
+         self.failUnless ( msg2 is None )
+-        # Veryify that in fact the buffer is empty.
++        # Verify that in fact the buffer is empty.
+         self.failUnless ( self.sb.bufferIsEmpty() )
+ 
+ 
+diff --git a/lib/stomper/tests/teststomper.py b/lib/stomper/tests/teststomper.py
+index ed40b49..b6a8dc8 100644
+--- a/lib/stomper/tests/teststomper.py
++++ b/lib/stomper/tests/teststomper.py
+@@ -70,7 +70,7 @@ class StomperTest(unittest.TestCase):
+         # React to an error:
+         error = stomper.Frame()
+         error.cmd = 'ERROR'
+-        error.headers = {'mesage:': 'malformed packet received!'}
++        error.headers = {'message:': 'malformed packet received!'}
+         error.body = """The message:
+ -----
+ MESSAGE
+-- 
+1.7.10.4
+

Added: packages/stomper/trunk/debian/patches/remove_package_data
===================================================================
--- packages/stomper/trunk/debian/patches/remove_package_data	                        (rev 0)
+++ packages/stomper/trunk/debian/patches/remove_package_data	2013-06-06 16:19:47 UTC (rev 24680)
@@ -0,0 +1,28 @@
+Description: Do not ship the doc in the setup.py
+Author: Simon Chopin <chopin.simon at gmail.com>
+Forwarded: not-needed
+
+--- a/setup.py
++++ b/setup.py
+@@ -43,12 +43,6 @@
+ 
+ ProjectScripts = []
+ 
+-PackageData = {
+-    # If any package contains *.txt or *.rst files, include them:
+-    'stomper': ['doc/*.stx'],
+-}
+-
+-
+ needed = []
+ if sys.version_info < (2, 5):
+     needed += [
+@@ -68,7 +62,6 @@
+     install_requires=needed,
+     test_suite=TestSuite,
+     scripts=ProjectScripts,
+-    packages=find_packages('lib'),
+-    package_data=PackageData,
++    packages=find_packages('lib', exclude=["*.examples", "*.doc", "*.tests"]),
+     package_dir={'': 'lib'},
+ )

Added: packages/stomper/trunk/debian/patches/series
===================================================================
--- packages/stomper/trunk/debian/patches/series	                        (rev 0)
+++ packages/stomper/trunk/debian/patches/series	2013-06-06 16:19:47 UTC (rev 24680)
@@ -0,0 +1,2 @@
+remove_package_data
+fix_typos

Modified: packages/stomper/trunk/debian/rules
===================================================================
--- packages/stomper/trunk/debian/rules	2013-06-06 12:11:25 UTC (rev 24679)
+++ packages/stomper/trunk/debian/rules	2013-06-06 16:19:47 UTC (rev 24680)
@@ -6,3 +6,9 @@
 override_dh_install:
 	dh_install
 	rm -f debian/python-stomper/usr/lib/python*/dist-packages/stomper-*.egg-info/SOURCES.txt
+
+override_dh_auto_test:
+	set -e; \
+	for py in $(shell pyversions -r); do \
+		$$py setup.py test; \
+	done




More information about the Python-modules-commits mailing list