From 1d3b7435f7ef2961f0653ad9b986f9060281480c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Galindo=20Garc=C3=ADa?= Date: Tue, 13 Aug 2013 09:04:18 +0200 Subject: [PATCH 1/4] Deleted attribute summary and modified description --- setup.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 52a8493..afceb18 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- from setuptools import setup -from setuptools import find_packages VERSION = '1.0.2' AUTHORS = u'Alejandro Galindo García, Roberto Abdelkader Martínez Pérez' @@ -9,8 +8,7 @@ setup(name='cpe', version=VERSION, - summary='Implementation of versions 1.1, 2.2 and 2.3 of CPE specification.', - description='Package to create and operate with CPE Names of versions 1.1, 2.2 and 2.3 of Common Platform Enumeration (CPE) specification. The main functionality implemented is: naming, name matching and language matching.', + description='Implementation of versions 1.1, 2.2 and 2.3 of CPE specification.', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -27,7 +25,7 @@ maintainer_email=EMAILS, license='GPLv3', url="https://github.com/galindale/cpe", - packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), + long_description=open("README.md").read(), include_package_data=True, zip_safe=False, ) From e297894e352ff730406181bb1ec7670ce99aaf65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Galindo=20Garc=EDa?= Date: Wed, 14 Aug 2013 13:07:56 +0200 Subject: [PATCH 2/4] Fixed error to check logical values in WFN --- cpe/cpe2_3_wfn.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpe/cpe2_3_wfn.py b/cpe/cpe2_3_wfn.py index 441aa39..b6c6eaf 100644 --- a/cpe/cpe2_3_wfn.py +++ b/cpe/cpe2_3_wfn.py @@ -163,9 +163,9 @@ def _parse(self): # Logical value strUpper = att_value.upper() - if strUpper in CPEComponent2_3_WFN.VALUE_ANY: + if strUpper == CPEComponent2_3_WFN.VALUE_ANY: comp = CPEComponentAnyValue() - elif strUpper in CPEComponent2_3_WFN.VALUE_NA: + elif strUpper == CPEComponent2_3_WFN.VALUE_NA: comp = CPEComponentNotApplicable() else: msg = "Invalid logical value '{0}'".format(att_value) From 1fc7f150112f0a959d236f933f9eeae781e709fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Galindo=20Garc=EDa?= Date: Thu, 29 Aug 2013 12:59:35 +0200 Subject: [PATCH 3/4] Fixed example about convertion methods between CPE styles in naming section --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f9bb2de..1081a91 100644 --- a/README.md +++ b/README.md @@ -105,11 +105,11 @@ The cpe package provides methods to get the value of components of a CPE Name (t Finally, the cpe package contains methods to convert any CPE Name defined under a particular style (URI version 2.3, WFN or formatted string) in other different styles: >>> c23_uri.as_wfn() - 'wfn:[part="o", vendor="redhat", product="enterprise_linux", version="4", update="update4"]' + 'wfn:[part="a", vendor="hp", product="insight_diagnostics", version="8", update=ANY, edition=ANY, sw_edition="online", target_sw="win2003", target_hw="x64", other=ANY]' >>> c23_uri.as_uri_2_3() - 'cpe:/a:hp:insight_diagnostics:8::~~online~win2003~x64~' + 'cpe:/a:hp:insight_diagnostics:8::~~online~win2003~x64~' >>> c23_uri.as_fs() - 'cpe:2.3:a:hp:?insight_diagnostics?:8.*:*:*:*:*:*:x32:*' + 'cpe:2.3:a:hp:insight_diagnostics:8:*:*:*:online:win2003:x64:*' [--- Return to index ---](#index) From 326d21a820fd013e592c794870988cc54ce74ea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Galindo=20Garc=EDa?= Date: Thu, 29 Aug 2013 13:31:05 +0200 Subject: [PATCH 4/4] Bumping version --- docs/conf.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index f20f081..c14e34c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -51,7 +51,7 @@ # The short X.Y version. version = '1.0' # The full version, including alpha/beta/rc tags. -release = '1.0.2' +release = '1.0.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index afceb18..85f0404 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup -VERSION = '1.0.2' +VERSION = '1.0.3' AUTHORS = u'Alejandro Galindo García, Roberto Abdelkader Martínez Pérez' EMAILS = 'galindo.garcia.alejandro@gmail.com, robertomartinezp@gmail.com'