Merge branch 'python3_other' into 'master'

Added python3_other RPM definitions

See merge request !11

.gitlab-ci.yml

@@ -39,6 +39,7 @@ dist:tarball:
           yum-utils
           rpm-build
           python34
+          python36
           python3-rpm-macros
   script:
     - DIST_NAME=${CI_JOB_NAME#build:rhel:}

ligo-common.spec

 %define name ligo-common
 %define version 1.0.4
-%define release 1
+%define release 2
 
 Summary: Empty LIGO modules
 Name: %{name}
@@ -17,6 +17,7 @@ BuildRequires: python2-rpm-macros
 BuildRequires: python3-rpm-macros
 BuildRequires: python-setuptools
 BuildRequires: python%{python3_version_nodots}-setuptools
+BuildRequires: python%{python3_other_version_nodots}-setuptools
 Vendor: Duncan Macleod <duncan.macleod@ligo.org>
 
 %description
@@ -37,7 +38,7 @@ Requires: python-setuptools
 %description -n python2-%{name}
 Empty module placeholder for other LIGO modules
 
-# -- python3X-ligo-common
+# -- python3a-ligo-common
 
 %package -n python%{python3_version_nodots}-%{name}
 Summary: %{summary}
@@ -49,6 +50,18 @@ Requires: python%{python3_version_nodots}-setuptools
 %description -n python%{python3_version_nodots}-%{name}
 Empty module placeholder for other LIGO modules
 
+# -- python3b-ligo-common
+
+%package -n python%{python3_other_version_nodots}-%{name}
+Summary: %{summary}
+Requires: python%{python3_other_version_nodots}
+Requires: python%{python3_other_version_nodots}-setuptools
+
+%{?python_provide:%python_provide python%{python3_other_version_nodots}-%{name}}
+
+%description -n python%{python3_other_version_nodots}-%{name}
+Empty module placeholder for other LIGO modules
+
 # -- build steps
 
 %prep
@@ -67,6 +80,10 @@ cp %{buildroot}/%{python2_sitelib}/ligo/__init__.py \
 mkdir -p %{buildroot}/%{python3_sitearch}/ligo/
 cp %{buildroot}/%{python3_sitelib}/ligo/__init__.py \
    %{buildroot}/%{python3_sitearch}/ligo/__init__.py
+%py3_other_install
+mkdir -p %{buildroot}/%{python3_other_sitearch}/ligo/
+cp %{buildroot}/%{python3_other_sitelib}/ligo/__init__.py \
+   %{buildroot}/%{python3_other_sitearch}/ligo/__init__.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -81,9 +98,17 @@ rm -rf $RPM_BUILD_ROOT
 %{python3_sitelib}/*
 %{python3_sitearch}/*
 
+%files -n python%{python3_other_version_nodots}-%{name}
+%license LICENSE
+%{python3_other_sitelib}/*
+%{python3_other_sitearch}/*
+
 # -- changelog
 
 %changelog
+* Fri Apr 24 2019 Duncan Macleod <duncan.macleod@ligo.org> - 1.0.4-2
+- added python3_other build for epel7
+
 * Fri Feb 15 2019 Duncan Macleod <duncan.macleod@ligo.org> - 1.0.4-1
 - added missing setuptools runtime dependenncy