openstack/deb-python-pyvmomi
Code Issues Proposed changes

5.5.0-2014.1.1

Browse Source 
- new upstream version
- nerf tests until python-vcrpy is packaged
- add patch from upstream to not spew files into /usr.
This commit is contained in:
Joshua Kwan
2014-09-03 12:54:28 -04:00
parent 6d79933638
commit 81ef3a6a45
6 changed files with 61 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@@ -1,4 +1,4 @@
python-pyvmomi (5.5.0-2014.1-1) unstable; urgency=low
python-pyvmomi (5.5.0-2014.1.1-1) unstable; urgency=low
* New upstream version.
* Add RST documentation in python-pyvmomi-doc.
@@ -7,7 +7,7 @@ python-pyvmomi (5.5.0-2014.1-1) unstable; urgency=low
* Add new watch file using PyPI.
* Use pybuild, which automates the testing and install phases.
-- Joshua Kwan <joshk@triplehelix.org> Mon, 25 Aug 2014 12:59:53 -0400
-- Joshua Kwan <joshk@triplehelix.org> Wed, 03 Sep 2014 12:54:43 -0400
python-pyvmomi (5.5.0-1) unstable; urgency=low

6
debian/control vendored
View File

@@ -29,7 +29,7 @@ Depends:
${python:Depends},
python-requests
Suggests: pyvmomi-doc
Description: Python bindings for the VMware vSphere Web Services SDK
Description: VMware vSphere Python SDK - Python 2.x
pyVmomi is the Python SDK for the VMware vSphere API that allows you to
automate actions on VMware ESX, ESXi, and vCenter servers.
.
@@ -43,7 +43,7 @@ Depends:
${python3:Depends},
python3-requests
Suggests: pyvmomi-doc
Description: Python bindings for the VMware vSphere Web Services SDK
Description: VMware vSphere Python SDK - Python 3.x
pyVmomi is the Python SDK for the VMware vSphere API that allows you to
automate actions on VMware ESX, ESXi, and vCenter servers.
.
@@ -55,7 +55,7 @@ Section: doc
Pre-Depends: dpkg (>= 1.15.6~)
Depends:
${misc:Depends}
Description: Python bindings for the VMware vSphere Web Services SDK (documentation)
Description: VMware vSphere Python SDK - documentation
pyVmomi is the Python SDK for the VMware vSphere API that allows you to
automate actions on VMware ESX, ESXi, and vCenter servers.
.

45
debian/patches/data_files.patch vendored Normal file
View File

@@ -0,0 +1,45 @@
commit f4c046fc51852bf894cdf4456201a0645c171177
Author: Michael Rice <michael.rice@rackspace.com>
Date: Sun Aug 31 18:39:15 2014 -0500
removed the data_files
This was causing the setup.py to try to install the files listed
For example:
running install_data
copying LICENSE.txt -> /builddir/build/BUILDROOT/python-pyvmomi-5.5.0.2014.1.1-1.fc20.x86_64/usr/
copying NOTICE.txt -> /builddir/build/BUILDROOT/python-pyvmomi-5.5.0.2014.1.1-1.fc20.x86_64/usr/
copying MANIFEST.in -> /builddir/build/BUILDROOT/python-pyvmomi-5.5.0.2014.1.1-1.fc20.x86_64/usr/
copying setup.py -> /builddir/build/BUILDROOT/python-pyvmomi-5.5.0.2014.1.1-1.fc20.x86_64/usr/
copying tox.ini -> /builddir/build/BUILDROOT/python-pyvmomi-5.5.0.2014.1.1-1.fc20.x86_64/usr/
copying setup.cfg -> /builddir/build/BUILDROOT/python-pyvmomi-5.5.0.2014.1.1-1.fc20.x86_64/usr/
Those files should not go in that location.
The MANIFEST.in file does enough by adding those files to the sdist
from there if you intend to have those files installed by setup.py
you should tell it where to put them. This change allows packagers
to specify where those files end up in their packaging process.
--- a/setup.py
+++ b/setup.py
@@ -38,8 +38,6 @@
packages=['pyVmomi', 'pyVim'],
install_requires=required,
license='License :: OSI Approved :: Apache Software License',
- data_files = [('', ['LICENSE.txt', 'NOTICE.txt', 'MANIFEST.in',
- 'setup.py', 'tox.ini', 'setup.cfg'])],
classifiers=[
'Development Status :: 5 - Production/Stable',
'License :: OSI Approved :: Apache Software License',
@@ -60,8 +58,8 @@
'Operating System :: MacOS',
],
keywords='pyvmomi vsphere vmware esx',
+ platforms=['Windows', 'Linux', 'Solaris', 'Mac OS-X', 'Unix'],
- platforms = ['Windows', 'Linux', 'Solaris', 'Mac OS-X', 'Unix'],
test_suite='tests',
+ tests_require=required_for_tests,
- tests_require= required_for_tests,
zip_safe=True
)

1
debian/patches/series vendored Normal file
View File

@@ -0,0 +1 @@
data_files.patch

9
debian/rules vendored
View File

@@ -1,13 +1,20 @@
#!/usr/bin/make -f
UPSTREAM_GIT = git://github.com/vmware/pyvmomi.git
-include /usr/share/openstack-pkg-tools/pkgos.make
PYVMOMI_DOC_PKG := python-pyvmomi-doc
export PYBUILD_DESTDIR_python2=debian/python-pyvmomi/
export PYBUILD_DESTDIR_python3=debian/python3-pyvmomi/
# TODO: package python-vcrpy then enable the tests
export PYBUILD_DISABLE_python2=test
export PYBUILD_DISABLE_python3=test
%:
dh $@ --with python2,python3 --buildsystem=pybuild
override_dh_installdocs:
dh_installdocs -X.rst
rsync -a docs/ debian/$(PYVMOMI_DOC_PKG)/usr/share/doc/$(PYVMOMI_DOC_PKG)
cp -a docs/* debian/$(PYVMOMI_DOC_PKG)/usr/share/doc/$(PYVMOMI_DOC_PKG)

6
setup.py
View File

@@ -38,8 +38,6 @@ setup(
packages=['pyVmomi', 'pyVim'],
install_requires=required,
license='License :: OSI Approved :: Apache Software License',
data_files = [('', ['LICENSE.txt', 'NOTICE.txt', 'MANIFEST.in',
'setup.py', 'tox.ini', 'setup.cfg'])],
classifiers=[
'Development Status :: 5 - Production/Stable',
'License :: OSI Approved :: Apache Software License',
@@ -62,8 +60,8 @@ setup(
'Operating System :: MacOS',
],
keywords='pyvmomi vsphere vmware esx',
platforms = ['Windows', 'Linux', 'Solaris', 'Mac OS-X', 'Unix'],
platforms=['Windows', 'Linux', 'Solaris', 'Mac OS-X', 'Unix'],
test_suite='tests',
tests_require= required_for_tests,
tests_require=required_for_tests,
zip_safe=True
)