Skip to content
Snippets Groups Projects
Verified Commit 21cf3531 authored by Duncan Macleod's avatar Duncan Macleod :flag_scotland:
Browse files

added runtime dependency on setuptools

since we use setuptools-style namespace packages (for now)
updated for 1.0.4
parent eaa8b14e
No related branches found
No related tags found
1 merge request!10Added missing setuptools runtime dependency
ligo-common (1.0.4-1) unstable; urgency=low
* Added missing setuptools dependency
-- Duncan Macleod <duncan.macleod@ligo.org> Fri, 15 Feb 2019 08:21:00 -0000
ligo-common (1.0.3-1) unstable; urgency=low
* Packaging update, mainly for EPEL7.
......
......@@ -9,12 +9,12 @@ X-Python3-Version: >= 3.4
Package: python-ligo-common
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}
Depends: ${misc:Depends}, ${python:Depends}, python-setuptools
Description: Common package for LIGO Python libs
Common packackage for LIGO Python libraries
Package: python3-ligo-common
Architecture: all
Depends: ${misc:Depends}, ${python3:Depends}
Depends: ${misc:Depends}, ${python3:Depends}, python3-setuptools
Description: Common package for LIGO Python 3 libs
Common packackage for LIGO Python 3 libraries
%define name ligo-common
%define version 1.0.3
%define unmangled_version 1.0.3
%define release 3
%define version 1.0.4
%define release 1
Summary: Empty LIGO modules
Name: %{name}
Version: %{version}
Release: %{release}%{?dist}
Source0: %{name}-%{unmangled_version}.tar.gz
Source0: %{name}-%{version}.tar.gz
License: GPL
Group: Development/Libraries
Prefix: %{_prefix}
BuildArch: noarch
BuildRequires: rpm-build
BuildRequires: epel-rpm-macros
BuildRequires: python-rpm-macros
BuildRequires: python2-rpm-macros
BuildRequires: python3-rpm-macros
BuildRequires: python-setuptools
BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python%{python3_version_nodots}-setuptools
Vendor: Duncan Macleod <duncan.macleod@ligo.org>
%description
......@@ -31,6 +30,7 @@ Provides: %{name}
Conflicts: %{name}
Summary: %{summary}
Requires: python
Requires: python-setuptools
%{?python_provide:%python_provide python2-%{name}}
......@@ -39,19 +39,20 @@ Empty module placeholder for other LIGO modules
# -- python3X-ligo-common
%package -n python%{python3_pkgversion}-%{name}
%package -n python%{python3_version_nodots}-%{name}
Summary: %{summary}
Requires: python%{python3_pkgversion}
Requires: python%{python3_version_nodots}
Requires: python%{python3_version_nodots}-setuptools
%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
%{?python_provide:%python_provide python%{python3_version_nodots}-%{name}}
%description -n python%{python3_pkgversion}-%{name}
%description -n python%{python3_version_nodots}-%{name}
Empty module placeholder for other LIGO modules
# -- build steps
%prep
%setup -n %{name}-%{unmangled_version}
%setup -n %{name}-%{version}
%build
%py2_build
......@@ -75,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT
%{python2_sitelib}/*
%{python2_sitearch}/*
%files -n python%{python3_pkgversion}-%{name}
%files -n python%{python3_version_nodots}-%{name}
%license LICENSE
%{python3_sitelib}/*
%{python3_sitearch}/*
......@@ -83,5 +84,8 @@ rm -rf $RPM_BUILD_ROOT
# -- changelog
%changelog
* Fri May 11 2018 Duncan Macleod <duncan.macleod@ligo.org>
- 1.0.3: packaging update, provides python3 packages
* Fri Feb 15 2019 Duncan Macleod <duncan.macleod@ligo.org> - 1.0.4-1
- added missing setuptools runtime dependenncy
* Fri May 11 2018 Duncan Macleod <duncan.macleod@ligo.org> - 1.0.3-3
- packaging update, provides python3 packages
......@@ -16,7 +16,7 @@
from setuptools import setup
version = "1.0.3"
version = "1.0.4"
setup(
name="ligo-common",
......@@ -28,6 +28,9 @@ setup(
license='GPLv3',
provides=['ligo'],
packages=['ligo'],
setup_requires=['setuptools'],
install_requires=['setuptools'],
requires=['setuptools'],
classifiers=[
'Development Status :: 5 - Production/Stable',
'Programming Language :: Python',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment