Accepting request 731089 from home:jayvdb:py3only

- Add runtime recommends for pyOpenSSL and lxml, needed for SSO support
- Update to v6.7.3
  * Publish new bindings to support vSphere 6.7 Update 3 Release
  * Add sso.py to support get bearer/hok token from sso server
  * pydoc support Fix
  * httpProxy Support Fix
  * Changes to VmomiSupport to handle API versions
- Convert line endings on README.rst
- Drop python-pyvmomi-fix-incompatibility-with-vcrpy2.patch as the vcrpy fix has been released

OBS-URL: https://build.opensuse.org/request/show/731089
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyvmomi?expand=0&rev=15
This commit is contained in:
Tomáš Chvátal
2019-09-16 07:31:40 +00:00
committed by Git OBS Bridge
parent 99e25d68e6
commit 86750a0fe7
5 changed files with 31 additions and 89 deletions

View File

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

View File

@@ -1,73 +0,0 @@
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,17 @@
-------------------------------------------------------------------
Sun Sep 15 13:47:46 UTC 2019 - John Vandenberg <jayvdb@gmail.com>
- Add runtime recommends for pyOpenSSL and lxml, needed for SSO support
- Update to v6.7.3
* Publish new bindings to support vSphere 6.7 Update 3 Release
* Add sso.py to support get bearer/hok token from sso server
* pydoc support Fix
* httpProxy Support Fix
* Changes to VmomiSupport to handle API versions
- Convert line endings on README.rst
- Drop python-pyvmomi-fix-incompatibility-with-vcrpy2.patch as the
vcrpy fix has been released
-------------------------------------------------------------------
Sat Dec 29 16:24:24 UTC 2018 - mardnh@gmx.de

View File

@@ -1,7 +1,7 @@
#
# spec file for package python-pyvmomi
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2014 LISA GmbH, Bingen, Germany.
#
# All modifications and additions to the file contributed by third parties
@@ -13,29 +13,32 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%bcond_without test
Name: python-pyvmomi
Version: 6.7.1.2018.12
Version: 6.7.3
Release: 0
Summary: VMware vSphere Python SDK
License: Apache-2.0
Group: Development/Languages/Python
URL: https://github.com/vmware/pyvmomi
Source: https://github.com/vmware/pyvmomi/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch0: python-pyvmomi-fix-incompatibility-with-vcrpy2.patch
Source: https://files.pythonhosted.org/packages/source/p/pyvmomi/pyvmomi-%{version}.tar.gz
BuildRequires: %{python_module fixtures >= 1.3.0}
BuildRequires: %{python_module mock}
BuildRequires: %{python_module requests >= 2.3.0}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module six >= 1.7.3}
BuildRequires: dos2unix
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-requests >= 2.3.0
Requires: python-six >= 1.7.3
Recommends: python-pyOpenSSL
Recommends: python-lxml
BuildArch: noarch
%if %{with test}
BuildRequires: %{python_module testtools >= 0.9.34}
@@ -50,13 +53,11 @@ ESX, ESXi, and vCenter.
%prep
%setup -q -n pyvmomi-%{version}%{?version_suffix}
%patch0 -p1
# we don't want to install any of these
sed -i '/ data_files/,+1d' setup.py
# fix line breaks in text files
sed -i 's/\r//' *.txt
# do not hardcode vrcpy version
#sed -i -e 's:==:>=:g' test-requirements.txt
dos2unix README.rst LICENSE.txt NOTICE.txt
# https://github.com/vmware/pyvmomi/pull/750
# Unpin vcrpy; the fix was released
sed -i 's/vcrpy<2/vcrpy/' test-requirements.txt
%build
%python_build
@@ -75,6 +76,6 @@ sed -i 's/\r//' *.txt
%doc NOTICE.txt README.rst
%{python_sitelib}/pyVim
%{python_sitelib}/pyVmomi
%{python_sitelib}/pyvmomi-%{version}*-py%{py_ver}.egg-info
%{python_sitelib}/pyvmomi-%{version}*-py*.egg-info
%changelog

3
pyvmomi-6.7.3.tar.gz Normal file
View File

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