Changeset 240:3a201c5b385f


Ignore:
Timestamp:
Mar 5, 2018, 5:12:30 PM (3 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:
1 added
13 edited

Legend:

Unmodified
Added
Removed
  • NEWS.rst

    r239 r240  
    1515.. towncrier release notes start
    1616
    17 Wokkel 18.0.0rc3 (2018-02-28)
     17Wokkel 18.0.0rc4 (2018-03-05)
    1818=============================
    1919
  • README.rst

    r238 r240  
    1 Wokkel 18.0.0rc3
     1Wokkel 18.0.0rc4
    22=================
    33
     
    1818------------
    1919
    20 - Python 2.7, Python 3.3 or later, or pypy equivalent.
     20- Python 2.7, Python 3.4 or later, or pypy equivalent
    2121- Twisted 15.5.0 or later for Python 2
    22 - Twisted 16.4.0 or later for Python 3.
     22- Twisted 16.4.0 or later for Python 3
    2323- python-dateutil
     24- incremental 16.9.0 or later
    2425
    2526
  • debian/changelog

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

    r238 r240  
    5151version = '18.0.0'
    5252# The full version, including alpha/beta/rc tags.
    53 release = '18.0.0rc3'
     53release = '18.0.0rc4'
    5454
    5555# The language for content autogenerated by Sphinx. Refer to documentation
  • setup.py

    r238 r240  
    5555      zip_safe=False,
    5656      setup_requires=[
    57           'incremental',
     57          'incremental>=16.9.0',
    5858      ],
    5959      use_incremental=True,
    6060      install_requires=[
    61           'incremental',
     61          'incremental>=16.9.0',
    6262          'python-dateutil',
    6363      ],
  • wokkel/__init__.py

    r232 r240  
    1010from wokkel._version import __version__ as _incremental_version
    1111
    12 __version__ = _incremental_version.base()
     12__version__ = _incremental_version.public()
    1313
    1414__all__ = ["__version__"]
  • wokkel/_version.py

    r238 r240  
    11from incremental import Version
    22
    3 __version__ = Version("wokkel", 18, 0, 0, release_candidate=3)
     3__version__ = Version("wokkel", 18, 0, 0, release_candidate=4)
    44__all__ = ["__version__"]
  • wokkel/generic.py

    r238 r240  
    1515from twisted.python import reflect
    1616from twisted.python.deprecate import deprecated
    17 from twisted.python.versions import Version
    1817from twisted.words.protocols.jabber import error, jid, xmlstream
    1918from twisted.words.protocols.jabber.xmlstream import toResponse
    2019from twisted.words.xish import domish, utility
    2120from twisted.words.xish.xmlstream import BootstrapMixin
     21
     22from incremental import Version
    2223
    2324from wokkel.iwokkel import IDisco
     
    335336
    336337
    337 @deprecated(Version("Wokkel", 18, 0, 0, release_candidate=3), "unicode.encode('idna')")
     338@deprecated(Version("wokkel", 18, 0, 0, release_candidate=4), "unicode.encode('idna')")
    338339def prepareIDNName(name):
    339340    """
  • wokkel/iwokkel.py

    r193 r240  
    1212from zope.interface import Interface
    1313from twisted.python.deprecate import deprecatedModuleAttribute
    14 from twisted.python.versions import Version
    1514from twisted.words.protocols.jabber.ijabber import IXMPPHandler
    1615from twisted.words.protocols.jabber.ijabber import IXMPPHandlerCollection
    1716
     17from incremental import Version
     18
    1819deprecatedModuleAttribute(
    19         Version("Wokkel", 0, 7, 0),
     20        Version("wokkel", 0, 7, 0),
    2021        "Use twisted.words.protocols.jabber.ijabber.IXMPPHandler instead.",
    2122        __name__,
     
    2324
    2425deprecatedModuleAttribute(
    25         Version("Wokkel", 0, 7, 0),
     26        Version("wokkel", 0, 7, 0),
    2627        "Use twisted.words.protocols.jabber.ijabber.IXMPPHandlerCollection "
    2728                "instead.",
  • wokkel/subprotocols.py

    r194 r240  
    1717from twisted.python.compat import iteritems, itervalues
    1818from twisted.python.deprecate import deprecatedModuleAttribute
    19 from twisted.python.versions import Version
    2019from twisted.words.protocols.jabber import error, ijabber, xmlstream
    2120from twisted.words.protocols.jabber.xmlstream import toResponse
     
    2423from twisted.words.xish.domish import IElement
    2524
     25from incremental import Version
     26
    2627deprecatedModuleAttribute(
    27         Version("Wokkel", 0, 7, 0),
     28        Version("wokkel", 0, 7, 0),
    2829        "Use twisted.words.protocols.jabber.xmlstream.XMPPHandlerCollection "
    2930                "instead.",
  • wokkel/test/test_generic.py

    r238 r240  
    1414from twisted.python import deprecate
    1515from twisted.python.compat import unicode
    16 from twisted.python.versions import Version
    1716from twisted.trial import unittest
    1817from twisted.trial.util import suppress as SUPPRESS
    1918from twisted.words.xish import domish
    2019from twisted.words.protocols.jabber.jid import JID
     20
     21from incremental import Version
    2122
    2223from wokkel import generic
     
    326327                             deprecate.getDeprecationWarningString(
    327328                                 generic.prepareIDNName,
    328                                  Version("Wokkel", 18, 0, 0, release_candidate=3),
     329                                 Version("wokkel", 18, 0, 0, release_candidate=4),
    329330                                 replacement="unicode.encode('idna')")))]
    330331
     
    334335        prepareIDNName is deprecated.
    335336        """
    336         self.callDeprecated((Version("Wokkel", 18, 0, 0, release_candidate=3),
     337        self.callDeprecated((Version("wokkel", 18, 0, 0, release_candidate=4),
    337338                             "unicode.encode('idna')"),
    338339                            generic.prepareIDNName, ("example.com"))
  • wokkel/test/test_iwokkel.py

    r193 r240  
    2525            warningsShown[0]['message'],
    2626            "wokkel.iwokkel." + attributeName + " "
    27             "was deprecated in Wokkel 0.7.0: Use " + newName + " instead.")
     27            "was deprecated in wokkel 0.7.0: Use " + newName + " instead.")
    2828
    2929
  • wokkel/test/test_subprotocols.py

    r194 r240  
    3535            warningsShown[0]['message'],
    3636            "wokkel.subprotocols." + attributeName + " "
    37             "was deprecated in Wokkel 0.7.0: Use " + newName + " instead.")
     37            "was deprecated in wokkel 0.7.0: Use " + newName + " instead.")
    3838
    3939
Note: See TracChangeset for help on using the changeset viewer.