diff --git a/openstack/cinder/cinder.spec.j2 b/openstack/cinder/cinder.spec.j2 index ce166c87d..362cc0693 100644 --- a/openstack/cinder/cinder.spec.j2 +++ b/openstack/cinder/cinder.spec.j2 @@ -44,7 +44,6 @@ BuildRequires: {{ py3('lxml') }} BuildRequires: {{ py3('python-novaclient') }} BuildRequires: {{ py3('oauth2client') }} BuildRequires: {{ py3('os-brick') }} -BuildRequires: {{ py3('os-win') }} BuildRequires: {{ py3('oslo.config') }} BuildRequires: {{ py3('oslo.db') }} BuildRequires: {{ py3('oslo.i18n') }} @@ -126,7 +125,6 @@ Requires: {{ py3('lxml') }} Requires: {{ py3('python-novaclient') }} Requires: {{ py3('oauth2client') }} Requires: {{ py3('os-brick') }} -Requires: {{ py3('os-win') }} Requires: {{ py3('oslo.concurrency') }} Requires: {{ py3('oslo.config') }} Requires: {{ py3('oslo.context') }} diff --git a/openstack/designate/designate.spec.j2 b/openstack/designate/designate.spec.j2 index b3dbd4ae8..c2f9609e5 100644 --- a/openstack/designate/designate.spec.j2 +++ b/openstack/designate/designate.spec.j2 @@ -97,7 +97,6 @@ Requires: {{ py3('keystonemiddleware') }} Requires: {{ py3('monasca-statsd') }} Requires: {{ py3('netaddr') }} Requires: {{ py3('python-neutronclient') }} -Requires: {{ py3('os-win') }} Requires: {{ py3('oslo.concurrency') }} Requires: {{ py3('oslo.config') }} Requires: {{ py3('oslo.context') }} diff --git a/openstack/nova/nova.spec.j2 b/openstack/nova/nova.spec.j2 index ac00ef79d..604a5c289 100644 --- a/openstack/nova/nova.spec.j2 +++ b/openstack/nova/nova.spec.j2 @@ -53,7 +53,6 @@ BuildRequires: {{ py3('os-resource-classes') }} BuildRequires: {{ py3('os-service-types') }} BuildRequires: {{ py3('os-traits') }} BuildRequires: {{ py3('os-vif') }} -BuildRequires: {{ py3('os-win') }} BuildRequires: {{ py3('oslo.cache') }} BuildRequires: {{ py3('oslo.concurrency') }} BuildRequires: {{ py3('oslo.config') }} @@ -149,7 +148,6 @@ Requires: {{ py3('os-brick') }} Requires: {{ py3('os-resource-classes') }} Requires: {{ py3('os-service-types') }} Requires: {{ py3('os-vif') }} -Requires: {{ py3('os-win') }} Requires: {{ py3('oslo.cache') }} Requires: {{ py3('oslo.concurrency') }} Requires: {{ py3('oslo.config') }} diff --git a/openstack/os-brick/os-brick.spec.j2 b/openstack/os-brick/os-brick.spec.j2 index 0e6270217..c3be7602a 100644 --- a/openstack/os-brick/os-brick.spec.j2 +++ b/openstack/os-brick/os-brick.spec.j2 @@ -17,7 +17,6 @@ BuildRequires: {{ py3('Babel') }} BuildRequires: {{ py3('castellan') }} BuildRequires: {{ py3('ddt') }} BuildRequires: {{ py3('eventlet') }} -BuildRequires: {{ py3('os-win') }} BuildRequires: {{ py3('oslo.concurrency') }} BuildRequires: {{ py3('oslo.i18n') }} BuildRequires: {{ py3('oslo.log') }} @@ -48,7 +47,6 @@ Summary: OpenStack Cinder brick library for managing local volume attache Requires: %{oldpython}-os-brick-common Requires: {{ py3('Babel') }} Requires: {{ py3('eventlet') }} -Requires: {{ py3('os-win') }} Requires: {{ py3('oslo.concurrency') }} Requires: {{ py3('oslo.i18n') }} Requires: {{ py3('oslo.log') }} diff --git a/openstack/os-win/os-win.spec.j2 b/openstack/os-win/os-win.spec.j2 deleted file mode 100644 index 3ac936a00..000000000 --- a/openstack/os-win/os-win.spec.j2 +++ /dev/null @@ -1,92 +0,0 @@ -{% set pypi_name = 'os-win' %} -{% set upstream_version = upstream_version('5.8.0') %} -{% set rpm_release = '0' %} -{% set source = url_pypi() %} - -Name: {{ py2name('os-win') }} -Epoch: {{ epoch('os-win') }} -Version: {{ py2rpmversion() }} -Release: {{ py2rpmrelease() }} -Summary: Hyper-V library for OpenStack projects -License: {{ license('Apache-2.0') }} -Group: Development/Languages/Python -URL: https://docs.openstack.org/{{ pypi_name }} -Source0: {{ source }} -BuildRequires: openstack-macros -BuildRequires: {{ py3('Sphinx') }} -BuildRequires: {{ py3('ddt') }} -BuildRequires: {{ py3('devel') }} -BuildRequires: {{ py3('eventlet') }} -BuildRequires: {{ py3('oslo.concurrency') }} -BuildRequires: {{ py3('oslo.i18n') }} -BuildRequires: {{ py3('oslo.log') }} -BuildRequires: {{ py3('oslotest') }} -BuildRequires: {{ py3('pbr') }} -BuildRequires: {{ py3('reno') }} -BuildRequires: {{ py3('stestr') }} -BuildRequires: {{ py3('testscenarios') }} -BuildRequires: {{ py3('testtools') }} -BuildArch: noarch - -%description -Library contains Windows / Hyper-V code commonly used in the OpenStack projects: -nova, cinder, networking-hyperv. - -%package -n {{ py2name(py_versions='py3') }} -Summary: Hyper-V library for OpenStack projects -Requires: {{ py3('Babel') }} -Requires: {{ py3('eventlet') }} -Requires: {{ py3('oslo.concurrency') }} -Requires: {{ py3('oslo.config') }} -Requires: {{ py3('oslo.i18n') }} -Requires: {{ py3('oslo.log') }} -Requires: {{ py3('oslo.service') }} -Requires: {{ py3('oslo.utils') }} -Requires: {{ py3('pbr') }} - -%description -n {{ py2name(py_versions='py3') }} -Library contains Windows / Hyper-V code commonly used in the OpenStack projects: -nova, cinder, networking-hyperv. - -%package -n {{ py2name() }}-doc -Summary: Documentation for OpenStack Windows/Hyper-V Library -Group: Documentation/HTML -BuildRequires: {{ py3('Sphinx') }} -BuildRequires: {{ py3('openstackdocstheme') }} - -%description -n {{ py2name() }}-doc -Documentation for the Hyper-V library. - -%prep -%autosetup -n {{ pypi_name }}-{{ upstream_version }} -%py_req_cleanup -# we don't want to run the hacking tests again (and don't want the needed deps) -rm -f os_win/tests/unit/test_hacking.py - -%build -%{py3_build} - -PBR_VERSION=%{version} %sphinx_build -b html doc/source doc/build/html -PBR_VERSION=%{version} %sphinx_build -b man doc/source doc/build/man -rm -rf doc/build/html/.{doctrees,buildinfo} -rm -rf doc/build/man/.{doctrees,buildinfo} - -%install -%{py3_install} -install -p -D -m 644 doc/build/man/os-win.1 %{buildroot}/%{_mandir}/man1/os-win.1 - -%check -%{openstack_stestr_run} - -%files -n {{ py2name(py_versions='py3') }} -%doc README.rst ChangeLog -%license LICENSE -%{python3_sitelib}/os_win* -%{python3_sitelib}/*.egg-info -%{_mandir}/man1/os-win.1* - -%files -n {{ py2name() }}-doc -%doc doc/build/html -%license LICENSE - -%changelog diff --git a/openstack/oswin-tempest-plugin/oswin-tempest-plugin.spec.j2 b/openstack/oswin-tempest-plugin/oswin-tempest-plugin.spec.j2 deleted file mode 100644 index 13549bd4a..000000000 --- a/openstack/oswin-tempest-plugin/oswin-tempest-plugin.spec.j2 +++ /dev/null @@ -1,44 +0,0 @@ -{% set pypi_name = 'oswin-tempest-plugin' %} -{% set source = fetch_source('https://tarballs.openstack.org/oswin-tempest-plugin/oswin-tempest-plugin-master.tar.gz') %} -{% set upstream_version = upstream_version() %} -{% set rpm_release = '1' %} - -Name: {{ py2name(py_versions='py3') }} -Version: {{ py2rpmversion() }} -Release: {{ py2rpmrelease() }} -Summary: Tempest plugin for the os-win project -License: {{ license('Apache-2.0') }} -Group: Development/Languages/Python -URL: https://docs.openstack.org/{{ pypi_name }} -Source0: {{ source|basename }} -BuildRequires: openstack-macros -BuildRequires: {{ py3('pbr') }} -Requires: {{ py2pkg('tempest') }} -Requires: {{ py3('oslo.config') }} -Requires: {{ py3('oslo.log') }} -Requires: {{ py3('oslo.utils') }} -Requires: {{ py3('pbr') }} -BuildArch: noarch - -%description -This package contains Tempest tests to cover the os-win project. -Additionally it provides a plugin to automatically load these tests into Tempest. - -%prep -%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }} -%py_req_cleanup - -%build -%{py3_build} - -%install -%{py3_install} - -%files -%license LICENSE -%doc README.rst -%{python3_sitelib}/oswin_tempest_plugin -%{python3_sitelib}/*.egg-info - -%changelog -