Commit 0870672e authored by Sinead Walsh's avatar Sinead Walsh
Browse files

committing because merger error due to emacsclient

parents 8914e73f d2c40344
Pipeline #193744 failed with stages
in 23 minutes and 9 seconds
.dirstamp
.DS_Store
.vscode
*.dSYM
*.egg-info
*.swp
*.trs
*~
.DS_Store
.dirstamp
/Makefile
/Makefile.in
/wheel/Makefile.in
/_build/
/_inst/
/index.html
/lalsuite-*/
/lalsuiterc
TAGS
/Makefile
/Makefile.in
/wheel/*.whl
/wheel/build/
/wheel/destdir/
/wheel/Makefile
/wheel/Makefile.in
/wheel/setup.py
aclocal.m4
auto/
autom4te.cache/
......@@ -28,8 +33,4 @@ lalsuite-user-env.fish
lalsuite-user-env.sh
lalsuite-user-env.shell
tags
/wheel/build/
/wheel/destdir/
/wheel/Makefile
/wheel/setup.py
/wheel/*.whl
TAGS
......@@ -8,6 +8,7 @@ variables:
NIGHTLY: $CI_REGISTRY_IMAGE:nightly
TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
LAL_DIR: $CI_PROJECT_DIR/opt/lalsuite
CONDA_DIR: $CI_PROJECT_DIR/opt/conda
stages:
- level0
......@@ -167,7 +168,7 @@ docker:nightly:el7:
- rm -rf rpmbuild*
# build container and push to registry
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker build --pull -t $CI_REGISTRY_IMAGE/nightly:el7 --file .Dockerfile-el7.gitlab-ci .
- docker build --pull -t $CI_REGISTRY_IMAGE/nightly:el7 --file .gitlab-ci-el7.Dockerfile .
- docker push $CI_REGISTRY_IMAGE/nightly:el7
dependencies:
- level0:rpm:lal
......@@ -192,7 +193,7 @@ docker:tags:el7:
- rm -rf rpmbuild*
# build container and push to registry
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker build --pull -t $CI_REGISTRY_IMAGE/$CI_COMMIT_TAG:el7 --file .Dockerfile-el7.gitlab-ci .
- docker build --pull -t $CI_REGISTRY_IMAGE/$CI_COMMIT_TAG:el7 --file .gitlab-ci-el7.Dockerfile .
- docker push $CI_REGISTRY_IMAGE/$CI_COMMIT_TAG:el7
dependencies:
- level0:rpm:lal
......@@ -334,7 +335,7 @@ docker:nightly:stretch:
- rm *.changes *.dsc *.orig.*
# build container and push to registry
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker build --pull -t $CI_REGISTRY_IMAGE/nightly:stretch --file .Dockerfile-stretch.gitlab-ci .
- docker build --pull -t $CI_REGISTRY_IMAGE/nightly:stretch --file .gitlab-ci-stretch.Dockerfile .
- docker push $CI_REGISTRY_IMAGE/nightly:stretch
dependencies:
- level0:deb:lal
......@@ -359,7 +360,7 @@ docker:tags:stretch:
- rm *.changes *.dsc *.orig.*
# build container and push to registry
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker build --pull -t $CI_REGISTRY_IMAGE/$CI_COMMIT_TAG:stretch --file .Dockerfile-stretch.gitlab-ci .
- docker build --pull -t $CI_REGISTRY_IMAGE/$CI_COMMIT_TAG:stretch --file .gitlab-ci-stretch.Dockerfile .
- docker push $CI_REGISTRY_IMAGE/$CI_COMMIT_TAG:stretch
dependencies:
- level0:deb:lal
......@@ -380,79 +381,134 @@ docker:tags:stretch:
# compilers
nightly:clang:6:
image: skymoo/ligo-lalsuite-clang:6
.clang-build: &clang-build
stage: nightly
dependencies: []
script:
- ./00boot
- CC=clang-6.0 CXX=clang++-6.0 ./configure --enable-swig --enable-doxygen
- CC=${CLANG} CXX=${CLANGXX} ./configure --enable-swig --enable-doxygen
- make -j4 distcheck
dependencies: []
only:
- schedules
- web
nightly:clang:7:
<<: *clang-build
image: skymoo/ligo-lalsuite-clang:7
stage: nightly
script:
- ./00boot
- CC=clang-7 CXX=clang++-7 ./configure --enable-swig --enable-doxygen
- make -j4 distcheck
dependencies: []
only:
- schedules
- web
variables:
CLANG: clang-7
CLANGXX: clang++-7
nightly:clang:8:
<<: *clang-build
image: skymoo/ligo-lalsuite-clang:8
variables:
CLANG: clang-8
CLANGXX: clang++-8
nightly:clang:9:
<<: *clang-build
image: skymoo/ligo-lalsuite-clang:9
variables:
CLANG: clang-9
CLANGXX: clang++-9
.gcc-build: &gcc-build
stage: nightly
dependencies: []
script:
- ./00boot
- CC=clang-8 CXX=clang++-8 ./configure --enable-swig --enable-doxygen
- ./configure --enable-doxygen
- make -j4 distcheck
dependencies: []
only:
- schedules
- web
nightly:gcc:7:
<<: *gcc-build
image: skymoo/ligo-lalsuite-gcc:7
stage: nightly
script:
- ./00boot
- ./configure --enable-doxygen
- make -j4 distcheck
dependencies: []
only:
- schedules
- web
nightly:gcc:8:
<<: *gcc-build
image: skymoo/ligo-lalsuite-gcc:8
stage: nightly
script:
- ./00boot
- :./configure --enable-doxygen
- make -j4 distcheck
dependencies: []
only:
- schedules
- web
# debian
nightly:gcc:9:
<<: *gcc-build
image: skymoo/ligo-lalsuite-gcc:9
allow_failure: true
# conda
nightly:debian:jessie:
image: ligo/lalsuite-dev:jessie
# FIXME: currently using --disable-doxygen as documentation currently
# fails to build under Conda
# FIXME: currently using --disable-gcc-flags as there are various
# compilation errors when using the strict GCC flags and the Conda
# compiler
# FIXME: there currently seems to be an issue with performing FFTs using
# the MKL libraries, disable the use of MKL until this is understood
# https://git.ligo.org/lscsoft/lalsuite/issues/161
.conda-build: &conda-build
image: continuumio/miniconda3
variables:
CONDA_PKGS_DIRS: "${CI_PROJECT_DIR}/conda-pkgs"
stage: nightly
dependencies: []
before_script:
# determine conda environment
- PYVERSION=$(echo ${CI_JOB_NAME} | sed 's/conda:python//')
- CONDA_ENV_FILE="conda/environment-lal-development-py${PYVERSION}.yml"
# configure conda
- source /opt/conda/etc/profile.d/conda.sh
- conda config --set always_yes yes
- conda config --add channels conda-forge
- conda update conda
- conda info --all
# build lalsuite environment
- conda env create -f ${CONDA_ENV_FILE}
- conda activate lal-development
# hack the build to get LDFLAGS set properly
- export PREFIX="${CONDA_PREFIX}"
- export CONDA_BUILD="1"
- set +o pipefail # one of the deactivate scripts pipefails
- conda activate lal-development
- set -o pipefail
- conda list
script:
# build lalsuite
- ./00boot
- ./configure --enable-swig --enable-doxygen
- ./configure --disable-doxygen --disable-gcc-flags
- make -j4 distcheck
dependencies: []
only:
- schedules
- web
cache:
paths:
- conda-pkgs
artifacts:
paths:
- "config.log"
- "*/config.log"
- "*/test/test-suite.log"
- "*/*/*/*/test/test-suite.log"
when: on_failure
allow_failure: true
conda:python27:
<<: *conda-build
image: continuumio/miniconda2
conda:python36:
<<: *conda-build
image: continuumio/miniconda3
conda:python37:
<<: *conda-build
image: continuumio/miniconda3
# debian
# FIXME: Disable building of Octave SWIG bindings until SWIG-4.0.0 is
# available
......@@ -484,18 +540,6 @@ nightly:rhel:el7-cr:
- schedules
- web
nightly:rhel:sl7:
image: ligo/lalsuite-dev:sl7
stage: nightly
script:
- ./00boot
- ./configure --enable-swig --enable-doxygen
- make -j4 distcheck
dependencies: []
only:
- schedules
- web
# macOS
nightly:macos:highsierra:
......@@ -532,20 +576,6 @@ nightly:macos:sierra:
# ubuntu
# FIXME: allow failure due to #123
nightly:ubuntu:trusty:
image: skymoo/ligo-lalsuite-dev:trusty
stage: nightly
script:
- ./00boot
- ./configure --disable-swig --enable-doxygen
- make -j4 distcheck
dependencies: []
only:
- schedules
- web
allow_failure: true
# FIXME: allow failure due to #123
nightly:ubuntu:xenial:
image: skymoo/ligo-lalsuite-dev:xenial
......
# overall
* @adam-mercer @duncanmmacleod @karl-wette
# package-level owners
lal/ @adam-mercer @jolien-creighton
lalframe/ @adam-mercer @jolien-creighton @ed-maros
lalmetaio/ @adam-mercer @jolien-creighton
lalsimulation/ @riccardo-sturani @frank-ohme
lalburst/ @salvatore-vitale @ryan-lynch
lalpulsar/ @karl-wette @david-keitel
lalinspiral/ @jolien-creighton @adam-mercer
lalinference/ @bfarr @cjhaster @john-veitch @vivien
# lalapps
lalapps/src/findchirp/ @jolien-creighton @adam-mercer
lalapps/src/frametools/ @adam-mercer @jolien-creighton
lalapps/src/hwinjection/ @karl-wette @david-keitel
lalapps/src/inspiral/ @jolien-creighton @adam-mercer
lalapps/src/inspiral/posterior/ @bfarr @cjhaster @john-veitch @vivien
lalapps/src/lalapps/ @adam-mercer @jolien-creighton
lalapps/src/power/ @kipp.cannon @xavier.siemens
lalapps/src/pulsar/ @karl-wette @david-keitel
lalapps/src/string/ @kipp.cannon @florent-robinet @imene.belahcene @daichi.tsuna
# build / packaging / support files
.gitlab/ @adam-mercer @duncanmmacleod
conda/ @adam-mercer @duncanmmacleod
debian/ @adam-mercer @duncanmmacleod
docker/ @adam-mercer @duncanmmacleod
gnuscripts/ @adam-mercer @karl-wette @duncanmmacleod
*.spec.in @adam-mercer @duncanmmacleod
*.pc.in @adam-mercer @duncanmmacleod
.gitlab-ci.yml @adam-mercer @duncanmmacleod
.gitlab-*.Dockerfile @adam-mercer @duncanmmacleod
.mailmap* @adam-mercer @karl-wette
00boot @adam-mercer @karl-wette @duncanmmacleod
CONTRIBUTING.md @adam-mercer @duncanmmacleod
COPYING @adam-mercer @duncanmmacleod
Makefile.am @adam-mercer @karl-wette @duncanmmacleod
configure.ac @adam-mercer @karl-wette @duncanmmacleod
# SWIG bindings
swig/ @karl-wette @adam-mercer @duncanmmacleod
......@@ -30,6 +30,8 @@ Antony Searle <antony.searle@ligo.org>
Antony Searle <antony.searle@ligo.org> <acsearle>
Antony Searle <antony.searle@ligo.org> <acsearle@ligo.caltech.edu>
Anuradha Gupta <anuradha.gupta@ligo.org>
Anuradha Samajdar <anuradha.samajdar@ligo.org>
Anuradha Samajdar <anuradha.samajdar@ligo.org> <samajdaranuradha@gmail.com>
Archisman Ghosh <archisman.ghosh@ligo.org>
Archisman Ghosh <archisman.ghosh@ligo.org> <archisman.ghosh@icts.res.in>
B. S. Sathyaprakash <b.sathyaprakash@ligo.org>
......@@ -143,6 +145,8 @@ Duncan Macleod <duncan.macleod@ligo.org>
Duncan Macleod <duncan.macleod@ligo.org> USER <USER@ligo.org>
Edward Daw <edward.daw@ligo.org>
Edward Daw <edward.daw@ligo.org> <edaw>
Edward Fauchon-Jones <edward.fauchon-jones@ligo.org>
Edward Fauchon-Jones <edward.fauchon-jones@ligo.org> <edward.fauchon.jones@gmail.com>
Eirini Messaritaki <emessarit>
Eliu Huerta <eliu.huerta@ligo.org>
Evan Goetz <evan.goetz@ligo.org>
......@@ -150,6 +154,7 @@ Evan Goetz <evan.goetz@ligo.org> <evang>
Evan Ochsner <evan.ochsner@ligo.org>
Evan Ochsner <evan.ochsner@ligo.org> <evano>
Florent Robinet <robinet@lal.in2p3.fr>
Frank Ohme <frank.ohme@ligo.org>
Frederique Marion <frederique.marion@ligo.org>
Frederique Marion <frederique.marion@ligo.org> <marionf>
Gareth Jones <gareth>
......@@ -158,6 +163,8 @@ Gergely Debreczeni <Gergely.Debreczeni@cern.ch>
Gregory Mendell <gregory.mendell@ligo.org>
Gregory Mendell <gregory.mendell@ligo.org> <gmendell>
Hannah Middleton <hannah.middleton@ligo.org>
Harald Pfeiffer <harald.pfeiffer@ligo.org>
Harald Pfeiffer <harald.pfeiffer@ligo.org> <pfeiffer@cita.utoronto.ca>
Heather Fong <heather.fong@ligo.org>
Heather Fong <heather.fong@ligo.org> <hthrfong@gmail.com>
Heinz-Bernd Eggenstein <heinz-bernd.eggenstein@ligo.org>
......@@ -222,6 +229,7 @@ Larry Price <larry.price@ligo.org> <larry>
Larry Price <larry.price@ligo.org> <larry@ldas-pcdev1.ligo.caltech.edu>
Leo Singer <leo.singer@ligo.org>
Leo Singer <leo.singer@ligo.org> <leo.singer@nasa.gov>
Ling Sun <ling.sun@ligo.org>
Lisa Goggin <lisa.goggin@ligo.org>
Lisa Goggin <lisa.goggin@ligo.org> <lgoggin>
Llucia Sancho de la Jordana <llucia>
......@@ -288,6 +296,7 @@ Reinhard Prix <reinhard.prix@ligo.org>
Reinhard Prix <reinhard.prix@ligo.org> <Reinhard.Prix@ligo.org>
Reinhard Prix <reinhard.prix@ligo.org> <ghf@gco-fe1.(none)>
Reinhard Prix <reinhard.prix@ligo.org> <reinhard>
Reinhard Prix <reinhard.prix@ligo.org> <reinhard.prix@aei.mpg.de>
Reinhard Prix <reinhard.prix@ligo.org> <repr@atlas5.atlas.local>
Rejean Dupuis <rejean@caltech.edu>
Rejean Dupuis <rejean@caltech.edu> <rejean>
......
......@@ -31,6 +31,8 @@ while (<IN>) {
}
close IN;
my @mailmap;
foreach my $pname (sort { $a cmp $b } keys(%name2mails)) {
my $pname2mail = lc($pname);
......@@ -49,14 +51,20 @@ foreach my $pname (sort { $a cmp $b } keys(%name2mails)) {
next unless keys(%{$name2mails{$pname}}) > 1 || $name2mails{$pname}->{$pmail} <= 0;
print "$pname <$pmail>\n";
push @mailmap, "$pname <$pmail>";
foreach my $mail (sort { $a cmp $b } keys(%{$name2mails{$pname}})) {
next if $mail eq $pmail;
if ($cmail2cname{$mail} ne "") {
print "$pname <$pmail> $cmail2cname{$mail} <$mail>\n";
push @mailmap, "$pname <$pmail> $cmail2cname{$mail} <$mail>";
} else {
print "$pname <$pmail> <$mail>\n";
push @mailmap, "$pname <$pmail> <$mail>";
}
}
}
open OUT, ">.mailmap" or die $!;
foreach my $line (@mailmap) {
print OUT "$line\n";
}
close OUT;
......@@ -4,7 +4,12 @@ This page outlines the recommended procedure for contributing changes to the LAL
## Reporting Issues
When reporting issues, please include as much detail as possible to reproduce the error, including information about your operating system and the version of each (relevant) component of LALSuite.
If you have ligo.org authentication, please report issues directly through gitlab.
Otherwise, you can use the service desk address
contact+lscsoft-lalsuite-1438-issue-@support.ligo.org
to send bug reports by e-mail.
In either case, please include as much detail as possible to reproduce the error, including information about your operating system and the version of each (relevant) component of LALSuite.
If possible, please include a brief, self-contained code example that demonstrates the problem.
## Contributing code
......@@ -129,8 +134,8 @@ A feature branch should *not* be repurposed for further development as this can
### Special case: CW codes in LALPulsar and LALApps
For the continuous-wave (CW) related codes in the `lalpulsar/` and `lalapps/src/pulsar` directories,
issues should preferentially be reported [in the CW fork tracker](https://git.ligo.org/CW/lalsuite/issues).
Branches in that fork can also be used for short-term development, please also see the special contributing guide [here](https://git.ligo.org/CW/lalsuite/wikis/contributing).
issues should preferentially be reported [in the CW fork tracker](https://git.ligo.org/CW/software/lalsuite/issues).
Branches in that fork can also be used for short-term development, please also see the special contributing guide [here](https://git.ligo.org/CW/software/lalsuite/wikis/contributing).
## More Information
......
......@@ -76,4 +76,4 @@ Please visit the [LALSuite project page][project].
[nightlydocs]: https://lscsoft.docs.ligo.org/lalsuite
[oldlalsuite]: https://git.ligo.org/lscsoft/lalsuite-archive
[oldredmine]: https://bugs.ligo.org/redmine/projects/lalsuite
[project]: https://wiki.ligo.org/Computing/DASWG/LALSuite
[project]: https://wiki.ligo.org/Computing/LALSuite
name: lal-development
channels:
- conda-forge
dependencies:
- autoconf
- automake = 1.15
- bc
- cfitsio
- chealpix
- clang_osx-64
- doxygen
- fftw
- gsl
- h5py
- hdf5
- healpy
- ldas-tools-framecpp
- libframe
- ligo-segments
- lscsoft-glue
- make
- metaio
- numpy
- pkg-config
- pytest
- python = 2.7
- scipy
- six
- swig >= 3.0.12
- texlive-core
- zlib
name: lal-development
channels:
- conda-forge
dependencies:
- autoconf
- automake = 1.15
- bc
- cfitsio
- chealpix
- clang_osx-64
- doxygen
- fftw
- gsl
- h5py
- hdf5
- healpy
- ldas-tools-framecpp
- libframe
- ligo-segments
- lscsoft-glue
- make
- metaio
- numpy
- pkg-config
- pytest
- python = 3.6
- scipy
- six
- swig >= 3.0.12
- texlive-core
- zlib
name: lal-development
channels:
- conda-forge
dependencies:
- autoconf
- automake = 1.15
- bc
- cfitsio
- chealpix
- clang_osx-64
- doxygen
- fftw
- gsl
- h5py
- hdf5
- healpy
- ldas-tools-framecpp
- libframe
- ligo-segments
- lscsoft-glue
- make
- metaio
- numpy
- pkg-config
- pytest
- python = 3.7
- scipy
- six
- swig >= 3.0.12
- texlive-core
- zlib
name: lal-development
channels:
- conda-forge
dependencies:
- autoconf
- automake = 1.15
- bc
- cfitsio
- chealpix
- doxygen
- fftw
- gcc_linux-64
- gsl
- h5py
- hdf5
- healpy
- ldas-tools-framecpp
- libframe
- ligo-segments
- lscsoft-glue
- make
- metaio
- numpy
- pkg-config
- pytest
- python = 2.7
- scipy
- six
- swig >= 3.0.12
- texlive-core
- zlib
name: lal-development
channels:
- conda-forge
dependencies:
- autoconf
- automake = 1.15
- bc
- cfitsio
- chealpix
- doxygen
- fftw
- gcc_linux-64
- gsl
- h5py
- hdf5
- healpy
- ldas-tools-framecpp
- libframe
- ligo-segments
- lscsoft-glue
- make
- metaio