diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0074bf4ae5f1676b24d77f00354149f294c1d871..019147874a46419e48c5a0d014a58c4b19521554 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,15 +103,16 @@ deploy:stretch: deploy:el7: stage: deploy - image: ligo/lalsuite-dev:el7 + image: ligo/base:el7 variables: GIT_STRATEGY: none before_script: - - yum install -y rpmlint + - yum install -y gcc make rpm-build rpmlint yum-utils script: - mkdir -p ~/rpmbuild/{SOURCES,SPECS} - tar -C ~/rpmbuild/SPECS -xf *.tar.* --strip-components 2 '*/etc/glue.spec' - mv *.tar.* ~/rpmbuild/SOURCES + - yum-builddep -y ~/rpmbuild/SPECS/*.spec - rpmbuild -ba ~/rpmbuild/SPECS/*.spec - mv $(find ~/rpmbuild/{RPMS,SPECS,SRPMS} -type f) . - rpmlint *.{rpm,spec} diff --git a/debian/control b/debian/control index 61493762c87ec02b539b896fee97209abdd5f0bb..dc15e8a7c6b418cd1cbcef0431ac57874fad84a0 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,10 @@ Homepage: https://www.lsc-group.phys.uwm.edu/daswg/projects/glue.html Build-Depends: debhelper (>= 9), python-all-dev, python3-all-dev, + python-matplotlib, + python3-matplotlib, + python-numpy, + python3-numpy, python-setuptools, python3-setuptools, python-kerberos, diff --git a/etc/glue.spec b/etc/glue.spec index 939f78d6177d322eaea622f21c7286f2755ebbfd..a2eaa26d73cbc2121a23eb5d6cec44948922934e 100644 --- a/etc/glue.spec +++ b/etc/glue.spec @@ -15,8 +15,8 @@ Group: Development/Libraries Source: lscsoft-%{name}-%{version}.tar.gz Url: http://www.lsc-group.phys.uwm.edu/daswg/projects/glue.html BuildRoot: %{_tmppath}/%{name}-%{version}-root -Requires: python-cjson pyOpenSSL python-six glue-common glue-segments glue-ligolw-tools python >= 2.6 -BuildRequires: python-devel, python-setuptools +Requires: python-cjson pyOpenSSL numpy python-six glue-common glue-segments glue-ligolw-tools python >= 2.7 +BuildRequires: python-devel python-setuptools python-matplotlib numpy python-six Prefix: %{_glue_prefix} %description Glue (Grid LSC User Environment) is a suite of python modules and programs to @@ -25,7 +25,7 @@ allow users to run LSC codes on the grid. %package common Summary: The common files needed for all sub-packages Group: Development/Libraries -Requires: python +Requires: python numpy python-six %description common This is for the files that are common across the glue subpackages, namely git_version, iterutils and __init__.py @@ -33,14 +33,14 @@ git_version, iterutils and __init__.py %package segments Summary: The segments subpackage Group: Development/Libraries -Requires: python glue-common +Requires: python numpy python-six glue-common %description segments This is for the segments subpackage, written by Kipp. %package ligolw-tools Summary: The Grid LSC User Environment XML tools Group: Development/Libraries -Requires: glue +Requires: glue numpy python-six %description ligolw-tools Selected XML tools @@ -58,6 +58,21 @@ rm -rf %{buildroot} --prefix=%{_glue_prefix} rm -rf $RPM_BUILD_ROOT/usr/lib64/python2.?/site-packages/glue-1.57.0-py2.?.egg-info +%check +PYTHONPATH="$RPM_BUILD_ROOT/usr/lib64/python2.7/site-packages" \ +make -C test \ + -o lal_verify \ + -o ligolw_sqlite_test \ + -o ligolw_test01 \ + -o ligolw_test03a \ + -o ligolw_test03b \ + -o ligolw_test03c \ + -o ligolw_test04 \ + -o test_ligolw_lsctables \ + -o test_ligolw_table \ + -o segmentsUtils_verify \ + -o test_ligolw_utils_segments + %clean rm -rf $RPM_BUILD_ROOT