Changeset 240:3a201c5b385f

Timestamp:

Mar 5, 2018, 5:12:30 PM (4 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

committer:

Ralph Meijer <ralphm@ik.nu> 1520266418 -3600

hg-git-rename-source:

git

Message:

Use incremental instead of t.p.versions everywhere

twisted.python.versions is a precursor of the incremental library
but isn't fully API compatible. This caused breakage with older Twisted
versions. Switching to incremental everywhere resolves this. Also fix
the version to at least 16.9.0, which introduced the release_candidate
parameter.

Files:

• NEWS.rst (modified) (1 diff)
• README.rst (modified) (2 diffs)
• debian/changelog (modified) (1 diff)
• doc/conf.py (modified) (1 diff)
• setup.py (modified) (1 diff)
• wokkel/__init__.py (modified) (1 diff)
• wokkel/_version.py (modified) (1 diff)
• wokkel/generic.py (modified) (2 diffs)
• wokkel/iwokkel.py (modified) (2 diffs)
• wokkel/subprotocols.py (modified) (2 diffs)
• wokkel/test/test_generic.py (modified) (3 diffs)
• wokkel/test/test_iwokkel.py (modified) (1 diff)
• wokkel/test/test_subprotocols.py (modified) (1 diff)
• wokkel/test/test_version.py (added)

NEWS.rst

@@ -15 +15 @@
 .. towncrier release notes start
 
-Wokkel 18.0.0rc3 (2018-02-28)
+Wokkel 18.0.0rc4 (2018-03-05)
 =============================
 

README.rst

@@ -1 @@
-Wokkel 18.0.0rc3
+Wokkel 18.0.0rc4
 =================
 
@@ -18 +18 @@
 ------------
 
-- Python 2.7, Python 3.3 or later, or pypy equivalent.
+- Python 2.7, Python 3.4 or later, or pypy equivalent
 - Twisted 15.5.0 or later for Python 2
-- Twisted 16.4.0 or later for Python 3.
+- Twisted 16.4.0 or later for Python 3
 - python-dateutil
+- incremental 16.9.0 or later
 
 

debian/changelog

@@ -1 @@
-wokkel (18.0.0~~rc3) testing; urgency=low
+wokkel (18.0.0~~rc4) testing; urgency=low
 
-  * Release Wokkel 18.0.0 release candidate 3
+  * Release Wokkel 18.0.0 release candidate 4
 
- -- Ralph Meijer <ralphm@ik.nu>  Wed, 28 Feb 2018 13:42:48 +0100
+ -- Ralph Meijer <ralphm@ik.nu>  Mon, 05 Mar 2018 10:00:03 +0100
 
 wokkel (0.7.1) testing; urgency=low

doc/conf.py

@@ -51 +51 @@
 version = '18.0.0'
 # The full version, including alpha/beta/rc tags.
-release = '18.0.0rc3'
+release = '18.0.0rc4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation

setup.py

@@ -55 +55 @@
       zip_safe=False,
       setup_requires=[
-          'incremental',
+          'incremental>=16.9.0',
       ],
       use_incremental=True,
       install_requires=[
-          'incremental',
+          'incremental>=16.9.0',
           'python-dateutil',
       ],

wokkel/__init__.py

@@ -10 +10 @@
 from wokkel._version import __version__ as _incremental_version
 
-__version__ = _incremental_version.base()
+__version__ = _incremental_version.public()
 
 __all__ = ["__version__"]

wokkel/_version.py

@@ -1 +1 @@
 from incremental import Version
 
-__version__ = Version("wokkel", 18, 0, 0, release_candidate=3)
+__version__ = Version("wokkel", 18, 0, 0, release_candidate=4)
 __all__ = ["__version__"]

wokkel/generic.py

@@ -15 +15 @@
 from twisted.python import reflect
 from twisted.python.deprecate import deprecated
-from twisted.python.versions import Version
 from twisted.words.protocols.jabber import error, jid, xmlstream
 from twisted.words.protocols.jabber.xmlstream import toResponse
 from twisted.words.xish import domish, utility
 from twisted.words.xish.xmlstream import BootstrapMixin
+
+from incremental import Version
 
 from wokkel.iwokkel import IDisco
@@ -335 +336 @@
 
 
-@deprecated(Version("Wokkel", 18, 0, 0, release_candidate=3), "unicode.encode('idna')")
+@deprecated(Version("wokkel", 18, 0, 0, release_candidate=4), "unicode.encode('idna')")
 def prepareIDNName(name):
     """

wokkel/iwokkel.py

@@ -12 +12 @@
 from zope.interface import Interface
 from twisted.python.deprecate import deprecatedModuleAttribute
-from twisted.python.versions import Version
 from twisted.words.protocols.jabber.ijabber import IXMPPHandler
 from twisted.words.protocols.jabber.ijabber import IXMPPHandlerCollection
 
+from incremental import Version
+
 deprecatedModuleAttribute(
-        Version("Wokkel", 0, 7, 0),
+        Version("wokkel", 0, 7, 0),
         "Use twisted.words.protocols.jabber.ijabber.IXMPPHandler instead.",
         __name__,
@@ -23 +24 @@
 
 deprecatedModuleAttribute(
-        Version("Wokkel", 0, 7, 0),
+        Version("wokkel", 0, 7, 0),
         "Use twisted.words.protocols.jabber.ijabber.IXMPPHandlerCollection "
                 "instead.",

wokkel/subprotocols.py

@@ -17 +17 @@
 from twisted.python.compat import iteritems, itervalues
 from twisted.python.deprecate import deprecatedModuleAttribute
-from twisted.python.versions import Version
 from twisted.words.protocols.jabber import error, ijabber, xmlstream
 from twisted.words.protocols.jabber.xmlstream import toResponse
@@ -24 +23 @@
 from twisted.words.xish.domish import IElement
 
+from incremental import Version
+
 deprecatedModuleAttribute(
-        Version("Wokkel", 0, 7, 0),
+        Version("wokkel", 0, 7, 0),
         "Use twisted.words.protocols.jabber.xmlstream.XMPPHandlerCollection "
                 "instead.",

wokkel/test/test_generic.py

@@ -14 +14 @@
 from twisted.python import deprecate
 from twisted.python.compat import unicode
-from twisted.python.versions import Version
 from twisted.trial import unittest
 from twisted.trial.util import suppress as SUPPRESS
 from twisted.words.xish import domish
 from twisted.words.protocols.jabber.jid import JID
+
+from incremental import Version
 
 from wokkel import generic
@@ -326 +327 @@
                              deprecate.getDeprecationWarningString(
                                  generic.prepareIDNName,
-                                 Version("Wokkel", 18, 0, 0, release_candidate=3),
+                                 Version("wokkel", 18, 0, 0, release_candidate=4),
                                  replacement="unicode.encode('idna')")))]
 
@@ -334 +335 @@
         prepareIDNName is deprecated.
         """
-        self.callDeprecated((Version("Wokkel", 18, 0, 0, release_candidate=3),
+        self.callDeprecated((Version("wokkel", 18, 0, 0, release_candidate=4),
                              "unicode.encode('idna')"),
                             generic.prepareIDNName, ("example.com"))

wokkel/test/test_iwokkel.py

@@ -25 +25 @@
             warningsShown[0]['message'],
             "wokkel.iwokkel." + attributeName + " "
-            "was deprecated in Wokkel 0.7.0: Use " + newName + " instead.")
+            "was deprecated in wokkel 0.7.0: Use " + newName + " instead.")
 
 

wokkel/test/test_subprotocols.py

@@ -35 +35 @@
             warningsShown[0]['message'],
             "wokkel.subprotocols." + attributeName + " "
-            "was deprecated in Wokkel 0.7.0: Use " + newName + " instead.")
+            "was deprecated in wokkel 0.7.0: Use " + newName + " instead.")