Hello community,
here is the log from the commit of package python3-susepubliccloudinfo for
openSUSE:Factory checked in at 2019-02-27 15:06:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-susepubliccloudinfo (Old)
and /work/SRC/openSUSE:Factory/.python3-susepubliccloudinfo.new.28833
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-susepubliccloudinfo"
Wed Feb 27 15:06:30 2019 rev:4 rq:679451 version:1.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python3-susepubliccloudinfo/python3-susepubliccloudinfo.changes
2018-08-27 13:47:58.768434286 +0200
+++
/work/SRC/openSUSE:Factory/.python3-susepubliccloudinfo.new.28833/python3-susepubliccloudinfo.changes
2019-02-27 15:06:39.058437839 +0100
@@ -1,0 +2,7 @@
+Thu Jan 10 20:35:48 UTC 2019 - Robert Schweikert <[email protected]>
+
+- Update to version 1.1.0 (bsc#1121151, bsc#1121150)
+ + Support new inactive state
+ + Remove awscvsgen and associated subpackage
+
+-------------------------------------------------------------------
Old:
----
susepubliccloudinfo-1.0.4.tar.bz2
New:
----
susepubliccloudinfo-1.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-susepubliccloudinfo.spec ++++++
--- /var/tmp/diff_new_pack.CSpqK2/_old 2019-02-27 15:06:40.906437276 +0100
+++ /var/tmp/diff_new_pack.CSpqK2/_new 2019-02-27 15:06:40.906437276 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python3-susepubliccloudinfo
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,18 +12,18 @@
# 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/
#
%define upstream_name susepubliccloudinfo
Name: python3-susepubliccloudinfo
-Version: 1.0.4
+Version: 1.1.0
Release: 0
Summary: Query SUSE Public Cloud Info Service
License: GPL-3.0-or-later
Group: System/Management
-Url: https://github.com/SUSE/Enceladus
+Url: https://github.com/SUSE-Enceladus/public-cloud-info-client
Source0: %{upstream_name}-%{version}.tar.bz2
Requires: python3
Requires: python3-docopt
@@ -39,17 +39,6 @@
%description
Query the SUSE Public Cloud Information Service REST API
-%package amazon
-Summary: Generate Amazon specific information
-Group: System/Management
-PreReq: python3-susepubliccloudinfo = %version
-Requires: python3-boto
-Requires: python3-lxml
-
-%description amazon
-Script that generates information for Amazon to automate image inclusion
-in the quick launcher and the Support matrix on the AWS web pages.
-
%prep
%setup -q -n %{upstream_name}-%{version}
@@ -64,14 +53,10 @@
%files
%defattr(-,root,root,-)
-%doc LICENSE
+%license LICENSE
%{_mandir}/man1/*
%dir %{python3_sitelib}/susepubliccloudinfoclient
%{python3_sitelib}/*
%{_bindir}/pint
-%files amazon
-%defattr(-,root,root,-)
-%{_bindir}/awscsvgen
-
%changelog
++++++ susepubliccloudinfo-1.0.4.tar.bz2 -> susepubliccloudinfo-1.1.0.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/susepubliccloudinfo-1.0.4/Makefile
new/susepubliccloudinfo-1.1.0/Makefile
--- old/susepubliccloudinfo-1.0.4/Makefile 2018-08-03 11:17:04.824547271
+0200
+++ new/susepubliccloudinfo-1.1.0/Makefile 2019-01-10 21:35:23.327738061
+0100
@@ -3,7 +3,7 @@
PREFIX=/usr
NAME=susepubliccloudinfo
dirs = bin lib man
-files = Makefile README.md LICENSE setup.py
+files = Makefile README.md LICENSE setup.py requirements-dev.txt
requirements.txt setup.cfg
.PHONY: clean tar install pep8 test coverage list_tests
@@ -33,7 +33,7 @@
gzip "$(DESTDIR)"/"$(MANDIR)"/man1/pint.1
pep8:
- tools/run-pep8
+ tools/run-pycodestyle
test:
nosetests --with-coverage --cover-erase
--cover-package=lib.susepubliccloudinfoclient --cover-xml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/susepubliccloudinfo-1.0.4/README.md
new/susepubliccloudinfo-1.1.0/README.md
--- old/susepubliccloudinfo-1.0.4/README.md 2018-08-03 11:17:04.828547375
+0200
+++ new/susepubliccloudinfo-1.1.0/README.md 2019-01-10 21:35:23.327738061
+0100
@@ -1,3 +1,5 @@
+[](https://travis-ci.com/SUSE-Enceladus/public-cloud-info-client)
+
pint
====
@@ -5,5 +7,5 @@
the REST API provided by the SUSE Public Cloud Information Service. The
information service provides data about the images SUSE publishes in various
public cloud frameworks (Amazon, Google, Microsoft) as well as the
-servers that make up the SUSE maintained and operated updae infrastructure
+servers that make up the SUSE maintained and operated update infrastructure
in those frameworks.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/susepubliccloudinfo-1.0.4/bin/awscsvgen
new/susepubliccloudinfo-1.1.0/bin/awscsvgen
--- old/susepubliccloudinfo-1.0.4/bin/awscsvgen 2018-08-03 11:17:04.824547271
+0200
+++ new/susepubliccloudinfo-1.1.0/bin/awscsvgen 1970-01-01 01:00:00.000000000
+0100
@@ -1,108 +0,0 @@
-#!/usr/bin/python3
-#
-# Copyright (c) 2018 SUSE Linux GmbH. All rights reserved.
-#
-# This file is part of susePublicCloudInfoClient
-#
-# susePublicCloudInfoClient is free software: you can redistribute it
-# and/or modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
-#
-# susePublicCloudInfoClient is is distributed in the hope that it will
-# be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with susePublicCloudInfoClient. If not, see
-# <http://www.gnu.org/licenses/>.
-#
-"""
-usage:
- awscsvgen -h | --help
- awscsvgen
- [ --active|--all ]
- [ --service-pack=<service_pack_number> ]
- [ --suse-version=<suse_version> ]
- [ --virt-type=<virt_type> ]
-
-options:
- -h --help
- Show help
- --active
- Provide information about the currently active images (default)
- --all
- Provide information about all images
- --service-pack=<service_pack_number>
- The service pack of interest, not used for GA, 1 | 2....
- --suse-version=<suse_version>
- The version of SUSE Linux Enterprise 11 | 12
- --virt-type=<virt_type>
- Virtualization type para|hvm, default hvm
-"""
-
-from docopt import docopt
-from lxml import etree
-
-import susepubliccloudinfoclient.infoserverrequests as ifsrequest
-import susepubliccloudinfoclient.version as version
-
-command_args = docopt(__doc__, version=version.VERSION)
-
-framework = 'amazon'
-image_state = 'active'
-
-virt_type = 'hvm'
-if command_args['--virt-type'] and command_args['--virt-type'] == 'para':
- virt_type = 'pv'
-
-if command_args['--all']:
- image_state = None
- virt_type = None
-
-region = 'all'
-name_filter = None
-if command_args['--suse-version'] or command_args['--service-pack']:
- name_filter = 'name~'
-
-if command_args['--suse-version']:
- name_filter += 'suse-sles-%s' % command_args['--suse-version']
-if command_args['--service-pack']:
- name_filter += '-sp%s' % command_args['--service-pack']
-
-image_data = ifsrequest.get_image_data(
- framework,
- image_state,
- 'xml',
- region,
- name_filter)
-
-print('ami-name,ami-id,region,arch,virt-typ,backing-store')
-for entry in image_data.split('\n'):
- image_info = entry.strip()
- if not image_info.startswith('<image '):
- continue
- image = etree.fromstring(image_info)
- name = image.get('name')
- region = image.get('region')
- if virt_type and virt_type not in name:
- continue
- if 'hvm' in name:
- virt_type = 'hvm'
- else:
- virt_type = 'pv'
- if 'x86_64' in name:
- arch = 'x86_64'
- else:
- arch = 'i386'
- if 'ssd' in name:
- backing_store = 'gp2'
- else:
- backing_store = 'standard'
- print('%s,%s,%s,%s,%s,%s' % (name,
- image.get('id'),
- region,
- arch,
- virt_type,
- backing_store))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/susepubliccloudinfo-1.0.4/bin/pint
new/susepubliccloudinfo-1.1.0/bin/pint
--- old/susepubliccloudinfo-1.0.4/bin/pint 2018-08-03 11:17:04.824547271
+0200
+++ new/susepubliccloudinfo-1.1.0/bin/pint 2019-01-10 21:35:23.327738061
+0100
@@ -26,7 +26,7 @@
[ --region=<region> ]
[ --smt | --regionserver ]
pint (amazon|google|microsoft) images
- [ --active | --deleted | --deprecated ]
+ [ --active | --inactive | --deleted | --deprecated ]
[ --filter=<filter> ]
[ --json | --xml ]
[ --region=<region> ]
@@ -35,8 +35,18 @@
options:
-h --help
Show help
+ --active
+ Only include images which are actively maintained
+ --deleted
+ Only include images which have been deleted
+ --deprecated
+ Only include images which are deprecated
+ (scheduled for deletion in 6 months)
--filter=<filter>
Comma separated list of available attributes
+ --inactive
+ Only include images which are inactive
+ (only receiving critical updates, but not yet deprecated)
--json
Output data in JSON format
--region=<region>
@@ -69,7 +79,7 @@
break
image_state = None
-image_states = ('active', 'deleted', 'deprecated')
+image_states = ('active', 'inactive', 'deleted', 'deprecated')
for state in image_states:
if command_args['--%s' % state]:
image_state = state
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/susepubliccloudinfo-1.0.4/lib/susepubliccloudinfoclient/infoserverrequests.py
new/susepubliccloudinfo-1.1.0/lib/susepubliccloudinfoclient/infoserverrequests.py
---
old/susepubliccloudinfo-1.0.4/lib/susepubliccloudinfoclient/infoserverrequests.py
2018-08-03 11:17:04.824547271 +0200
+++
new/susepubliccloudinfo-1.1.0/lib/susepubliccloudinfoclient/infoserverrequests.py
2019-01-10 21:35:23.327738061 +0100
@@ -191,7 +191,7 @@
)
except requests.exceptions.ConnectionError as e:
__error(
- "There was a problem connecting to the server. " +
+ "There was a problem connecting to the server. "
"Please check your network connection.\n%s" % e
)
except requests.exceptions.RequestException as e:
@@ -210,23 +210,23 @@
"""Break down the --filter argument into a list of filters"""
valid_filters = {
'id':
- '^(?P<attr>id)(?P<operator>[=])(?P<value>.+)$',
+ r'^(?P<attr>id)(?P<operator>[=])(?P<value>.+)$',
'replacementid':
- '^(?P<attr>replacementid)(?P<operator>[=])(?P<value>.+)$',
+ r'^(?P<attr>replacementid)(?P<operator>[=])(?P<value>.+)$',
'ip':
- '^(?P<attr>ip)(?P<operator>[=])(?P<value>\d+\.\d+\.\d+.\d+)$',
+ r'^(?P<attr>ip)(?P<operator>[=])(?P<value>\d+\.\d+\.\d+.\d+)$',
'name':
- '^(?P<attr>name)(?P<operator>[~!%])(?P<value>.+)$',
+ r'^(?P<attr>name)(?P<operator>[~!%])(?P<value>.+)$',
'replacementname':
- '(?P<attr>replacementname)(?P<operator>[~!%])(?P<value>.+)$',
+ r'(?P<attr>replacementname)(?P<operator>[~!%])(?P<value>.+)$',
'publishedon':
- '(?P<attr>publishedon)(?P<operator>[<=>])(?P<value>\d+)$',
+ r'(?P<attr>publishedon)(?P<operator>[<=>])(?P<value>\d+)$',
'deprecatedon':
- '(?P<attr>deprecatedon)(?P<operator>[<=>])(?P<value>\d+)$',
+ r'(?P<attr>deprecatedon)(?P<operator>[<=>])(?P<value>\d+)$',
'deletedon':
- '(?P<attr>deletedon)(?P<operator>[<=>])(?P<value>\d+)$',
+ r'(?P<attr>deletedon)(?P<operator>[<=>])(?P<value>\d+)$',
'type':
- '^(?P<attr>type)(?P<operator>[~!%])(?P<value>.+)$',
+ r'^(?P<attr>type)(?P<operator>[~!%])(?P<value>.+)$',
}
# start with empty result set
filters = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/susepubliccloudinfo-1.0.4/lib/susepubliccloudinfoclient/version.py
new/susepubliccloudinfo-1.1.0/lib/susepubliccloudinfoclient/version.py
--- old/susepubliccloudinfo-1.0.4/lib/susepubliccloudinfoclient/version.py
2018-08-03 11:17:04.824547271 +0200
+++ new/susepubliccloudinfo-1.1.0/lib/susepubliccloudinfoclient/version.py
2019-01-10 21:35:23.327738061 +0100
@@ -17,4 +17,4 @@
# along with susePublicCloudInfoClient. If not, see
# <http://www.gnu.org/licenses/>.
#
-VERSION = '1.0.4'
+VERSION = '1.1.0'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/susepubliccloudinfo-1.0.4/requirements-dev.txt
new/susepubliccloudinfo-1.1.0/requirements-dev.txt
--- old/susepubliccloudinfo-1.0.4/requirements-dev.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/susepubliccloudinfo-1.1.0/requirements-dev.txt 2019-01-10
21:35:23.327738061 +0100
@@ -0,0 +1,5 @@
+-r requirements.txt
+
+coverage
+pycodestyle
+nose
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/susepubliccloudinfo-1.0.4/requirements.txt
new/susepubliccloudinfo-1.1.0/requirements.txt
--- old/susepubliccloudinfo-1.0.4/requirements.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/susepubliccloudinfo-1.1.0/requirements.txt 2019-01-10
21:35:23.327738061 +0100
@@ -0,0 +1,3 @@
+docopt
+lxml
+requests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/susepubliccloudinfo-1.0.4/setup.cfg
new/susepubliccloudinfo-1.1.0/setup.cfg
--- old/susepubliccloudinfo-1.0.4/setup.cfg 1970-01-01 01:00:00.000000000
+0100
+++ new/susepubliccloudinfo-1.1.0/setup.cfg 2019-01-10 21:35:23.327738061
+0100
@@ -0,0 +1,2 @@
+[nosetests]
+where = test/unit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/susepubliccloudinfo-1.0.4/setup.py
new/susepubliccloudinfo-1.1.0/setup.py
--- old/susepubliccloudinfo-1.0.4/setup.py 2018-08-03 11:17:04.828547375
+0200
+++ new/susepubliccloudinfo-1.1.0/setup.py 2019-01-10 21:35:23.327738061
+0100
@@ -35,6 +35,15 @@
import version
src_version = version.VERSION
+with open('README.md') as readme_file:
+ readme = readme_file.read()
+
+with open('requirements.txt') as req_file:
+ requirements = req_file.read().splitlines()
+
+with open('requirements-dev.txt') as req_file:
+ dev_requirements = req_file.read().splitlines()[2:]
+
description = 'Command-line tool to access SUSE Public Cloud Information '
description += 'Service'
@@ -42,14 +51,35 @@
setuptools.setup(
name='susepubliccloudinfo',
description=(description),
- url='https://github.com/SUSE/Enceladus',
+ long_description=readme,
+ long_description_content_type="text/markdown",
+ url='https://github.com/SUSE-Enceladus/public-cloud-info-client',
license='GPL-3.0+',
author='SUSE Public Cloud Team',
author_email='[email protected]',
version=src_version,
+ install_requires=requirements,
+ extras_require={
+ 'dev': dev_requirements
+ },
packages=setuptools.find_packages('lib'),
package_dir={
'': 'lib',
},
- scripts=['bin/pint', 'bin/awscsvgen']
+ scripts=['bin/pint'],
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Intended Audience :: Developers',
+ 'Natural Language :: English',
+ 'License :: OSI Approved :: '
+ 'GNU General Public License v3 or later (GPLv3+)',
+ 'Programming Language :: Python',
+ 'Programming Language :: Python :: 3',
+ 'Programming Language :: Python :: 3.4',
+ 'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: Implementation :: CPython',
+ 'Programming Language :: Python :: Implementation :: PyPy',
+ ]
)
