Commit e3e2bc99 authored by Ryan Fisher's avatar Ryan Fisher
Browse files

Merge branch 'spec-package-names' into 'master'

Update RPM package names

See merge request !67
parents 2d1ebe55 45b3dc0a
Pipeline #105633 failed with stages
in 47 seconds
...@@ -88,7 +88,7 @@ package:stretch: ...@@ -88,7 +88,7 @@ package:stretch:
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
before_script: before_script:
- yum install -y yum-utils rpm-build python34 python3-rpm-macros rpmlint - yum install -y yum-utils rpm-build rpmlint epel-rpm-macros
script: script:
# prep # prep
- mkdir -p ~/rpmbuild/{SOURCES,SPECS} - mkdir -p ~/rpmbuild/{SOURCES,SPECS}
...@@ -144,7 +144,7 @@ test:python3.7: ...@@ -144,7 +144,7 @@ test:python3.7:
<<: *test <<: *test
image: python:3.7 image: python:3.7
test:el7: test:el7:python2:
stage: test stage: test
image: ligo/lalsuite-dev:el7 image: ligo/lalsuite-dev:el7
dependencies: dependencies:
...@@ -154,10 +154,29 @@ test:el7: ...@@ -154,10 +154,29 @@ test:el7:
GIT_STRATEGY: none GIT_STRATEGY: none
script: script:
# install glue # install glue
- yum -y -q --nogpgcheck localinstall glue*.el7.x86_64.rpm - yum -y --nogpgcheck localinstall python2-*glue*.rpm
# install lal
- yum -y --nogpgcheck localinstall python2-lal
# extract and run the tests # extract and run the tests
- tar -xf *.tar.* --strip-components 1 lscsoft-glue*/test - tar -xf *.tar.* --strip-components 1 lscsoft-glue*/test
- make -C test PYTHON=python - make -C test PYTHON=python2
test:el7:python3:
stage: test
image: ligo/lalsuite-dev:el7
dependencies:
- package:el7
- build:sdist
variables:
GIT_STRATEGY: none
script:
# install glue
- yum -y --nogpgcheck localinstall python3*glue*.rpm
# install lal
- yum -y install python3-lal
# extract and run the tests
- tar -xf *.tar.* --strip-components 1 lscsoft-glue*/test
- make -C test PYTHON=python3
test:stretch:python2: test:stretch:python2:
stage: test stage: test
...@@ -195,7 +214,7 @@ test:stretch:python3: ...@@ -195,7 +214,7 @@ test:stretch:python3:
docs: docs:
stage: docs stage: docs
image: python image: python:3.7
variables: variables:
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
before_script: before_script:
......
Name: glue Name: glue
Summary: The Grid LSC User Environment Summary: The Grid LSC User Environment
Version: 2.0.0 Version: 2.0.0
Release: 1%{?dist} Release: 3%{?dist}
License: GPLv2+ Packager: Duncan Macleod <duncan.macleod@ligo.org>
Group: Development/Libraries
Source: lscsoft-%{name}-%{version}.tar.gz License: GPLv2+
Url: http://www.lsc-group.phys.uwm.edu/daswg/projects/glue.html Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-root Source0: http://software.ligo.org/lscsoft/source/lscsoft-%{name}-%{version}.tar.gz
Requires: python-cjson pyOpenSSL numpy python-six glue-common python >= 2.7 Url: https://lscsoft.docs.ligo.org/glue/
# build requirements # build requirements
BuildRequires: gcc BuildRequires: gcc
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
BuildRequires: python2-rpm-macros BuildRequires: python2-rpm-macros
BuildRequires: python3-rpm-macros BuildRequires: python3-rpm-macros
BuildRequires: epel-rpm-macros
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: python-setuptools BuildRequires: python-setuptools
BuildRequires: python%{python3_version_nodots}-devel BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_version_nodots}-setuptools BuildRequires: python%{python3_pkgversion}-setuptools
# testing requirements # testing requirements
BuildRequires: make BuildRequires: make
BuildRequires: python-matplotlib
BuildRequires: numpy BuildRequires: numpy
BuildRequires: python-six
BuildRequires: python2-ligo-segments BuildRequires: python2-ligo-segments
BuildRequires: python%{python3_version_nodots}-numpy BuildRequires: python2-matplotlib
BuildRequires: python%{python3_version_nodots}-six BuildRequires: python2-six
BuildRequires: python%{python3_version_nodots}-ligo-segments BuildRequires: python%{python3_pkgversion}-matplotlib
BuildRequires: python%{python3_pkgversion}-numpy
BuildRequires: python%{python3_pkgversion}-six
BuildRequires: python%{python3_pkgversion}-ligo-segments
Prefix: %{_exec_prefix}
%description %description
Glue (Grid LSC User Environment) is a suite of python modules and programs to Glue (Grid LSC User Environment) is a suite of python modules and programs to
allow users to run LSC codes on the grid. allow users to run LSC codes on the grid.
%package -n python%{python3_version_nodots}-glue # -- python2 ----------------
Summary: The Grid LSC User Environment
Group: Development/Libraries %package -n python2-%{name}-common
Requires: python%{python3_version_nodots} Summary: The common files needed for all glue sub-packages
Requires: python%{python3_version_nodots}-numpy Requires: numpy
Requires: python%{python3_version_nodots}-six Requires: python
Requires: python%{python3_version_nodots}-glue-common Requires: python2-six
%{?python_provide:%python_provide python%{python3_version_nodots}-glue} Provides: %{name}-common = %{version}-%{release}
%description -n python%{python3_version_nodots}-glue %{?python_provide:%python_provide python2-%{name}}
%description -n python2-%{name}-common
Glue (Grid LSC User Environment) is a suite of python modules and programs to Glue (Grid LSC User Environment) is a suite of python modules and programs to
allow users to run LSC codes on the grid. allow users to run LSC codes on the grid.
This packages provides the modules that are common across the glue subpackages,
%package common namely git_version, iterutils and __init__.py, for Python %{python2_version}.
Summary: The common files needed for all sub-packages
Group: Development/Libraries %package -n python2-%{name}
Requires: python numpy python-six Summary: The Grid LSC User Environment
%description common Requires: python
Requires: numpy
Requires: python2-%{name}-common
Requires: python2-ligo-segments
Requires: python2-six
Provides: %{name} = %{version}-%{release}
%{?python_provide:%python_provide python2-%{name}}
%description -n python2-%{name}
Glue (Grid LSC User Environment) is a suite of python modules and programs to
allow users to run LSC codes on the grid.
This package provides the full Python %{python2_version} library.
# -- python3 ----------------
%package -n python%{python3_pkgversion}-%{name}
Summary: The Grid LSC User Environment
Requires: python%{python3_pkgversion}
Requires: python%{python3_pkgversion}-numpy
Requires: python%{python3_pkgversion}-six
Requires: python%{python3_pkgversion}-%{name}-common
%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
%description -n python%{python3_pkgversion}-%{name}
Glue (Grid LSC User Environment) is a suite of python modules and programs to
allow users to run LSC codes on the grid.
This package provides the full Python %{python3_version} library.
%package -n python%{python3_pkgversion}-%{name}-common
Summary: The common files needed for all glue sub-packages
Requires: python%{python3_pkgversion}
Requires: python%{python3_pkgversion}-numpy
Requires: python%{python3_pkgversion}-six
%description -n python%{python3_pkgversion}-%{name}-common
This is for the files that are common across the glue subpackages, namely This is for the files that are common across the glue subpackages, namely
git_version, iterutils and __init__.py git_version, iterutils and __init__.py
%package -n python%{python3_version_nodots}-glue-common # -- build ------------------
Summary: The common files needed for all sub-packages
Group: Development/Libraries
Requires: python%{python3_version_nodots}
Requires: python%{python3_version_nodots}-numpy
Requires: python%{python3_version_nodots}-six
%description -n python%{python3_version_nodots}-glue-common
This is for the files that are common across the glue subpackages, namely
git_version, iterutils and __init__.py
%prep %prep
%setup -n lscsoft-%{name}-%{version} %autosetup -n lscsoft-%{name}-%{version}
%build %build
%py3_build
%py2_build %py2_build
%py3_build
%install %install
%py2_install
%py3_install %py3_install
%py2_install
%check %check
PYTHONPATH="${RPM_BUILD_ROOT}%{python2_sitearch}" \ PYTHONPATH="%{buildroot}%{python2_sitearch}" \
PYTHON=%{__python2} \ PYTHON=%{__python2} \
PATH=${RPM_BUILD_ROOT}%{_bindir}:${PATH} \ PATH=%{buildroot}%{_bindir}:${PATH} \
make -C test \ make -C test \
-o lal_verify \ -o lal_verify \
-o ligolw_test01 \ -o ligolw_test01 \
-o test_ligolw_lsctables \ -o test_ligolw_lsctables \
-o test_ligolw_table \ -o test_ligolw_table \
-o test_ligolw_utils_segments -o test_ligolw_utils_segments
PYTHONPATH="${RPM_BUILD_ROOT}%{python3_sitearch}" \ PYTHONPATH="%{buildroot}%{python3_sitearch}" \
PYTHON=%{__python3} \ PYTHON=%{__python3} \
make -C test \ make -C test \
-o iterutils_verify \
-o lal_verify \ -o lal_verify \
-o ligolw_test01 \ -o ligolw_test01 \
-o test_ligolw_lsctables \ -o test_ligolw_lsctables \
...@@ -98,55 +122,51 @@ make -C test \ ...@@ -98,55 +122,51 @@ make -C test \
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%files # -- files ------------------
%defattr(-,root,root)
%files -n python2-%{name}-common
%license LICENSE
%{python2_sitearch}/glue/__init__.py*
%{python2_sitearch}/glue/iterutils.py*
%{python2_sitearch}/glue/git_version.py*
%files -n python2-%{name}
%license LICENSE %license LICENSE
%{_bindir}/*
%{python2_sitearch}/lscsoft_glue-*.egg-info/ %{python2_sitearch}/lscsoft_glue-*.egg-info/
%{python2_sitearch}/glue/ %{python2_sitearch}/glue/
%{_bindir}/*
%exclude %{_exec_prefix}/etc/ %exclude %{_exec_prefix}/etc/
%exclude %{_exec_prefix}/var/ %exclude %{_exec_prefix}/var/
%exclude %{python2_sitearch}/glue/__init__.py* %exclude %{python2_sitearch}/glue/__init__.py*
%exclude %{python2_sitearch}/glue/iterutils.py* %exclude %{python2_sitearch}/glue/iterutils.py*
%exclude %{python2_sitearch}/glue/git_version.py* %exclude %{python2_sitearch}/glue/git_version.py*
#%exclude %{_exec_prefix}/test/verifyutils.py
%files -n python%{python3_version_nodots}-glue %files -n python%{python3_pkgversion}-%{name}-common
%defattr(-,root,root) %license LICENSE
%{python3_sitearch}/glue/__init__.py
%{python3_sitearch}/glue/__pycache__/__init__.*
%{python3_sitearch}/glue/iterutils.py
%{python3_sitearch}/glue/__pycache__/iterutils.*
%{python3_sitearch}/glue/git_version.py
%{python3_sitearch}/glue/__pycache__/git_version.*
%files -n python%{python3_pkgversion}-%{name}
%license LICENSE %license LICENSE
%{python3_sitearch}/lscsoft_glue-*.egg-info/ %{python3_sitearch}/lscsoft_glue-*.egg-info/
%{python3_sitearch}/glue/ %{python3_sitearch}/glue/
%exclude %{_bindir}/
%exclude %{_exec_prefix}/etc/
%exclude %{_exec_prefix}/var/
%exclude %{python3_sitearch}/glue/__init__.py %exclude %{python3_sitearch}/glue/__init__.py
%exclude %{python3_sitearch}/glue/__pycache__/__init__.cpython-%{python3_version_nodots}.py? %exclude %{python3_sitearch}/glue/__pycache__/__init__.*
%exclude %{python3_sitearch}/glue/__pycache__/segments.cpython-%{python3_version_nodots}.py?
%exclude %{python3_sitearch}/glue/iterutils.py %exclude %{python3_sitearch}/glue/iterutils.py
%exclude %{python3_sitearch}/glue/__pycache__/iterutils.cpython-%{python3_version_nodots}.py? %exclude %{python3_sitearch}/glue/__pycache__/iterutils.*
%exclude %{python3_sitearch}/glue/git_version.py %exclude %{python3_sitearch}/glue/git_version.py
%exclude %{python3_sitearch}/glue/__pycache__/git_version.cpython-%{python3_version_nodots}.py? %exclude %{python3_sitearch}/glue/__pycache__/git_version.*
#%exclude %{_exec_prefix}/test/verifyutils.py
%files common # -- changelog --------------
%license LICENSE
%{python2_sitearch}/glue/__init__.py
%{python2_sitearch}/glue/__init__.pyc
%{python2_sitearch}/glue/iterutils.pyc
%{python2_sitearch}/glue/iterutils.py
%{python2_sitearch}/glue/git_version.py
%{python2_sitearch}/glue/git_version.pyc
%files -n python%{python3_version_nodots}-glue-common
%license LICENSE
%{python3_sitearch}/glue/__init__.py
%{python3_sitearch}/glue/__pycache__/__init__.cpython-%{python3_version_nodots}.pyc
%{python3_sitearch}/glue/iterutils.py
%{python3_sitearch}/glue/__pycache__/iterutils.cpython-%{python3_version_nodots}.pyc
%{python3_sitearch}/glue/git_version.py
%{python3_sitearch}/glue/__pycache__/git_version.cpython-%{python3_version_nodots}.pyc
%changelog %changelog
* Fri Dec 6 2019 Duncan Macleod <duncan.macleod@ligo.org> 2.0.0-3
- Rename packages according to EPEL naming conventions
* Wed Feb 20 2019 Ryan Fisher <rpfisher@syr.edu> * Wed Feb 20 2019 Ryan Fisher <rpfisher@syr.edu>
- Major version update with many changes and removal of segments subpackage. - Major version update with many changes and removal of segments subpackage.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment