Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
ligo-common
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
lscsoft
ligo-common
Commits
ef8992c4
Verified
Commit
ef8992c4
authored
5 years ago
by
Duncan Macleod
Browse files
Options
Downloads
Patches
Plain Diff
spec: added python3_other definitions
parent
f2cb6000
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!11
Added python3_other RPM definitions
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+1
-0
1 addition, 0 deletions
.gitlab-ci.yml
ligo-common.spec
+27
-2
27 additions, 2 deletions
ligo-common.spec
with
28 additions
and
2 deletions
.gitlab-ci.yml
+
1
−
0
View file @
ef8992c4
...
...
@@ -39,6 +39,7 @@ dist:tarball:
yum-utils
rpm-build
python34
python36
python3-rpm-macros
script
:
-
DIST_NAME=${CI_JOB_NAME#build:rhel:}
...
...
This diff is collapsed.
Click to expand it.
ligo-common.spec
+
27
−
2
View file @
ef8992c4
%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
# -- python3
X
-ligo-common
# -- python3
a
-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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment