Release 3.13b1 updates
diff --git a/CHANGES b/CHANGES
index 938dc46..acc8b7f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,21 @@
-For a complete Mercurial changelog, see
-'https://bitbucket.org/xi/pyyaml/commits'.
+For a complete changelog, see https://github.com/yaml/pyyaml/commits/
+
+3.13 (2018-07-02)
+-----------------
+
+* Rebuilt with the latest Cython to support the new Python 3.7 release.
+* No functionality is different from PyYAML 3.12 in this release.
+
+3.12 (2016-08-28)
+-----------------
+
+* Wheel packages for Windows binaries.
+* Adding an implicit resolver to a derived loader should not affect the base
+ loader (fixes issue #57).
+* Uniform representation for OrderedDict across different versions of Python
+ (fixes issue #61).
+* Fixed comparison to None warning (closes issue #64).
3.11 (2014-03-26)
-----------------
diff --git a/LICENSE b/LICENSE
index 050ced2..21cdd1d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,5 @@
-Copyright (c) 2006 Kirill Simonov
+Copyright (c) 2017-2018 Ingy döt Net
+Copyright (c) 2006-2016 Kirill Simonov
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
diff --git a/announcement.msg b/announcement.msg
index c9bfeaa..b105745 100644
--- a/announcement.msg
+++ b/announcement.msg
@@ -1,36 +1,54 @@
-From: Kirill Simonov <xi@resolvent.net>
+From: Ingy döt Net <ingy@ingy.net>
To: python-list@python.org, python-announce@python.org, yaml-core@lists.sourceforge.net
-Subject: [ANN] PyYAML-3.12: YAML parser and emitter for Python
+Subject: [ANN] PyYAML-3.13: YAML parser and emitter for Python
========================
- Announcing PyYAML-3.12
+ Announcing PyYAML-3.13
========================
A new bug fix release of PyYAML is now available:
http://pyyaml.org/wiki/PyYAML
+*** Important Note From Maintainers ***
+
+This is the first PyYAML release by the new maintainers. It was made critical
+because PyYAML-3.12 did not work with the recent Python 3.7 release.
+
+A more ambitious 4.1 release was attempted last week and needed to be retracted
+for many reasons. We apologize any pain caused by the 4.1 removal, but we
+remain confident that it was the best decision.
+
+There are over 60 pull requests in PyYAML and LibYAML that will be represented
+in the upcoming 4.2 release and we are working hard to get those to you as soon
+as the release is ready (but no sooner :).
+
+We are are excited that the PyYAML project is moving forward again.
+
+-- The PyYAML Maintenance Team
+
+
Changes
=======
-* Wheel packages for Windows binaries.
-* Adding an implicit resolver to a derived loader should not affect
- the base loader (fixes issue #57).
-* Uniform representation for OrderedDict across different versions
- of Python (fixes issue #61).
-* Fixed comparison to None warning (closes issue #64).
+* Rebuilt with the latest Cython to support the new Python 3.7 release.
+* No functionality is different from PyYAML 3.12 in this release.
Resources
=========
+PyYAML IRC Channel: #pyyaml on irc.freenode.net
+YAML IRC Channel: #yaml-dev on irc.freenode.net
+LibYAML IRC Channel: #libyaml on irc.freenode.net
+
PyYAML homepage: http://pyyaml.org/wiki/PyYAML
PyYAML documentation: http://pyyaml.org/wiki/PyYAMLDocumentation
-Source and binary installers: https://pypi.python.org/pypi/PyYAML/3.12
+Source and binary installers: https://pypi.python.org/pypi/PyYAML/3.13
-PyYAML HG repository: https://bitbucket.org/xi/pyyaml
-Submit a bug report: https://bitbucket.org/xi/pyyaml/issues/new
+GitHub repository: https://github.com/yaml/pyyaml/
+Bug tracking: https://github.com/yaml/pyyaml/issues
YAML homepage: http://yaml.org/
YAML-core mailing list: http://lists.sourceforge.net/lists/listinfo/yaml-core
@@ -40,16 +58,16 @@
============
YAML is a data serialization format designed for human readability and
-interaction with scripting languages. PyYAML is a YAML parser and
-emitter for Python.
+interaction with scripting languages. PyYAML is a YAML parser and emitter for
+Python.
-PyYAML features a complete YAML 1.1 parser, Unicode support, pickle
-support, capable extension API, and sensible error messages. PyYAML
-supports standard YAML tags and provides Python-specific tags that allow
-to represent an arbitrary Python object.
+PyYAML features a complete YAML 1.1 parser, Unicode support, pickle support,
+capable extension API, and sensible error messages. PyYAML supports standard
+YAML tags and provides Python-specific tags that allow to represent an
+arbitrary Python object.
-PyYAML is applicable for a broad range of tasks from complex
-configuration files to object serialization and persistance.
+PyYAML is applicable for a broad range of tasks from complex configuration
+files to object serialization and persistance.
Example
@@ -74,10 +92,27 @@
keywords: [YAML, serialization, configuration, persistance, pickle]
+Maintainers
+===========
+
+The following people are currently responsible for maintaining PyYAML:
+
+* Ingy döt Net
+* Tina Mueller
+* Matt Davis
+
+and many thanks to all who have contribributed!
+See: https://github.com/yaml/pyyaml/pulls
+
+
Copyright
=========
-The PyYAML module is written by Kirill Simonov <xi@resolvent.net>.
+Copyright (c) 2017-2018 Ingy döt Net <ingy@ingy.net>
+Copyright (c) 2006-2016 Kirill Simonov <xi@resolvent.net>
+
+The PyYAML module was written by Kirill Simonov <xi@resolvent.net>.
+It is currently maintained by the YAML and Python communities.
PyYAML is released under the MIT license.
-
+See the file LICENSE for more details.
diff --git a/lib/yaml/__init__.py b/lib/yaml/__init__.py
index 87c15d3..25d03d6 100644
--- a/lib/yaml/__init__.py
+++ b/lib/yaml/__init__.py
@@ -8,7 +8,7 @@
from loader import *
from dumper import *
-__version__ = '3.12'
+__version__ = '3.13'
try:
from cyaml import *
diff --git a/lib3/yaml/__init__.py b/lib3/yaml/__init__.py
index d7d27fe..9e35fe2 100644
--- a/lib3/yaml/__init__.py
+++ b/lib3/yaml/__init__.py
@@ -8,7 +8,7 @@
from .loader import *
from .dumper import *
-__version__ = '3.12'
+__version__ = '3.13'
try:
from .cyaml import *
__with_libyaml__ = True
diff --git a/setup.py b/setup.py
index 9dc5e8d..902660c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
NAME = 'PyYAML'
-VERSION = '3.12'
+VERSION = '3.13'
DESCRIPTION = "YAML parser and emitter for Python"
LONG_DESCRIPTION = """\
YAML is a data serialization format designed for human readability
