From 64d89fb2e33d102853d23b177a6ef87b0af1e576 Mon Sep 17 00:00:00 2001 From: Randy Barlow Date: Sat, 10 Mar 2018 17:48:45 -0500 Subject: [PATCH] Update to 3.6.1 (#1550757). Also move the check section to be above the files sections. Signed-off-by: Randy Barlow --- .gitignore | 1 + python-pymongo.spec | 66 ++++++++++++++++++++++++--------------------- sources | 2 +- 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index b3f61fa..ade96f8 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /3.4.0.tar.gz /3.5.1.tar.gz /3.6.0.tar.gz +/pymongo-3.6.1.tar.gz diff --git a/python-pymongo.spec b/python-pymongo.spec index b47b2d0..0064324 100644 --- a/python-pymongo.spec +++ b/python-pymongo.spec @@ -5,14 +5,14 @@ } Name: python-pymongo -Version: 3.6.0 -Release: 2%{?dist} +Version: 3.6.1 +Release: 1%{?dist} # All code is ASL 2.0 except bson/time64*.{c,h} which is MIT License: ASL 2.0 and MIT Summary: Python driver for MongoDB URL: http://api.mongodb.org/python -Source0: https://github.com/mongodb/mongo-python-driver/archive/%{version}.tar.gz +Source0: https://github.com/mongodb/mongo-python-driver/archive/%{version}/pymongo-%{version}.tar.gz # This patch removes the bundled ssl.match_hostname library as it was vulnerable to CVE-2013-7440 # and CVE-2013-2099, and wasn't needed anyway since Fedora >= 22 has the needed module in the Python # standard library. It also adjusts imports so that they exclusively use the code from Python. @@ -156,6 +156,34 @@ chmod 755 %{buildroot}%{python3_sitearch}/pymongo/*.so popd +%check +# For some reason, the tests never think they can connect to mongod on armv7hl even though netstat +# says it's listening. mongod is not available on big endian arches (ppc64, s390(x)). +%ifnarch armv7hl ppc64 s390 s390x + +if [ "$(netstat -ln | grep 27017)" != "" ] +then + pkill mongod +fi + +mkdir ./mongod +mongod --fork --dbpath ./mongod --logpath ./mongod/mongod.log +# Give MongoDB some time to settle +while [ "$(netstat -ln | grep 27017)" == "" ] +do + sleep 1 +done + +python2 setup.py test || (pkill mongod && exit 1) + +pushd %{py3dir} +python3 setup.py test || (pkill mongod && exit 1) +popd + +pkill mongod +%endif + + %files doc %license LICENSE %doc doc/_build/html/* @@ -199,35 +227,11 @@ popd %{python3_sitearch}/gridfs -%check -# For some reason, the tests never think they can connect to mongod on armv7hl even though netstat -# says it's listening. mongod is not available on big endian arches (ppc64, s390(x)). -%ifnarch armv7hl ppc64 s390 s390x - -if [ "$(netstat -ln | grep 27017)" != "" ] -then - pkill mongod -fi - -mkdir ./mongod -mongod --fork --dbpath ./mongod --logpath ./mongod/mongod.log -# Give MongoDB some time to settle -while [ "$(netstat -ln | grep 27017)" == "" ] -do - sleep 1 -done - -python2 setup.py test || (pkill mongod && exit 1) - -pushd %{py3dir} -python3 setup.py test || (pkill mongod && exit 1) -popd - -pkill mongod -%endif - - %changelog +* Sat Mar 10 2018 Randy Barlow - 3.6.1-1 +- Update to 3.6.1 (#1550757). +- http://api.mongodb.com/python/3.6.1/changelog.html + * Tue Feb 27 2018 Iryna Shcherbina - 3.6.0-2 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) diff --git a/sources b/sources index 1cc97c5..53693df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (3.6.0.tar.gz) = d919c64d6d3747f1761e411232f2e8d32cb40585bc3b46582085902b5414fade0fbb3febc847c88ec205a29f134ab070f8275eb1df033edc25123b3f0a6acf4d +SHA512 (pymongo-3.6.1.tar.gz) = eb5f280a69eb99a0d2080d1de46ae9defeab65cfd4f75f603f98ced0544a7c57e8014b12fc996cb37e8edc06541d1ee0b41b3467ddf53b8777759add372cef0e