diff --git a/CHANGES b/CHANGES index 8f220421..91f0255b 100644 --- a/CHANGES +++ b/CHANGES @@ -4,27 +4,39 @@ For a complete changelog, see: * https://github.com/yaml/pyyaml/commits/ * https://bitbucket.org/xi/pyyaml/commits/ -4.1 (2018-06-26) +5.1 (2019-03-13) ---------------- -* https://github.com/yaml/pyyaml/pull/35 -- Some modernization of the test running -* https://github.com/yaml/pyyaml/pull/42 -- Install tox in a virtualenv -* https://github.com/yaml/pyyaml/pull/45 -- Allow colon in a plain scalar in a flow context -* https://github.com/yaml/pyyaml/pull/48 -- Fix typos -* https://github.com/yaml/pyyaml/pull/55 -- Improve RepresenterError creation -* https://github.com/yaml/pyyaml/pull/59 -- Resolves #57, update readme issues link -* https://github.com/yaml/pyyaml/pull/60 -- Document and test Python 3.6 support -* https://github.com/yaml/pyyaml/pull/61 -- Use Travis CI built in pip cache support -* https://github.com/yaml/pyyaml/pull/62 -- Remove tox workaround for Travis CI -* https://github.com/yaml/pyyaml/pull/63 -- Adding support to Unicode characters over codepoint 0xffff -* https://github.com/yaml/pyyaml/pull/65 -- Support unicode literals over codepoint 0xffff -* https://github.com/yaml/pyyaml/pull/74 -- Make pyyaml safe by default. -* https://github.com/yaml/pyyaml/pull/75 -- add 3.12 changelog -* https://github.com/yaml/pyyaml/pull/76 -- Fallback to Pure Python if Compilation fails -* https://github.com/yaml/pyyaml/pull/84 -- Drop unsupported Python 3.3 +* https://github.com/yaml/pyyaml/pull/35 -- Some modernization of the test running +* https://github.com/yaml/pyyaml/pull/42 -- Install tox in a virtualenv +* https://github.com/yaml/pyyaml/pull/45 -- Allow colon in a plain scalar in a flow context +* https://github.com/yaml/pyyaml/pull/48 -- Fix typos +* https://github.com/yaml/pyyaml/pull/55 -- Improve RepresenterError creation +* https://github.com/yaml/pyyaml/pull/59 -- Resolves #57, update readme issues link +* https://github.com/yaml/pyyaml/pull/60 -- Document and test Python 3.6 support +* https://github.com/yaml/pyyaml/pull/61 -- Use Travis CI built in pip cache support +* https://github.com/yaml/pyyaml/pull/62 -- Remove tox workaround for Travis CI +* https://github.com/yaml/pyyaml/pull/63 -- Adding support to Unicode characters over codepoint 0xffff +* https://github.com/yaml/pyyaml/pull/65 -- Support unicode literals over codepoint 0xffff +* https://github.com/yaml/pyyaml/pull/75 -- add 3.12 changelog +* https://github.com/yaml/pyyaml/pull/76 -- Fallback to Pure Python if Compilation fails +* https://github.com/yaml/pyyaml/pull/84 -- Drop unsupported Python 3.3 +* https://github.com/yaml/pyyaml/pull/102 -- Include license file in the generated wheel package +* https://github.com/yaml/pyyaml/pull/105 -- Removed Python 2.6 & 3.3 support * https://github.com/yaml/pyyaml/pull/111 -- Remove commented out Psyco code +* https://github.com/yaml/pyyaml/pull/129 -- Remove call to `ord` in lib3 emitter code +* https://github.com/yaml/pyyaml/pull/143 -- Allow to turn off sorting keys in Dumper * https://github.com/yaml/pyyaml/pull/149 -- Test on Python 3.7-dev * https://github.com/yaml/pyyaml/pull/158 -- Support escaped slash in double quotes "\/" +* https://github.com/yaml/pyyaml/pull/181 -- Import Hashable from collections.abc +* https://github.com/yaml/pyyaml/pull/256 -- Make default_flow_style=False +* https://github.com/yaml/pyyaml/pull/257 -- Deprecate yaml.load and add FullLoader and UnsafeLoader classes +* https://github.com/yaml/pyyaml/pull/263 -- Windows Appveyor build + +3.13 (2018-07-05) +----------------- + +* Resolved issues around PyYAML working in Python 3.7. 3.12 (2016-08-28) ----------------- @@ -175,5 +187,5 @@ For a complete changelog, see: * Initial release. The version number reflects the codename of the project (PyYAML 3000) and differentiates it from - the abandoned PyYaml module. + the abandoned PyYaml module. diff --git a/LICENSE b/LICENSE index 21cdd1d6..e8f88054 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2017-2018 Ingy döt Net +Copyright (c) 2017-2019 Ingy döt Net Copyright (c) 2006-2016 Kirill Simonov Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/announcement.msg b/announcement.msg index fdf49acd..99bf9242 100644 --- a/announcement.msg +++ b/announcement.msg @@ -1,22 +1,23 @@ From: Ingy döt Net To: python-list@python.org, python-announce@python.org, yaml-core@lists.sourceforge.net -Subject: [ANN] PyYAML-4.1: YAML parser and emitter for Python +Subject: [ANN] PyYAML-5.1: YAML parser and emitter for Python ======================= - Announcing PyYAML-4.1 + Announcing PyYAML-5.1 ======================= A new MAJOR RELEASE of PyYAML is now available: https://pypi.org/project/PyYAML/ -This is the first release of PyYAML under a new maintenance team. In August -2016, maintenance of PyYAML and LibYAML was turned over from the original -author, Kirill Simonov, to Ian Cordasco and Ingy döt Net. +This is the first major release of PyYAML under the new maintenance team. -The canonical source repo moved: +Among the many changes listed below, this release specifically addresses the +arbitrary code execution issue raised by: - from: https://bitbucket.org/xi/pyyaml/ - to: https://github.com/yaml/pyyaml + https://nvd.nist.gov/vuln/detail/CVE-2017-18342 + +(See https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation +for complete details). The PyYAML project is now maintained by the YAML and Python communities. Planning happens on the #yaml-dev, #pyyaml and #libyaml IRC channels on @@ -37,13 +38,20 @@ Changes * https://github.com/yaml/pyyaml/pull/62 -- Remove tox workaround for Travis CI * https://github.com/yaml/pyyaml/pull/63 -- Adding support to Unicode characters over codepoint 0xffff * https://github.com/yaml/pyyaml/pull/65 -- Support unicode literals over codepoint 0xffff -* https://github.com/yaml/pyyaml/pull/74 -- Make pyyaml safe by default. * https://github.com/yaml/pyyaml/pull/75 -- add 3.12 changelog * https://github.com/yaml/pyyaml/pull/76 -- Fallback to Pure Python if Compilation fails * https://github.com/yaml/pyyaml/pull/84 -- Drop unsupported Python 3.3 +* https://github.com/yaml/pyyaml/pull/102 -- Include license file in the generated wheel package +* https://github.com/yaml/pyyaml/pull/105 -- Removed Python 2.6 & 3.3 support * https://github.com/yaml/pyyaml/pull/111 -- Remove commented out Psyco code +* https://github.com/yaml/pyyaml/pull/129 -- Remove call to `ord` in lib3 emitter code +* https://github.com/yaml/pyyaml/pull/143 -- Allow to turn off sorting keys in Dumper * https://github.com/yaml/pyyaml/pull/149 -- Test on Python 3.7-dev * https://github.com/yaml/pyyaml/pull/158 -- Support escaped slash in double quotes "\/" +* https://github.com/yaml/pyyaml/pull/181 -- Import Hashable from collections.abc +* https://github.com/yaml/pyyaml/pull/256 -- Make default_flow_style=False +* https://github.com/yaml/pyyaml/pull/257 -- Deprecate yaml.load and add FullLoader and UnsafeLoader classes +* https://github.com/yaml/pyyaml/pull/263 -- Windows Appveyor build Resources @@ -81,7 +89,7 @@ Example >>> import yaml ->>> yaml.load(""" +>>> yaml.full_load(""" ... name: PyYAML ... description: YAML parser and emitter for Python ... homepage: https://github.com/yaml/pyyaml @@ -91,7 +99,7 @@ Example 'pickle'], 'homepage': 'https://github.com/yaml/pyyaml', 'description': 'YAML parser and emitter for Python', 'name': 'PyYAML'} ->>> print yaml.dump(_) +>>> print(yaml.dump(_)) name: PyYAML homepage: https://github.com/yaml/pyyaml description: YAML parser and emitter for Python @@ -101,13 +109,10 @@ keywords: [YAML, serialization, configuration, persistence, pickle] Maintainers =========== -The following people are responsible for maintaining PyYAML: +The following people are currently responsible for maintaining PyYAML: * Ingy döt Net -* Ian Cordasco * Tina Mueller -* Alex Gaynor -* Donald Stufft * Matt Davis and many thanks to all who have contribributed! @@ -117,7 +122,7 @@ See: https://github.com/yaml/pyyaml/pulls Copyright ========= -Copyright (c) 2017-2018 Ingy döt Net +Copyright (c) 2017-2019 Ingy döt Net Copyright (c) 2006-2016 Kirill Simonov The PyYAML module was written by Kirill Simonov . diff --git a/lib/yaml/__init__.py b/lib/yaml/__init__.py index d4e94ca6..e7a419dd 100644 --- a/lib/yaml/__init__.py +++ b/lib/yaml/__init__.py @@ -8,7 +8,7 @@ from loader import * from dumper import * -__version__ = '3.13' +__version__ = '5.1' try: from cyaml import * diff --git a/lib3/yaml/__init__.py b/lib3/yaml/__init__.py index 311a5a1d..5df0bb5f 100644 --- a/lib3/yaml/__init__.py +++ b/lib3/yaml/__init__.py @@ -8,7 +8,7 @@ from .loader import * from .dumper import * -__version__ = '3.13' +__version__ = '5.1' try: from .cyaml import * __with_libyaml__ = True diff --git a/setup.py b/setup.py index 2d1c8124..e21ce9f7 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ NAME = 'PyYAML' -VERSION = '3.13' +VERSION = '5.1' DESCRIPTION = "YAML parser and emitter for Python" LONG_DESCRIPTION = """\ YAML is a data serialization format designed for human readability