changes for 5.1.2 release5.1.2release/5.1.2-final

8 files changed, 29 insertions, 21 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index bdad5f3..46bbd7f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -4,9 +4,9 @@ version: '{build}'
 image:
 - Visual Studio 2015
 
-#cache:
-#- 'C:\Python38\'
-#- 'C:\Python38-x64'
+cache:
+- 'C:\Python38\'
+- 'C:\Python38-x64'
 
 environment:
   libyaml_repo_url: https://github.com/yaml/libyaml.git
diff --git a/.travis.yml b/.travis.yml
index 3dfe3ad..ecce033 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,11 +16,12 @@ matrix:
       env: TOXENV=py35
     - python: 3.6
       env: TOXENV=py36
-    - python: 3.7-dev
+    - python: 3.7
       env: TOXENV=py37
-    # This is broken on travis as of 2019/03/12
-    # - python: pypy
-    # env: TOXENV=pypy
+    - python: 3.8-dev
+      env: TOXENV=py38
+    - python: pypy
+      env: TOXENV=pypy
 
 # build libyaml
 before_script:
diff --git a/CHANGES b/CHANGES
index ce7ce49..e2eed15 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,10 +4,15 @@ For a complete changelog, see:
 * https://github.com/yaml/pyyaml/commits/
 * https://bitbucket.org/xi/pyyaml/commits/
 
+5.1.2 (2019-07-30)
+------------------
+
+* Re-release of 5.1 with regenerated Cython sources to build properly for Python 3.8b2+
+
 5.1.1 (2019-06-05)
 ------------------
 
-* Re-release of 5.1 with regenerated Cython sources to build properly for Python 3.8
+* Re-release of 5.1 with regenerated Cython sources to build properly for Python 3.8b1
 
 5.1 (2019-03-13)
 ----------------
diff --git a/announcement.msg b/announcement.msg
index d3fa69c..4cf3944 100644
--- a/announcement.msg
+++ b/announcement.msg
@@ -1,16 +1,16 @@
 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-5.1.1: YAML parser and emitter for Python
+Subject: [ANN] PyYAML-5.1.2: YAML parser and emitter for Python
 
 =======================
-Announcing PyYAML-5.1.1
+Announcing PyYAML-5.1.2
 =======================
 
 A new minor release of PyYAML is now available:
 https://pypi.org/project/PyYAML/
 
 This is a maintenance re-release of PyYAML 5.1 with re-generated Cython
-bindings to allow the extension to build properly for Python 3.8. No code
+bindings to allow the extension to build properly for Python 3.8b2+. No code
 changes were made in the PyYAML sources.
 
 Changes
diff --git a/lib/yaml/__init__.py b/lib/yaml/__init__.py
index 0688b7d..5d56d65 100644
--- a/lib/yaml/__init__.py
+++ b/lib/yaml/__init__.py
@@ -8,7 +8,7 @@ from nodes import *
 from loader import *
 from dumper import *
 
-__version__ = '5.1.1'
+__version__ = '5.1.2'
 
 try:
     from cyaml import *
diff --git a/lib3/yaml/__init__.py b/lib3/yaml/__init__.py
index 8686c63..3f499d3 100644
--- a/lib3/yaml/__init__.py
+++ b/lib3/yaml/__init__.py
@@ -8,7 +8,7 @@ from .nodes import *
 from .loader import *
 from .dumper import *
 
-__version__ = '5.1.1'
+__version__ = '5.1.2'
 try:
     from .cyaml import *
     __with_libyaml__ = True
diff --git a/packaging/build/appveyor.ps1 b/packaging/build/appveyor.ps1
index a9e6ad2..fc75b53 100644
--- a/packaging/build/appveyor.ps1
+++ b/packaging/build/appveyor.ps1
@@ -6,15 +6,14 @@
 # Update-AppveyorBuild -Version $dynamic_version
 
 Function Bootstrap() {
-    # uncomment when we want to start testing on Python 3.8
     # ensure py38 is present (current Appveyor VS2015 image doesn't include it)
-    #If(-not $(Test-Path C:\Python38)) {
-    #    choco.exe install python3 --version=3.8.0-a2 --forcex86 --force #--install-arguments="TargetDir=C:\Python38 PrependPath=0" --no-progress
-    #}
+    If(-not $(Test-Path C:\Python38)) {
+        choco.exe install python3 --version=3.8.0-b3 --forcex86 --force --params="/InstallDir:C:\Python38" --no-progress
+    }
 
-    #If(-not $(Test-Path C:\Python38-x64)) {
-    #    choco.exe install python3 --version=3.8.0-a2 --force #--install-arguments="TargetDir=C:\Python38-x64 PrependPath=0" --no-progress
-    #}
+    If(-not $(Test-Path C:\Python38-x64)) {
+        choco.exe install python3 --version=3.8.0-b3 --force --params="/InstallDir:C:\Python38-x64" --no-progress
+    }
 
     Write-Output "patching Windows SDK bits for distutils"
 
@@ -123,6 +122,8 @@ $pythons = @(
 "C:\Python36-x64"
 "C:\Python37"
 "C:\Python37-x64"
+"C:\Python38"
+"C:\Python38-x64"
 )
 
 #$pythons = @("C:\$($env:PYTHON_VER)")
diff --git a/setup.py b/setup.py
index 81f01e4..5cb0b6d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 
 NAME = 'PyYAML'
-VERSION = '5.1.1'
+VERSION = '5.1.2'
 DESCRIPTION = "YAML parser and emitter for Python"
 LONG_DESCRIPTION = """\
 YAML is a data serialization format designed for human readability
@@ -33,6 +33,7 @@ CLASSIFIERS = [
     "Programming Language :: Python :: 3.5",
     "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Topic :: Software Development :: Libraries :: Python Modules",