14
0

Accepting request 661970 from home:mnhauke

- Update to version 6.7.1.2018.12
  * Support JSON encoding for pyVmomi objects
  * Fix vcrpy hardening in test-requirements. Support versions < 2.0
  * Delete deprecated Docs folder
- Add patch:
  * python-pyvmomi-fix-incompatibility-with-vcrpy2.patch

OBS-URL: https://build.opensuse.org/request/show/661970
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyvmomi?expand=0&rev=13
This commit is contained in:
Tomáš Chvátal
2019-01-01 15:17:50 +00:00
committed by Git OBS Bridge
parent f6811f62ca
commit 99e25d68e6
5 changed files with 91 additions and 6 deletions

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b7799035073e4185ae22c944312b59f0dc941bbe2ea99aad8b2065e2bd9de6b7
size 575912

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5640e047acf48af3c4fcf1caa286865aa91d38c43457a749376b49fbfbd7902a
size 981120

View File

@@ -0,0 +1,73 @@
From e247a933b05b437b6e46af718c311fe0478c7d1c Mon Sep 17 00:00:00 2001
From: "James E. King III" <jking@apache.org>
Date: Sat, 22 Dec 2018 20:35:25 +0000
Subject: [PATCH] fix incompatibility with vcrpy 2
---
.travis.yml | 13 +++++++------
test-requirements.txt | 2 +-
tests/fixtures/ssl_tunnel.yaml | 2 +-
tests/fixtures/ssl_tunnel_http_failure.yaml | 2 +-
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 29fe1792..dd185387 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,15 @@
language: python
python:
- - "2.7"
- - "pypy"
- - "3.6"
+ - 2.7
+ - 3.6
+ - 3.7
+ - pypy
before_install:
- - pip install -r requirements.txt
- - pip install -r test-requirements.txt
+ - pip install -r requirements.txt
+ - pip install -r test-requirements.txt
install:
- - python setup.py install
+ - python setup.py install
script: python setup.py test
diff --git a/test-requirements.txt b/test-requirements.txt
index 96679998..6803fce1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,3 +1,3 @@
tox
testtools>=0.9.34
-vcrpy<2
+vcrpy
diff --git a/tests/fixtures/ssl_tunnel.yaml b/tests/fixtures/ssl_tunnel.yaml
index 203e0d5e..11dc9fa6 100644
--- a/tests/fixtures/ssl_tunnel.yaml
+++ b/tests/fixtures/ssl_tunnel.yaml
@@ -3,7 +3,7 @@ interactions:
body: null
headers: {}
method: CONNECT
- uri: http://vcsasdkTunnel:8089
+ uri: sdkTunnel:8089
response:
body: {string: !!python/unicode ''}
headers:
diff --git a/tests/fixtures/ssl_tunnel_http_failure.yaml b/tests/fixtures/ssl_tunnel_http_failure.yaml
index 46be909b..22ac65bd 100644
--- a/tests/fixtures/ssl_tunnel_http_failure.yaml
+++ b/tests/fixtures/ssl_tunnel_http_failure.yaml
@@ -3,7 +3,7 @@ interactions:
body: null
headers: {}
method: CONNECT
- uri: http://vcsavcsa:80
+ uri: vcsa:80
response:
body: {string: !!python/unicode '<HTML><BODY><H1>404 Not Found</H1></BODY></HTML>'}
headers:

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sat Dec 29 16:24:24 UTC 2018 - mardnh@gmx.de
- Update to version 6.7.1.2018.12
* Support JSON encoding for pyVmomi objects
* Fix vcrpy hardening in test-requirements. Support versions < 2.0
* Delete deprecated Docs folder
- Add patch:
* python-pyvmomi-fix-incompatibility-with-vcrpy2.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 4 12:53:21 UTC 2018 - Matej Cepl <mcepl@suse.com> Tue Dec 4 12:53:21 UTC 2018 - Matej Cepl <mcepl@suse.com>

View File

@@ -13,20 +13,21 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?!python_module:%define python_module() python-%{**} python3-%{**}}
%bcond_without test %bcond_without test
Name: python-pyvmomi Name: python-pyvmomi
Version: 6.7.1 Version: 6.7.1.2018.12
Release: 0 Release: 0
Summary: VMware vSphere Python SDK Summary: VMware vSphere Python SDK
License: Apache-2.0 License: Apache-2.0
Group: Development/Languages/Python Group: Development/Languages/Python
URL: https://github.com/vmware/pyvmomi URL: https://github.com/vmware/pyvmomi
Source: https://github.com/vmware/pyvmomi/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source: https://github.com/vmware/pyvmomi/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch0: python-pyvmomi-fix-incompatibility-with-vcrpy2.patch
BuildRequires: %{python_module fixtures >= 1.3.0} BuildRequires: %{python_module fixtures >= 1.3.0}
BuildRequires: %{python_module requests >= 2.3.0} BuildRequires: %{python_module requests >= 2.3.0}
BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools}
@@ -49,12 +50,13 @@ ESX, ESXi, and vCenter.
%prep %prep
%setup -q -n pyvmomi-%{version}%{?version_suffix} %setup -q -n pyvmomi-%{version}%{?version_suffix}
%patch0 -p1
# we don't want to install any of these # we don't want to install any of these
sed -i '/ data_files/,+1d' setup.py sed -i '/ data_files/,+1d' setup.py
# fix line breaks in text files # fix line breaks in text files
sed -i 's/\r//' *.txt sed -i 's/\r//' *.txt
# do not hardcode vrcpy version # do not hardcode vrcpy version
sed -i -e 's:==:>=:g' test-requirements.txt #sed -i -e 's:==:>=:g' test-requirements.txt
%build %build
%python_build %python_build