Changes for 4.1 release
diff --git a/CHANGES b/CHANGES
index 6b2e34d..8f22042 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,8 +4,8 @@
* https://github.com/yaml/pyyaml/commits/
* https://bitbucket.org/xi/pyyaml/commits/
-4.01 (2018-06-26)
------------------
+4.1 (2018-06-26)
+----------------
* 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
diff --git a/Makefile b/Makefile
index da249e3..69efbdc 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,9 @@
${PYTHON} setup.py test
dist:
- ${PYTHON} setup.py --with-libyaml sdist --formats=zip,gztar
+ @# No longer uploading a zip file to pypi
+ @# ${PYTHON} setup.py --with-libyaml sdist --formats=zip,gztar
+ ${PYTHON} setup.py --with-libyaml sdist --formats=gztar
windist:
${PYTHON} setup.py --with-libyaml bdist_wininst
diff --git a/README b/README
index b6eb22f..361839a 100644
--- a/README
+++ b/README
@@ -24,11 +24,16 @@
For PyYAML tutorial and reference, see:
'http://pyyaml.org/wiki/PyYAMLDocumentation'.
-Post your questions and opinions to the YAML-Core mailing list:
+Discuss PyYAML with the maintainers in IRC #pyyaml irc.freenode.net.
+
+You may also use the YAML-Core mailing list:
'http://lists.sourceforge.net/lists/listinfo/yaml-core'.
Submit bug reports and feature requests to the PyYAML bug tracker:
'https://github.com/yaml/pyyaml/issues'.
-PyYAML is written by Kirill Simonov <xi@resolvent.net>. It is released
-under the MIT license. See the file LICENSE for more details.
+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/announcement.msg b/announcement.msg
index ea4be67..fdf49ac 100644
--- a/announcement.msg
+++ b/announcement.msg
@@ -1,14 +1,26 @@
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-4.01: YAML parser and emitter for Python
+Subject: [ANN] PyYAML-4.1: YAML parser and emitter for Python
-========================
- Announcing PyYAML-4.01
-========================
+=======================
+ Announcing PyYAML-4.1
+=======================
-A new release of PyYAML is now available:
+A new MAJOR RELEASE of PyYAML is now available:
+https://pypi.org/project/PyYAML/
- 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.
+
+The canonical source repo moved:
+
+ from: https://bitbucket.org/xi/pyyaml/
+ to: https://github.com/yaml/pyyaml
+
+The PyYAML project is now maintained by the YAML and Python communities.
+Planning happens on the #yaml-dev, #pyyaml and #libyaml IRC channels on
+irc.freenode.net.
Changes
@@ -40,10 +52,9 @@
PyYAML IRC Channel: #pyyaml on irc.freenode.net
PyYAML homepage: https://github.com/yaml/pyyaml
PyYAML documentation: http://pyyaml.org/wiki/PyYAMLDocumentation
-Source and binary installers: https://pypi.python.org/pypi/PyYAML/3.12
-
-PyYAML GitHub repository: https://github.com/yaml/pyyaml/
-Submit a bug report: https://github.com/yaml/pyyaml/issues
+Source and binary installers: https://pypi.org/project/PyYAML/
+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
@@ -92,12 +103,12 @@
The following people are responsible for maintaining PyYAML:
-* Kirill Simonov
-* Ian Cordasco
* Ingy döt Net
-* Donald Stufft
+* Ian Cordasco
* Tina Mueller
* Alex Gaynor
+* Donald Stufft
+* Matt Davis
and many thanks to all who have contribributed!
See: https://github.com/yaml/pyyaml/pulls
@@ -113,3 +124,4 @@
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 65f25ab..628eb74 100644
--- a/lib/yaml/__init__.py
+++ b/lib/yaml/__init__.py
@@ -8,7 +8,7 @@
from loader import *
from dumper import *
-__version__ = '4.01'
+__version__ = '4.1'
try:
from cyaml import *
diff --git a/lib3/yaml/__init__.py b/lib3/yaml/__init__.py
index 2df5df7..cbb8417 100644
--- a/lib3/yaml/__init__.py
+++ b/lib3/yaml/__init__.py
@@ -8,7 +8,7 @@
from .loader import *
from .dumper import *
-__version__ = '4.01'
+__version__ = '4.1'
try:
from .cyaml import *
__with_libyaml__ = True
diff --git a/setup.py b/setup.py
index dbc709d..a1a87a2 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
NAME = 'PyYAML'
-VERSION = '4.01'
+VERSION = '4.1'
DESCRIPTION = "YAML parser and emitter for Python"
LONG_DESCRIPTION = """\
YAML is a data serialization format designed for human readability
@@ -295,4 +295,5 @@
distclass=Distribution,
cmdclass=cmdclass,
+ python_requires='>=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
)