diff --git a/openstack/bareon/Bareon.spec.j2 b/openstack/bareon/Bareon.spec.j2 index 442c8b6de..dd04408b6 100644 --- a/openstack/bareon/Bareon.spec.j2 +++ b/openstack/bareon/Bareon.spec.j2 @@ -1,7 +1,6 @@ %global pypi_name Bareon %global sname bareon %global sversion 0.0.1a3 - Name: {{ py2name('Bareon') }} Version: 0.0.1~a3 Release: 0 @@ -12,24 +11,14 @@ Url: https://launchpad.net/%{sname} Source0: https://pypi.io/packages/source/b/bareon/%{sname}-%{sversion}.tar.gz BuildRequires: openstack-macros BuildRequires: {{ py2pkg('jsonschema') }} -BuildRequires: {{ py2pkg('oslo.serialization') }} -BuildRequires: {{ py2pkg('oslo.config') }} BuildRequires: {{ py2pkg('mock') }} +BuildRequires: {{ py2pkg('oslo.config') }} +BuildRequires: {{ py2pkg('oslo.serialization') }} BuildRequires: {{ py2pkg('pbr') }} BuildRequires: {{ py2pkg('requests-mock') }} BuildRequires: {{ py2pkg('setuptools') }} BuildRequires: {{ py2pkg('unittest2') }} BuildRequires: {{ py2pkg('yaml') }} -Requires: {{ py2pkg('iso8601') }} -Requires: {{ py2pkg('Jinja2') }} -Requires: {{ py2pkg('jsonschema') }} -Requires: {{ py2pkg('oslo.config') }} -Requires: {{ py2pkg('oslo.serialization') }} -Requires: {{ py2pkg('PyYAML') }} -Requires: {{ py2pkg('six') }} -Requires: {{ py2pkg('stevedore') }} -Requires: {{ py2pkg('requests') }} -Requires: {{ py2pkg('urllib3') }} Requires: bzip2 Requires: cloud-utils Requires: coreutils @@ -46,6 +35,16 @@ Requires: openssh-clients Requires: parted Requires: pciutils Requires: psmisc +Requires: {{ py2pkg('Jinja2') }} +Requires: {{ py2pkg('PyYAML') }} +Requires: {{ py2pkg('iso8601') }} +Requires: {{ py2pkg('jsonschema') }} +Requires: {{ py2pkg('oslo.config') }} +Requires: {{ py2pkg('oslo.serialization') }} +Requires: {{ py2pkg('requests') }} +Requires: {{ py2pkg('six') }} +Requires: {{ py2pkg('stevedore') }} +Requires: {{ py2pkg('urllib3') }} Requires: tar Requires: udev Requires: util-linux-ng @@ -53,7 +52,6 @@ Requires: xfsprogs Requires: xz BuildArch: noarch - %description Bareon is nothing more than just a set of data driven executable scripts: * One of these scripts is used for building operating system images. One can @@ -66,22 +64,17 @@ about disk partitions, initial node configuration, operating system image location, etc. This script is to prepare disk partitions according to the input data, download operating system images and put these images on partitions. - %package doc Summary: Documentation for OpenStack bareon - -BuildRequires: {{ py2pkg('oslosphinx') }} BuildRequires: {{ py2pkg('Sphinx') }} - +BuildRequires: {{ py2pkg('oslosphinx') }} %description doc Documentation for OpenStack bareon tool. - %prep %setup -q -n %{sname}-%{sversion} - %build %{__python2} setup.py build # generate html docs @@ -109,10 +102,8 @@ install -p -D -m 644 cloud-init-templates/* %{buildroot}%{_datadir}/%{sname}/clo %{python2_sitelib}/%{sname} %{python2_sitelib}/*.egg-info - %files doc %doc doc/build/html %license LICENSE - %changelog diff --git a/openstack/keystoneauth1/keystoneauth1.spec.j2 b/openstack/keystoneauth1/keystoneauth1.spec.j2 index 92a41d558..3509c6cf6 100644 --- a/openstack/keystoneauth1/keystoneauth1.spec.j2 +++ b/openstack/keystoneauth1/keystoneauth1.spec.j2 @@ -1,5 +1,4 @@ %global sname keystoneauth1 - Name: {{ py2name('keystoneauth1') }} Version: 2.8.0 Release: 0 @@ -22,6 +21,7 @@ BuildRequires: {{ py2pkg('pbr') }} BuildRequires: {{ py2pkg('pep8') }} BuildRequires: {{ py2pkg('positional') }} BuildRequires: {{ py2pkg('pycrypto') }} +BuildRequires: {{ py2pkg('reno') }} BuildRequires: {{ py2pkg('requests-kerberos') }} BuildRequires: {{ py2pkg('requests-mock') }} BuildRequires: {{ py2pkg('testrepository') }} @@ -46,8 +46,8 @@ Tools for authenticating to an OpenStack-based cloud. These tools include: %package doc Summary: Documentation for OpenStack authenticating tools -BuildRequires: {{ py2pkg('oslosphinx') }} BuildRequires: {{ py2pkg('Sphinx') }} +BuildRequires: {{ py2pkg('oslosphinx') }} %description doc Documentation for OpenStack authenticating tools. diff --git a/openstack/os-brick/os-brick.spec.j2 b/openstack/os-brick/os-brick.spec.j2 index edb94deef..c49522b2d 100644 --- a/openstack/os-brick/os-brick.spec.j2 +++ b/openstack/os-brick/os-brick.spec.j2 @@ -49,8 +49,8 @@ Features: %package doc Summary: Documentation for OpenStack os-brick library -BuildRequires: {{ py2pkg('oslosphinx') }} BuildRequires: {{ py2pkg('Sphinx') }} +BuildRequires: {{ py2pkg('oslosphinx') }} %description doc OpenStack Cinder brick library for managing local volume attaches. @@ -74,7 +74,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo} %{__python2} setup.py install --prefix=%{_prefix} --root=%{buildroot} # move usr/etc to etc -mv %{buildroot}/usr/etc/* %{buildroot}/%{_sysconfdir}/ +mv %{buildroot}%{_prefix}%{_sysconfdir}/* %{buildroot}/%{_sysconfdir}/ %check %{__python2} setup.py testr diff --git a/openstack/os-client-config/os-client-config.spec.j2 b/openstack/os-client-config/os-client-config.spec.j2 index 5f0d699b0..84ad0bb8e 100644 --- a/openstack/os-client-config/os-client-config.spec.j2 +++ b/openstack/os-client-config/os-client-config.spec.j2 @@ -9,29 +9,28 @@ License: {{ license('Apache-2.0') }} Group: Development/Libraries Url: https://launchpad.net/%{sname} Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz +BuildRequires: openstack-macros +BuildRequires: python-devel +BuildRequires: {{ py2pkg('pbr') }} +BuildRequires: {{ py2pkg('setuptools') }} +Requires: {{ py2pkg('PyYAML') }} +Requires: {{ py2pkg('appdirs') }} +Requires: {{ py2pkg('keystoneauth1') }} +Requires: {{ py2pkg('requestsexceptions') }} BuildArch: noarch -BuildRequires: openstack-macros -BuildRequires: python-devel %if %{with test} -BuildRequires: {{ py2pkg('extras') }} -BuildRequires: {{ py2pkg('fixtures') }} -BuildRequires: {{ py2pkg('mock') }} -BuildRequires: {{ py2pkg('oslotest') }} -BuildRequires: {{ py2pkg('python-glanceclient') }} -BuildRequires: {{ py2pkg('python-keystoneclient') }} -BuildRequires: {{ py2pkg('python-subunit') }} -BuildRequires: {{ py2pkg('testrepository') }} -BuildRequires: {{ py2pkg('testscenarios') }} -BuildRequires: {{ py2pkg('testtools') }} -BuildRequires: {{ py2pkg('jsonschema') }} +BuildRequires: {{ py2pkg('extras') }} +BuildRequires: {{ py2pkg('fixtures') }} +BuildRequires: {{ py2pkg('python-glanceclient') }} +BuildRequires: {{ py2pkg('jsonschema') }} +BuildRequires: {{ py2pkg('python-keystoneclient') }} +BuildRequires: {{ py2pkg('mock') }} +BuildRequires: {{ py2pkg('oslotest') }} +BuildRequires: {{ py2pkg('python-subunit') }} +BuildRequires: {{ py2pkg('testrepository') }} +BuildRequires: {{ py2pkg('testscenarios') }} +BuildRequires: {{ py2pkg('testtools') }} %endif -BuildRequires: {{ py2pkg('pbr') }} -BuildRequires: {{ py2pkg('setuptools') }} -Requires: {{ py2pkg('appdirs') }} -Requires: {{ py2pkg('keystoneauth1') }} -Requires: {{ py2pkg('PyYAML') }} -Requires: {{ py2pkg('requestsexceptions') }} - %description os-client-config is a library for collecting client configuration for @@ -44,8 +43,8 @@ you don't have to know extra info to use OpenStack. %if %{with docs} %package doc Summary: Documentation for OpenStack client configuration library -BuildRequires: {{ py2pkg('oslosphinx') }} BuildRequires: {{ py2pkg('Sphinx') }} +BuildRequires: {{ py2pkg('oslosphinx') }} BuildRequires: {{ py2pkg('reno') }} %description doc diff --git a/openstack/os-testr/os-testr.spec.j2 b/openstack/os-testr/os-testr.spec.j2 index b69d7ed4b..77e411497 100644 --- a/openstack/os-testr/os-testr.spec.j2 +++ b/openstack/os-testr/os-testr.spec.j2 @@ -8,12 +8,12 @@ Group: Development/Languages/Python Url: http://www.openstack.org/ Source: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('ddt') }} +BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('oslotest') }} BuildRequires: {{ py2pkg('pbr') }} -BuildRequires: {{ py2pkg('testscenarios') }} BuildRequires: {{ py2pkg('testrepository') }} +BuildRequires: {{ py2pkg('testscenarios') }} Requires: {{ py2pkg('Babel') }} Requires: {{ py2pkg('pbr') }} Requires: {{ py2pkg('python-subunit') }} @@ -30,8 +30,8 @@ A testr wrapper to provide functionality for OpenStack projects %package doc Summary: Documentation for the testr Group: Documentation -BuildRequires: {{ py2pkg('oslosphinx') }} BuildRequires: {{ py2pkg('Sphinx') }} +BuildRequires: {{ py2pkg('oslosphinx') }} %description doc Documentation for the testr wrapper. diff --git a/openstack/os-win/os-win.spec.j2 b/openstack/os-win/os-win.spec.j2 index 987d4b44c..542cebeef 100644 --- a/openstack/os-win/os-win.spec.j2 +++ b/openstack/os-win/os-win.spec.j2 @@ -1,5 +1,4 @@ %global sname os-win - Name: {{ py2name('os-win') }} Epoch: {{ epoch('os-win') }} Version: 0.3.2 @@ -7,10 +6,8 @@ Release: 0 Summary: Hyper-V library for OpenStack projects License: {{ license('Apache-2.0') }} Group: Development/Languages/Python -URL: https://launchpad.net/%{sname} +Url: https://launchpad.net/%{sname} Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz -BuildArch: noarch - BuildRequires: openstack-macros BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('eventlet') }} @@ -36,6 +33,7 @@ Requires: {{ py2pkg('oslo.log') }} Requires: {{ py2pkg('oslo.service') }} Requires: {{ py2pkg('oslo.utils') }} Requires: {{ py2pkg('pbr') }} +BuildArch: noarch %description Library contains Windows / Hyper-V code commonly used in the OpenStack projects: @@ -44,7 +42,6 @@ nova, cinder, networking-hyperv. %package doc Summary: Documentation for OpenStack Identity API Client Group: Documentation - BuildRequires: {{ py2pkg('Sphinx') }} BuildRequires: {{ py2pkg('oslosphinx') }} diff --git a/openstack/oslo.cache/oslo.cache.spec.j2 b/openstack/oslo.cache/oslo.cache.spec.j2 index 92b0f1f13..d1a46002e 100644 --- a/openstack/oslo.cache/oslo.cache.spec.j2 +++ b/openstack/oslo.cache/oslo.cache.spec.j2 @@ -1,5 +1,4 @@ %global sname oslo.cache - Name: {{ py2name('oslo.cache') }} Version: 1.9.0 Release: 0 @@ -38,7 +37,6 @@ backends such as Memcached. %package doc Summary: Documentation for the OpenStack Oslo Cache library - BuildRequires: {{ py2pkg('Sphinx') }} BuildRequires: {{ py2pkg('oslosphinx') }} diff --git a/openstack/oslo.concurrency/oslo.concurrency.spec.j2 b/openstack/oslo.concurrency/oslo.concurrency.spec.j2 index d6c60bc81..99d40e385 100644 --- a/openstack/oslo.concurrency/oslo.concurrency.spec.j2 +++ b/openstack/oslo.concurrency/oslo.concurrency.spec.j2 @@ -40,8 +40,8 @@ external processes. %package doc Summary: Documentation for OpenStack concurrency library -BuildRequires: {{ py2pkg('oslosphinx') }} BuildRequires: {{ py2pkg('Sphinx') }} +BuildRequires: {{ py2pkg('oslosphinx') }} %description doc The oslo.concurrency library has utilities for safely running multi-thread, diff --git a/openstack/oslo.config/oslo.config.spec.j2 b/openstack/oslo.config/oslo.config.spec.j2 index e33b1418b..e63a3ae2c 100644 --- a/openstack/oslo.config/oslo.config.spec.j2 +++ b/openstack/oslo.config/oslo.config.spec.j2 @@ -1,34 +1,33 @@ %global sname oslo.config - -Name: {{ py2name('oslo.config') }} -Version: 3.10.0 -Epoch: {{ epoch('oslo.config') }} -Release: 0 -Summary: OpenStack common configuration library -Group: Development/Languages -License: {{ license('Apache-2.0') }} -Url: https://launchpad.net/%{sname} -Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz -BuildRequires: openstack-macros -BuildRequires: python-devel -BuildRequires: {{ py2pkg('debtcollector') }} -BuildRequires: {{ py2pkg('six') }} -BuildRequires: {{ py2pkg('netaddr') }} -BuildRequires: {{ py2pkg('stevedore') }} -BuildRequires: {{ py2pkg('fixtures') }} -BuildRequires: {{ py2pkg('mock') }} -BuildRequires: {{ py2pkg('oslo.i18n') }} -BuildRequires: {{ py2pkg('oslotest') }} -BuildRequires: {{ py2pkg('pbr') }} -BuildRequires: {{ py2pkg('python-subunit') }} -BuildRequires: {{ py2pkg('testrepository') }} -BuildRequires: {{ py2pkg('testscenarios') }} -BuildRequires: {{ py2pkg('testtools') }} -Requires: {{ py2pkg('debtcollector') }} -Requires: {{ py2pkg('netaddr') }} -Requires: {{ py2pkg('six') }} -Requires: {{ py2pkg('stevedore') }} -BuildArch: noarch +Name: {{ py2name('oslo.config') }} +Version: 3.10.0 +Epoch: {{ epoch('oslo.config') }} +Release: 0 +Summary: OpenStack common configuration library +License: {{ license('Apache-2.0') }} +Group: Development/Languages +Url: https://launchpad.net/%{sname} +Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz +BuildRequires: openstack-macros +BuildRequires: {{ py2pkg('debtcollector') }} +BuildRequires: {{ py2pkg('devel') }} +BuildRequires: {{ py2pkg('fixtures') }} +BuildRequires: {{ py2pkg('mock') }} +BuildRequires: {{ py2pkg('netaddr') }} +BuildRequires: {{ py2pkg('oslo.i18n') }} +BuildRequires: {{ py2pkg('oslotest') }} +BuildRequires: {{ py2pkg('pbr') }} +BuildRequires: {{ py2pkg('python-subunit') }} +BuildRequires: {{ py2pkg('six') }} +BuildRequires: {{ py2pkg('stevedore') }} +BuildRequires: {{ py2pkg('testrepository') }} +BuildRequires: {{ py2pkg('testscenarios') }} +BuildRequires: {{ py2pkg('testtools') }} +Requires: {{ py2pkg('debtcollector') }} +Requires: {{ py2pkg('netaddr') }} +Requires: {{ py2pkg('six') }} +Requires: {{ py2pkg('stevedore') }} +BuildArch: noarch %description The Oslo project intends to produce a python library containing @@ -39,11 +38,10 @@ useful. The oslo-config library is a command line and configuration file parsing library from the Oslo project. - %package doc Summary: Documentation for OpenStack common configuration library -BuildRequires: {{ py2pkg('oslosphinx') }} -BuildRequires: {{ py2pkg('Sphinx') }} +BuildRequires: {{ py2pkg('Sphinx') }} +BuildRequires: {{ py2pkg('oslosphinx') }} %description doc Documentation for the oslo-config library. diff --git a/openstack/oslo.context/oslo.context.spec.j2 b/openstack/oslo.context/oslo.context.spec.j2 index 84a0975fa..292188d44 100644 --- a/openstack/oslo.context/oslo.context.spec.j2 +++ b/openstack/oslo.context/oslo.context.spec.j2 @@ -4,16 +4,16 @@ Name: {{ py2name('oslo.context') }} Version: 2.4.0 Release: 0 Summary: OpenStack Oslo context library -Group: Development/Languages License: {{ license('Apache-2.0') }} +Group: Development/Languages Url: https://launchpad.net/%{sname} Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros BuildRequires: {{ py2pkg('pbr') }} +BuildArch: noarch %if %{with test} BuildRequires: {{ py2pkg('oslotest') }} %endif -BuildArch: noarch %description The Oslo context library has helpers to maintain useful information @@ -24,7 +24,6 @@ used by various modules such as logging. %package doc Summary: Documentation for OpenStack common configuration library Group: Documentation - BuildRequires: {{ py2pkg('Sphinx') }} BuildRequires: {{ py2pkg('oslosphinx') }} diff --git a/openstack/oslo.db/oslo.db.spec.j2 b/openstack/oslo.db/oslo.db.spec.j2 index 5a44f26e3..68d5dc297 100644 --- a/openstack/oslo.db/oslo.db.spec.j2 +++ b/openstack/oslo.db/oslo.db.spec.j2 @@ -1,5 +1,4 @@ %global sname oslo.db - Name: {{ py2name('oslo.db') }} Version: 4.7.0 Release: 0 @@ -9,9 +8,11 @@ Group: Development/Languages/Python Url: https://launchpad.net/%{sname} Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel') }} -BuildRequires: {{ py2pkg('alembic') }} BuildRequires: {{ py2pkg('Babel') }} +BuildRequires: {{ py2pkg('MySQL-python') }} +BuildRequires: {{ py2pkg('PyMySQL') }} +BuildRequires: {{ py2pkg('alembic') }} +BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('eventlet') }} BuildRequires: {{ py2pkg('fixtures') }} BuildRequires: {{ py2pkg('mock') }} @@ -20,27 +21,25 @@ BuildRequires: {{ py2pkg('oslo.context') }} BuildRequires: {{ py2pkg('oslo.i18n') }} BuildRequires: {{ py2pkg('oslo.utils') }} BuildRequires: {{ py2pkg('oslotest') }} -BuildRequires: {{ py2pkg('MySQL-python') }} -BuildRequires: {{ py2pkg('PyMySQL') }} BuildRequires: {{ py2pkg('pbr') }} -BuildRequires: {{ py2pkg('python-subunit') }} BuildRequires: {{ py2pkg('psycopg2') }} +BuildRequires: {{ py2pkg('python-subunit') }} BuildRequires: {{ py2pkg('reno') }} BuildRequires: {{ py2pkg('six') }} BuildRequires: {{ py2pkg('sqlalchemy-migrate') }} BuildRequires: {{ py2pkg('testrepository') }} BuildRequires: {{ py2pkg('testresources') }} BuildRequires: {{ py2pkg('testtools') }} -Requires: {{ py2pkg('alembic') }} Requires: {{ py2pkg('Babel') }} +Requires: {{ py2pkg('PyMySQL') }} +Requires: {{ py2pkg('SQLAlchemy') }} +Requires: {{ py2pkg('alembic') }} Requires: {{ py2pkg('oslo.config') }} Requires: {{ py2pkg('oslo.context') }} Requires: {{ py2pkg('oslo.i18n') }} Requires: {{ py2pkg('oslo.utils') }} -Requires: {{ py2pkg('PyMySQL') }} Requires: {{ py2pkg('psycopg2') }} Requires: {{ py2pkg('six') }} -Requires: {{ py2pkg('SQLAlchemy') }} Requires: {{ py2pkg('sqlalchemy-migrate') }} Requires: {{ py2pkg('stevedore') }} BuildArch: noarch @@ -52,12 +51,11 @@ to the different backends and helper utils. * Source: http://git.openstack.org/cgit/openstack/oslo.db * Bugs: http://bugs.launchpad.net/oslo - %package doc Summary: Documentation for the Oslo database handling library Group: Documentation -BuildRequires: {{ py2pkg('oslosphinx') }} BuildRequires: {{ py2pkg('Sphinx') }} +BuildRequires: {{ py2pkg('oslosphinx') }} %description doc Documentation for the Oslo database handling library. diff --git a/openstack/oslo.i18n/oslo.i18n.spec.j2 b/openstack/oslo.i18n/oslo.i18n.spec.j2 index 423654899..a62da81c1 100644 --- a/openstack/oslo.i18n/oslo.i18n.spec.j2 +++ b/openstack/oslo.i18n/oslo.i18n.spec.j2 @@ -1,5 +1,4 @@ %global sname oslo.i18n - Name: {{ py2name('oslo.i18n') }} Version: 3.6.0 Release: 0 diff --git a/openstack/oslo.log/oslo.log.spec.j2 b/openstack/oslo.log/oslo.log.spec.j2 index 207a53893..282ff1232 100644 --- a/openstack/oslo.log/oslo.log.spec.j2 +++ b/openstack/oslo.log/oslo.log.spec.j2 @@ -1,5 +1,4 @@ %global sname oslo.log - Name: {{ py2name('oslo.log') }} Version: 3.7.0 Release: 0 @@ -10,7 +9,6 @@ Url: https://launchpad.net/%{sname} Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros BuildRequires: python-devel -BuildRequires: {{ py2pkg('pyinotify') }} BuildRequires: {{ py2pkg('mock') }} BuildRequires: {{ py2pkg('oslo.config') }} BuildRequires: {{ py2pkg('oslo.context') }} @@ -19,6 +17,7 @@ BuildRequires: {{ py2pkg('oslo.serialization') }} BuildRequires: {{ py2pkg('oslo.utils') }} BuildRequires: {{ py2pkg('oslotest') }} BuildRequires: {{ py2pkg('pbr') }} +BuildRequires: {{ py2pkg('pyinotify') }} BuildRequires: {{ py2pkg('python-dateutil') }} BuildRequires: {{ py2pkg('python-subunit') }} BuildRequires: {{ py2pkg('six') }} diff --git a/openstack/oslo.messaging/oslo.messaging.spec.j2 b/openstack/oslo.messaging/oslo.messaging.spec.j2 index f026a7227..ecc6bbd38 100644 --- a/openstack/oslo.messaging/oslo.messaging.spec.j2 +++ b/openstack/oslo.messaging/oslo.messaging.spec.j2 @@ -8,6 +8,8 @@ Group: Development/Languages/Python Url: https://launchpad.net/%{sname} Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros +BuildRequires: {{ py2pkg('PyYAML') }} +BuildRequires: {{ py2pkg('WebOb') }} BuildRequires: {{ py2pkg('amqp') }} BuildRequires: {{ py2pkg('cachetools') }} BuildRequires: {{ py2pkg('debtcollector') }} @@ -34,14 +36,14 @@ BuildRequires: {{ py2pkg('pbr') }} BuildRequires: {{ py2pkg('pika') }} BuildRequires: {{ py2pkg('pika-pool') }} BuildRequires: {{ py2pkg('python-subunit') }} -BuildRequires: {{ py2pkg('PyYAML') }} BuildRequires: {{ py2pkg('retrying') }} BuildRequires: {{ py2pkg('six') }} BuildRequires: {{ py2pkg('stevedore') }} BuildRequires: {{ py2pkg('testrepository') }} BuildRequires: {{ py2pkg('testscenarios') }} BuildRequires: {{ py2pkg('testtools') }} -BuildRequires: {{ py2pkg('WebOb') }} +Requires: {{ py2pkg('PyYAML') }} +Requires: {{ py2pkg('WebOb') }} Requires: {{ py2pkg('amqp') }} Requires: {{ py2pkg('cachetools') }} Requires: {{ py2pkg('debtcollector') }} @@ -60,11 +62,9 @@ Requires: {{ py2pkg('oslo.service') }} Requires: {{ py2pkg('oslo.utils') }} Requires: {{ py2pkg('pika') }} Requires: {{ py2pkg('pika-pool') }} -Requires: {{ py2pkg('PyYAML') }} Requires: {{ py2pkg('retrying') }} Requires: {{ py2pkg('six') }} Requires: {{ py2pkg('stevedore') }} -Requires: {{ py2pkg('WebOb') }} BuildArch: noarch %description @@ -73,8 +73,8 @@ of different messaging transports. %package doc Summary: Documentation for OpenStack messaging library -BuildRequires: {{ py2pkg('oslosphinx') }} BuildRequires: {{ py2pkg('Sphinx') }} +BuildRequires: {{ py2pkg('oslosphinx') }} %description doc The Oslo messaging API supports RPC and notifications over a number diff --git a/openstack/oslo.middleware/oslo.middleware.spec.j2 b/openstack/oslo.middleware/oslo.middleware.spec.j2 index a08575e4c..488ba9c47 100644 --- a/openstack/oslo.middleware/oslo.middleware.spec.j2 +++ b/openstack/oslo.middleware/oslo.middleware.spec.j2 @@ -8,30 +8,30 @@ Group: Development/Languages/Python Url: https://launchpad.net/%{sname} Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros -BuildRequires: python-devel -BuildRequires: {{ py2pkg('pbr') }} +BuildRequires: {{ py2pkg('Jinja2') }} +BuildRequires: {{ py2pkg('WebOb') }} +BuildRequires: {{ py2pkg('debtcollector') }} +BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('fixtures') }} BuildRequires: {{ py2pkg('mock') }} -BuildRequires: {{ py2pkg('oslotest') }} -BuildRequires: {{ py2pkg('testtools') }} -BuildRequires: {{ py2pkg('debtcollector') }} -BuildRequires: {{ py2pkg('Jinja2') }} BuildRequires: {{ py2pkg('oslo.config') }} BuildRequires: {{ py2pkg('oslo.context') }} BuildRequires: {{ py2pkg('oslo.i18n') }} BuildRequires: {{ py2pkg('oslo.utils') }} +BuildRequires: {{ py2pkg('oslotest') }} +BuildRequires: {{ py2pkg('pbr') }} BuildRequires: {{ py2pkg('six') }} BuildRequires: {{ py2pkg('stevedore') }} -BuildRequires: {{ py2pkg('WebOb') }} -Requires: {{ py2pkg('debtcollector') }} +BuildRequires: {{ py2pkg('testtools') }} Requires: {{ py2pkg('Jinja2') }} +Requires: {{ py2pkg('WebOb') }} +Requires: {{ py2pkg('debtcollector') }} Requires: {{ py2pkg('oslo.config') }} Requires: {{ py2pkg('oslo.context') }} Requires: {{ py2pkg('oslo.i18n') }} Requires: {{ py2pkg('oslo.utils') }} Requires: {{ py2pkg('six') }} Requires: {{ py2pkg('stevedore') }} -Requires: {{ py2pkg('WebOb') }} BuildArch: noarch %description @@ -42,8 +42,8 @@ for limiting size/connection etc. %package doc Summary: Documentation for OpenStack middleware library -BuildRequires: {{ py2pkg('oslosphinx') }} BuildRequires: {{ py2pkg('Sphinx') }} +BuildRequires: {{ py2pkg('oslosphinx') }} %description doc Oslo middleware library includes components that can be injected into wsgi diff --git a/openstack/oslo.policy/oslo.policy.spec.j2 b/openstack/oslo.policy/oslo.policy.spec.j2 index 2c088a580..22328b5f3 100644 --- a/openstack/oslo.policy/oslo.policy.spec.j2 +++ b/openstack/oslo.policy/oslo.policy.spec.j2 @@ -1,5 +1,4 @@ %global sname oslo.policy - Name: {{ py2name('oslo.policy') }} Version: 1.9.0 Release: 0 @@ -8,6 +7,7 @@ License: {{ license('Apache-2.0') }} Url: https://launchpad.net/%sname Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros +BuildRequires: {{ py2pkg('PyYAML') }} BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('oslo.config') }} BuildRequires: {{ py2pkg('oslo.i18n') }} @@ -15,14 +15,13 @@ BuildRequires: {{ py2pkg('oslo.serialization') }} BuildRequires: {{ py2pkg('oslo.utils') }} BuildRequires: {{ py2pkg('oslotest') }} BuildRequires: {{ py2pkg('pbr') }} -BuildRequires: {{ py2pkg('PyYAML') }} BuildRequires: {{ py2pkg('requests') }} BuildRequires: {{ py2pkg('requests-mock') }} +Requires: {{ py2pkg('PyYAML') }} Requires: {{ py2pkg('oslo.config') }} Requires: {{ py2pkg('oslo.i18n') }} Requires: {{ py2pkg('oslo.serialization') }} Requires: {{ py2pkg('oslo.utils') }} -Requires: {{ py2pkg('PyYAML') }} Requires: {{ py2pkg('requests') }} Requires: {{ py2pkg('six') }} BuildArch: noarch @@ -34,8 +33,8 @@ RBAC policy enforcement library for OpenStack. %package doc Summary: Documentation for the Oslo Policy library Group: Documentation -BuildRequires: {{ py2pkg('oslosphinx') }} BuildRequires: {{ py2pkg('Sphinx') }} +BuildRequires: {{ py2pkg('oslosphinx') }} %description doc Documentation for the Oslo Policy library. diff --git a/openstack/oslo.reports/oslo.reports.spec.j2 b/openstack/oslo.reports/oslo.reports.spec.j2 index e38643c4d..bbffb32a7 100644 --- a/openstack/oslo.reports/oslo.reports.spec.j2 +++ b/openstack/oslo.reports/oslo.reports.spec.j2 @@ -8,10 +8,10 @@ Group: Development/Languages/Python Url: https://launchpad.net/%{sname} Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros +BuildRequires: {{ py2pkg('Jinja2') }} BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('eventlet') }} BuildRequires: {{ py2pkg('greenlet') }} -BuildRequires: {{ py2pkg('Jinja2') }} BuildRequires: {{ py2pkg('oslo.config') }} BuildRequires: {{ py2pkg('oslo.i18n') }} BuildRequires: {{ py2pkg('oslo.serialization') }} @@ -32,11 +32,10 @@ BuildArch: noarch The project oslo.reports hosts a general purpose error report generation framework, known as the "guru meditation report". - %package doc Summary: Documentation for OpenStack reports library -BuildRequires: {{ py2pkg('oslosphinx') }} BuildRequires: {{ py2pkg('Sphinx') }} +BuildRequires: {{ py2pkg('oslosphinx') }} %description doc The project oslo.reports hosts a general purpose error report generation diff --git a/openstack/oslo.serialization/oslo.serialization.spec.j2 b/openstack/oslo.serialization/oslo.serialization.spec.j2 index a61ba9abe..965ce1261 100644 --- a/openstack/oslo.serialization/oslo.serialization.spec.j2 +++ b/openstack/oslo.serialization/oslo.serialization.spec.j2 @@ -1,11 +1,10 @@ %global sname oslo.serialization - Name: {{ py2name('oslo.serialization') }} Version: 2.7.0 Release: 0 Summary: OpenStack serialization library -Group: Development/Languages License: {{ license('Apache-2.0') }} +Group: Development/Languages Url: https://launchpad.net/%{sname} Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros @@ -29,8 +28,8 @@ in transmittable and storable formats, such as Base64, JSON and MessagePack. %package doc Summary: Documentation for OpenStack serialization library -BuildRequires: {{ py2pkg('oslosphinx') }} BuildRequires: {{ py2pkg('Sphinx') }} +BuildRequires: {{ py2pkg('oslosphinx') }} %description doc The oslo.serialization library provides support for representing objects diff --git a/openstack/oslo.service/oslo.service.spec.j2 b/openstack/oslo.service/oslo.service.spec.j2 index 04476aab7..3dbbe3415 100644 --- a/openstack/oslo.service/oslo.service.spec.j2 +++ b/openstack/oslo.service/oslo.service.spec.j2 @@ -8,8 +8,12 @@ Group: Development/Languages/Python Url: https://launchpad.net/%{sname} Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros -BuildRequires: python-devel BuildRequires: procps +BuildRequires: {{ py2pkg('Paste') }} +BuildRequires: {{ py2pkg('PasteDeploy') }} +BuildRequires: {{ py2pkg('Routes') }} +BuildRequires: {{ py2pkg('WebOb') }} +BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('eventlet') }} BuildRequires: {{ py2pkg('fixtures') }} BuildRequires: {{ py2pkg('greenlet') }} @@ -21,12 +25,12 @@ BuildRequires: {{ py2pkg('oslo.i18n') }} BuildRequires: {{ py2pkg('oslo.log') }} BuildRequires: {{ py2pkg('oslo.utils') }} BuildRequires: {{ py2pkg('oslotest') }} -BuildRequires: {{ py2pkg('Paste') }} -BuildRequires: {{ py2pkg('PasteDeploy') }} BuildRequires: {{ py2pkg('pbr') }} -BuildRequires: {{ py2pkg('Routes') }} BuildRequires: {{ py2pkg('six') }} -BuildRequires: {{ py2pkg('WebOb') }} +Requires: {{ py2pkg('Paste') }} +Requires: {{ py2pkg('PasteDeploy') }} +Requires: {{ py2pkg('Routes') }} +Requires: {{ py2pkg('WebOb') }} Requires: {{ py2pkg('eventlet') }} Requires: {{ py2pkg('greenlet') }} Requires: {{ py2pkg('monotonic') }} @@ -35,11 +39,7 @@ Requires: {{ py2pkg('oslo.config') }} Requires: {{ py2pkg('oslo.i18n') }} Requires: {{ py2pkg('oslo.log') }} Requires: {{ py2pkg('oslo.utils') }} -Requires: {{ py2pkg('Paste') }} -Requires: {{ py2pkg('PasteDeploy') }} -Requires: {{ py2pkg('Routes') }} Requires: {{ py2pkg('six') }} -Requires: {{ py2pkg('WebOb') }} BuildArch: noarch %description @@ -50,8 +50,8 @@ performing periodic operations, interacting with systemd, etc. %package doc Summary: Documentation for OpenStack service library -BuildRequires: {{ py2pkg('oslosphinx') }} BuildRequires: {{ py2pkg('Sphinx') }} +BuildRequires: {{ py2pkg('oslosphinx') }} %description doc oslo.service provides a framework for defining new long-running services using diff --git a/openstack/oslo.utils/oslo.utils.spec.j2 b/openstack/oslo.utils/oslo.utils.spec.j2 index 16d562bb3..d81cb2054 100644 --- a/openstack/oslo.utils/oslo.utils.spec.j2 +++ b/openstack/oslo.utils/oslo.utils.spec.j2 @@ -1,5 +1,4 @@ %global sname oslo.utils - Name: {{ py2name('oslo.utils') }} Version: 3.11.0 Release: 0 diff --git a/openstack/oslosphinx/oslosphinx.spec.j2 b/openstack/oslosphinx/oslosphinx.spec.j2 index f01d9b442..07154ac6f 100644 --- a/openstack/oslosphinx/oslosphinx.spec.j2 +++ b/openstack/oslosphinx/oslosphinx.spec.j2 @@ -1,28 +1,10 @@ -# -# spec file for package python-oslosphinx -# -# Copyright (c) 2015 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 -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# 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/ -# - - Name: {{ py2name('oslosphinx') }} Version: 4.3.0 Release: 0 -Url: https://launchpad.net/oslosphinx Summary: OpenStack Sphinx License: Apache-2.0 Group: Development/Languages/Python +Url: https://launchpad.net/oslosphinx Source: https://pypi.io/packages/source/o/oslosphinx/oslosphinx-%{version}.tar.gz BuildRequires: openstack-macros BuildRequires: {{ py2pkg('devel') }} diff --git a/openstack/oslotest/oslotest.spec.j2 b/openstack/oslotest/oslotest.spec.j2 index 047cae0ab..7a674f43b 100644 --- a/openstack/oslotest/oslotest.spec.j2 +++ b/openstack/oslotest/oslotest.spec.j2 @@ -1,17 +1,3 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - Name: {{ py2name('oslotest') }} Version: 2.4.0 Release: 0 @@ -21,13 +7,12 @@ Group: Development/Languages/Python Url: https://launchpad.net/oslotest Source: https://pypi.io/packages/source/o/oslotest/oslotest-%{version}.tar.gz BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel') }} -BuildRequires: {{ py2pkg('pbr') }} -# Test requirements: BuildRequires: {{ py2pkg('debtcollector', (">=", "0.3.0")) }} +BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('fixtures', (">=", "0.3.14")) }} BuildRequires: {{ py2pkg('mock', (">=", "1.0")) }} BuildRequires: {{ py2pkg('mox3', (">=", "0.7.0")) }} +BuildRequires: {{ py2pkg('pbr') }} BuildRequires: {{ py2pkg('python-subunit', (">=", "0.0.18")) }} BuildRequires: {{ py2pkg('six') }} BuildRequires: {{ py2pkg('testrepository', (">=", "0.0.18")) }} diff --git a/openstack/python-keystoneclient/python-keystoneclient.spec.j2 b/openstack/python-keystoneclient/python-keystoneclient.spec.j2 index 7cd9d9735..22341b384 100644 --- a/openstack/python-keystoneclient/python-keystoneclient.spec.j2 +++ b/openstack/python-keystoneclient/python-keystoneclient.spec.j2 @@ -1,75 +1,66 @@ %global sname python-keystoneclient - -Name: {{ py2name('python-keystoneclient') }} -Epoch: {{ epoch('python-keystoneclient') }} -Version: 2.3.1 -Release: 0 -Summary: Client library for OpenStack Identity API -License: {{ license('Apache-2.0') }} -Group: Development/Languages/Python -Url: http://launchpad.net/%{sname} -Source0: https://pypi.io/packages/source/p/%{sname}/%{sname}-%{version}.tar.gz - -BuildArch: noarch -BuildRequires: openstack-macros -BuildRequires: python-devel -BuildRequires: {{ py2pkg('pbr') }} -BuildRequires: {{ py2pkg('debtcollector') }} -BuildRequires: {{ py2pkg('keystoneauth1') }} -BuildRequires: {{ py2pkg('oslo.config') }} -BuildRequires: {{ py2pkg('oslo.i18n') }} -BuildRequires: {{ py2pkg('oslo.serialization') }} -BuildRequires: {{ py2pkg('oslo.utils') }} -BuildRequires: {{ py2pkg('six') }} -# Requires for tests -BuildRequires: openssl -BuildRequires: {{ py2pkg('flake8') }} -BuildRequires: {{ py2pkg('testrepository') }} -BuildRequires: {{ py2pkg('testresources') }} -BuildRequires: {{ py2pkg('testscenarios') }} -BuildRequires: {{ py2pkg('mock') }} -BuildRequires: {{ py2pkg('PrettyTable') }} -BuildRequires: {{ py2pkg('requests-mock') }} -BuildRequires: {{ py2pkg('lxml') }} -BuildRequires: {{ py2pkg('oslotest') }} -BuildRequires: {{ py2pkg('positional') }} - -# from requirements.txt -Requires: {{ py2pkg('iso8601') }} -Requires: {{ py2pkg('debtcollector') }} -Requires: {{ py2pkg('keystoneauth1') }} -Requires: {{ py2pkg('oslo.config') }} -Requires: {{ py2pkg('oslo.i18n') }} -Requires: {{ py2pkg('oslo.serialization') }} -Requires: {{ py2pkg('oslo.utils') }} -Requires: {{ py2pkg('positional') }} -Requires: {{ py2pkg('PrettyTable') }} -Requires: {{ py2pkg('requests') }} -Requires: {{ py2pkg('six') }} -Requires: {{ py2pkg('stevedore') }} - +Name: {{ py2name('python-keystoneclient') }} +Epoch: {{ epoch('python-keystoneclient') }} +Version: 2.3.1 +Release: 0 +Summary: Client library for OpenStack Identity API +License: {{ license('Apache-2.0') }} +Group: Development/Languages/Python +Url: http://launchpad.net/%{sname} +Source0: https://pypi.io/packages/source/p/%{sname}/%{sname}-%{version}.tar.gz +BuildRequires: openssl +BuildRequires: openstack-macros +BuildRequires: {{ py2pkg('PrettyTable') }} +BuildRequires: {{ py2pkg('debtcollector') }} +BuildRequires: {{ py2pkg('devel') }} +BuildRequires: {{ py2pkg('flake8') }} +BuildRequires: {{ py2pkg('keystoneauth1') }} +BuildRequires: {{ py2pkg('lxml') }} +BuildRequires: {{ py2pkg('mock') }} +BuildRequires: {{ py2pkg('oslo.config') }} +BuildRequires: {{ py2pkg('oslo.i18n') }} +BuildRequires: {{ py2pkg('oslo.serialization') }} +BuildRequires: {{ py2pkg('oslo.utils') }} +BuildRequires: {{ py2pkg('oslotest') }} +BuildRequires: {{ py2pkg('pbr') }} +BuildRequires: {{ py2pkg('positional') }} +BuildRequires: {{ py2pkg('requests-mock') }} +BuildRequires: {{ py2pkg('six') }} +BuildRequires: {{ py2pkg('testrepository') }} +BuildRequires: {{ py2pkg('testresources') }} +BuildRequires: {{ py2pkg('testscenarios') }} +Requires: {{ py2pkg('PrettyTable') }} +Requires: {{ py2pkg('debtcollector') }} +Requires: {{ py2pkg('iso8601') }} +Requires: {{ py2pkg('keystoneauth1') }} +Requires: {{ py2pkg('oslo.config') }} +Requires: {{ py2pkg('oslo.i18n') }} +Requires: {{ py2pkg('oslo.serialization') }} +Requires: {{ py2pkg('oslo.utils') }} +Requires: {{ py2pkg('positional') }} +Requires: {{ py2pkg('requests') }} +Requires: {{ py2pkg('six') }} +Requires: {{ py2pkg('stevedore') }} +BuildArch: noarch %description Client library and command line utility for interacting with Openstack Identity API. %package doc -Summary: Documentation for OpenStack Identity API Client -Group: Documentation - -BuildRequires: {{ py2pkg('Sphinx') }} -BuildRequires: {{ py2pkg('oslosphinx') }} +Summary: Documentation for OpenStack Identity API Client +Group: Documentation +BuildRequires: {{ py2pkg('Sphinx') }} +BuildRequires: {{ py2pkg('oslosphinx') }} %description doc Documentation for the client library for interacting with Openstack Identity API. - %prep %setup -q sed '/^html_last_updated_fmt.*/,/.)/ s/^/#/' -i doc/source/conf.py - %build %{__python2} setup.py build @@ -77,7 +68,6 @@ sed '/^html_last_updated_fmt.*/,/.)/ s/^/#/' -i doc/source/conf.py %{__python2} setup.py build_sphinx %{__python2} setup.py build_sphinx -b man - %install %{__python2} setup.py install -O1 --skip-build --root %{buildroot} install -p -D -m 644 tools/keystone.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/keystone.bash_completion @@ -91,12 +81,10 @@ install -p -D -m 644 doc/build/man/keystone.1 %{buildroot}%{_mandir}/man1/keysto # Fix hidden-file-or-dir warnings rm -fr html/.doctrees html/.buildinfo - %check export PYTHONPATH="%{python2_sitearch}:%{python2_sitelib}:%{buildroot}%{python2_sitelib}" %{__python2} setup.py testr - %files %doc README.rst %license LICENSE @@ -106,10 +94,8 @@ export PYTHONPATH="%{python2_sitearch}:%{python2_sitelib}:%{buildroot}%{python2_ %{python2_sitelib}/*.egg-info %{_mandir}/man1/keystone.1* - %files doc %doc doc/build/html %license LICENSE - %changelog diff --git a/other-requirements.txt b/other-requirements.txt new file mode 100644 index 000000000..2873110a0 --- /dev/null +++ b/other-requirements.txt @@ -0,0 +1,2 @@ +diffutils +rpm diff --git a/test-requirements.txt b/test-requirements.txt index e97880d2f..b6dcb1ede 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1 +1,2 @@ renderspec==1.0.0 +spec_cleaner >= 0.8.9 diff --git a/tools/run_speccleaner.sh b/tools/run_speccleaner.sh new file mode 100755 index 000000000..da538c205 --- /dev/null +++ b/tools/run_speccleaner.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +set -e + +basedir=$1 + +WORKSPACE=${WORKSPACE:-$basedir} +# tempfile to store the spec-cleaner diff for all specs +tmpdir=$(mktemp -d) + +echo "run spec-cleaner over specfiles from $WORKSPACE/logs/" + +# TODO(toabctl): also run spec-cleaner with non-SUSE specs +# but the current problem is that the license check works for SUSE only +for spec in $WORKSPACE/logs/*.suse ; do + # NOTE(toabctl):spec-cleaner can not ignore epochs currently + sed -i '/^Epoch:.*/d' $spec + spec-cleaner -m -d --no-copyright --diff-prog "diff -uw" \ + $spec > $tmpdir/`basename ${spec}`.cleaner.diff +done + +# check if some diffs are available +failed=0 +for specdiff in $tmpdir/*; do + if [ -s "$specdiff" ]; then + echo "##### `basename ${specdiff}` ##### " + cat $specdiff + failed=1 + fi +done + +exit $failed diff --git a/tox.ini b/tox.ini index 5d7e3a15d..ffbfbdd2a 100644 --- a/tox.ini +++ b/tox.ini @@ -12,6 +12,7 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY [testenv:lint] commands = {toxinidir}/tools/run_renderspec.sh {toxinidir} + {toxinidir}/tools/run_speccleaner.sh {toxinidir} [testenv:venv] commands = {posargs}