Skip to content

Commit

Permalink
PyYAML: Autospec creation for update from version 3.13 to version 5.1.2
Browse files Browse the repository at this point in the history
Alex Gaynor (4):
      Make pyyaml safe by default.
      wtf, how did this typo happen
      Now, for py3k!
      Changes for 4.1 release

Andrey Somov (1):
      Remove redundant code in Scanner.peek_token()

Anthony Sottile (1):
      Install cython alongside tox

Daniel Beer (1):
      Allow colon in a plain scalar in a flow context (#45)

Donald Stufft (4):
      Add a tox.ini to run tests
      Ignore common build/runtime artifacts
      Add Travis Support
      Fallback to Pure Python if Compilation fails

Florian Bruhin (1):
      Import Hashable from collections.abc

Hugo (1):
      Test on Python 3.7-dev

Ian Cordasco (1):
      Install tox in a virtualenv

Ingy döt Net (6):
      Revert PR #150 per @asomov
      Changes for 4.01 release
      Reverting yaml/pyyaml#74
      Deprecate/warn usage of yaml.load(input)
      Update .travis.yml to use libyaml 0.2.2
      Updates for 5.1 release

Jakub Wilk (1):
      Fix typos

Jon Dufresne (5):
      Document and test Python 3.6 support
      Use Travis CI built in pip cache support
      Remove tox workaround for Travis CI
      Remove commented out Psyco code
      Include license file in the generated wheel package

Kirill Simonov (1):
      Added tag 3.12 for changeset 823acfc7b4ff

Matt Davis (4):
      Squash/merge pull request #105 from nnadeau/patch-1
      Windows Appveyor build
      changes for 5.1.1 release
      changes for 5.1.2 release

Peter Murphy (5):
      A change to a message
      First attack at pyyaml does not support literals in unicode over codepoint 0xffff #25
      Added emoticon test data files (which will probably break testing)
      Suspicious 'expected an exception' messages trimmed
      Reverting README to old copy

Timofei Bondarev (1):
      Improve RepresenterError creation

Tina Müller (7):
      Support escaped slash in double quotes "\/"
      Force cython when building sdist
      Build libyaml on travis
      Apply FullLoader/UnsafeLoader changes to lib3
      Allow to turn off sorting keys in Dumper
      Make default_flow_style=False
      Skip certain unicode tests when maxunicode not > 0xffff

hsmtkk (1):
      add 3.12 changelog

hugovk (1):
      Drop unsupported Python 3.3

psanchez (1):
      Resolves #57, update readme issues link

scauligi (1):
      Fix for bug yaml/pyyaml#118
  • Loading branch information
phmccarty authored and djklimes committed Aug 28, 2019
1 parent 4072d67 commit 567e13e
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 342 deletions.
5 changes: 5 additions & 0 deletions .gitignore
@@ -1,5 +1,7 @@
.*~
*~
*.info
*.mod
*.swp
.repo-index
*.log
Expand All @@ -8,6 +10,9 @@ build.log.round*
*.tgz
!*.tar.*.*
*.zip
*.jar
*.pom
*.xml
commitmsg
results/
rpms/
Expand Down
298 changes: 0 additions & 298 deletions 0001-CVE-2017-18342-1.patch

This file was deleted.

25 changes: 0 additions & 25 deletions 0002-CVE-2017-18342-2.patch

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
@@ -1,5 +1,5 @@
PKG_NAME := PyYAML
URL = https://github.com/yaml/pyyaml/archive/3.13/pyyaml-3.13.tar.gz
URL = https://github.com/yaml/pyyaml/archive/5.1.2/pyyaml-5.1.2.tar.gz
ARCHIVES =

include ../common/Makefile.common
16 changes: 6 additions & 10 deletions PyYAML.spec
Expand Up @@ -3,10 +3,10 @@
# Generated by: autospec.py
#
Name : PyYAML
Version : 3.13
Release : 59
URL : https://github.com/yaml/pyyaml/archive/3.13/pyyaml-3.13.tar.gz
Source0 : https://github.com/yaml/pyyaml/archive/3.13/pyyaml-3.13.tar.gz
Version : 5.1.2
Release : 60
URL : https://github.com/yaml/pyyaml/archive/5.1.2/pyyaml-5.1.2.tar.gz
Source0 : https://github.com/yaml/pyyaml/archive/5.1.2/pyyaml-5.1.2.tar.gz
Summary : No detailed summary available
Group : Development/Tools
License : MIT
Expand All @@ -18,8 +18,6 @@ BuildRequires : buildreq-distutils3
BuildRequires : python-dev
BuildRequires : python3-dev
BuildRequires : yaml-dev
Patch1: 0001-CVE-2017-18342-1.patch
Patch2: 0002-CVE-2017-18342-2.patch

%description
PyYAML - The next generation YAML parser and emitter for Python.
Expand Down Expand Up @@ -53,16 +51,14 @@ python3 components for the PyYAML package.


%prep
%setup -q -n pyyaml-3.13
%patch1 -p1
%patch2 -p1
%setup -q -n pyyaml-5.1.2

%build
export http_proxy=http://127.0.0.1:9/
export https_proxy=http://127.0.0.1:9/
export no_proxy=localhost,127.0.0.1,0.0.0.0
export LANG=C.UTF-8
export SOURCE_DATE_EPOCH=1563473686
export SOURCE_DATE_EPOCH=1566917616
export GCC_IGNORE_WERROR=1
export AR=gcc-ar
export RANLIB=gcc-ranlib
Expand Down
2 changes: 1 addition & 1 deletion buildreq_cache
@@ -1,2 +1,2 @@
3.13
5.1.2
python3-dev

0 comments on commit 567e13e

Please sign in to comment.