Skip to content

Commit 8236b30

Browse files
committed
Prepare 18.0.0 final
1 parent 0f31f2c commit 8236b30

12 files changed

+19
-19
lines changed

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2003-2012 Ralph Meijer.
1+
Copyright (c) 2003-2018 Ralph Meijer.
22

33
Permission is hereby granted, free of charge, to any person obtaining
44
a copy of this software and associated documentation files (the

NEWS.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ Changes for the upcoming release can be found in the `wokkel/newsfragments` dire
1414

1515
.. towncrier release notes start
1616
17-
Wokkel 18.0.0rc5 (2018-09-04)
18-
=============================
17+
Wokkel 18.0.0 (2018-12-04)
18+
==========================
1919

2020
Features
2121
--------

README.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Wokkel 18.0.0rc5
2-
=================
1+
Wokkel 18.0.0
2+
=============
33

44
|pypi|
55
|travis|

debian/changelog

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
wokkel (18.0.0~~rc5) testing; urgency=low
1+
wokkel (18.0.0) testing; urgency=low
22

3-
* Release Wokkel 18.0.0 release candidate 4
3+
* Release Wokkel 18.0.0
44

5-
-- Ralph Meijer <[email protected]> Tue, 04 Sep 2018 09:48:09 +0200
5+
-- Ralph Meijer <[email protected]> Tue, 04 Dec 2018 09:12:14 +0100
66

77
wokkel (0.7.1) testing; urgency=low
88

debian/control

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Homepage: http://wokkel.ik.nu/
1010
Package: python-wokkel
1111
Architecture: all
1212
XB-Python-Version: ${python:Versions}
13-
Depends: ${python:Depends}, ${misc:Depends}, python-twisted (>= 10.0.0), python-twisted-words (>= 10.0.0), python-twisted-names (>= 10.0.0), python-dateutil
13+
Depends: ${python:Depends}, ${misc:Depends}, python-twisted (>= 15.5.0), python-twisted-words (>= 15.5.0), python-twisted-names (>= 15.5.0), python-dateutil, python-incremental (>= 16.9.0)
1414
Description: A set of enhancements to Twisted Words' Jabber/XMPP
1515
It serves as a testing ground for new features and enhancements which will
1616
eventually end up in Twisted Words. It currently provides sub-protocols,

debian/copyright

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Author:
99

1010
Copyright:
1111

12-
(C) 2003-2012 Ralph Meijer <[email protected]>
12+
(C) 2003-2018 Ralph Meijer <[email protected]>
1313

1414
License:
1515

debian/docs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
NEWS
2-
README
1+
NEWS.rst
2+
README.rst
33
doc/*

doc/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
# The short X.Y version.
5151
version = '18.0.0'
5252
# The full version, including alpha/beta/rc tags.
53-
release = '18.0.0rc5'
53+
release = '18.0.0'
5454

5555
# The language for content autogenerated by Sphinx. Refer to documentation
5656
# for a list of supported languages.

wokkel/_version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
from incremental import Version
22

3-
__version__ = Version("wokkel", 18, 0, 0, release_candidate=5)
3+
__version__ = Version("wokkel", 18, 0, 0)
44
__all__ = ["__version__"]

wokkel/generic.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ def clientConnectionFailed(self, connector, reason):
335335

336336

337337

338-
@deprecated(Version("wokkel", 18, 0, 0, release_candidate=5), "unicode.encode('idna')")
338+
@deprecated(Version("wokkel", 18, 0, 0), "unicode.encode('idna')")
339339
def prepareIDNName(name):
340340
"""
341341
Encode a unicode IDN Domain Name into its ACE equivalent.

wokkel/test/test_generic.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -326,15 +326,15 @@ class PrepareIDNNameTests(unittest.TestCase):
326326
message=re.escape(
327327
deprecate.getDeprecationWarningString(
328328
generic.prepareIDNName,
329-
Version("wokkel", 18, 0, 0, release_candidate=5),
329+
Version("wokkel", 18, 0, 0),
330330
replacement="unicode.encode('idna')")))]
331331

332332

333333
def test_deprecated(self):
334334
"""
335335
prepareIDNName is deprecated.
336336
"""
337-
self.callDeprecated((Version("wokkel", 18, 0, 0, release_candidate=5),
337+
self.callDeprecated((Version("wokkel", 18, 0, 0),
338338
"unicode.encode('idna')"),
339339
generic.prepareIDNName, ("example.com"))
340340
test_deprecated.suppress = []

wokkel/test/test_version.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def test_version(self):
2121
"""
2222
Package version is present and correct.
2323
"""
24-
self.assertEqual("18.0.0rc5", wokkel.__version__)
24+
self.assertEqual("18.0.0", wokkel.__version__)
2525

2626

2727
class IncrementalVersionTest(unittest.TestCase):
@@ -34,4 +34,4 @@ def test_version(self):
3434
Package version is present and correct.
3535
"""
3636
self.assertEqual("wokkel", _version.__version__.package)
37-
self.assertEqual("18.0.0rc5", _version.__version__.public())
37+
self.assertEqual("18.0.0", _version.__version__.public())

0 commit comments

Comments
 (0)