Skip to content

Commit

Permalink
Merge pull request #1 from MuonColliderSoft/ILCSoft2.3.1
Browse files Browse the repository at this point in the history
WIP: Ilc soft2.3.1
  • Loading branch information
gianelle authored Feb 28, 2023
2 parents b8eb66b + 7cd4010 commit 3930088
Show file tree
Hide file tree
Showing 114 changed files with 2,391 additions and 618 deletions.
11 changes: 0 additions & 11 deletions .coveragerc

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,3 @@ six
mock>=2
pylint>=1.4.4
pytest>=4.6
pytest-cov>=2.2.0
coverage>=4.0.3
python-coveralls
ipython==5.3.0
24 changes: 24 additions & 0 deletions .github/workflows/python_unittests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: build

on: [push, pull_request]

jobs:
python-unittest:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
py_version: ['2.7.x', '3.7']
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.py_version }}
- name: Install requirements
run: pip install -r ${GITHUB_WORKSPACE}/.github/scripts/requirements.txt
- name: Run python unit tests
run: |
export PYTHONPATH=${GITHUB_WORKSPACE}:${PYTHONPATH}
echo $PYTHONPATH
export PYTEST_ADDOPTS=$PYTEST_ADDOPTS" -m 'not integration'"
py.test
4 changes: 0 additions & 4 deletions .travis-ci.d/run-unittests.sh

This file was deleted.

12 changes: 0 additions & 12 deletions .travis-ci.d/set-reportstyle.sh

This file was deleted.

13 changes: 0 additions & 13 deletions .travis.yml

This file was deleted.

3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ iLCInstall is distributed under the [GPLv3 License](http://www.gnu.org/licenses/
[![License](https://www.gnu.org/graphics/gplv3-127x51.png)](https://www.gnu.org/licenses/gpl-3.0.en.html)

[![Build Status](https://travis-ci.org/iLCSoft/iLCInstall.svg?branch=master)](https://travis-ci.org/iLCSoft/iLCInstall)
[![Coverage Status](https://coveralls.io/repos/github/iLCSoft/iLCInstall/badge.svg?branch=master)](https://coveralls.io/github/iLCSoft/iLCInstall?branch=master)

## Usage

Expand All @@ -29,7 +28,7 @@ If called without options a summary of the installation is displayed. Examples o

### Install the full ilc software tools + external dependencies on your local disk

* note that boost, mysql, java and cernlib installations are not supported in ilcinstall
* note that mysql and java and installations are not supported in ilcinstall
* this packages need to be installed on your system. Please change the paths to this packages in
* the file releases/v01-17-07/release-versions.py

Expand Down
2 changes: 1 addition & 1 deletion builds/release-ilcsoft-lcg.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import os, sys
# read package versions from external file
path_where_this_file_lives = os.path.dirname( config_file )
versions_file = os.path.join( path_where_this_file_lives, "release-versions-lcg.py" )
execfile( versions_file )
exec(compile(open(versions_file, "rb").read(), versions_file, "exec"))

ilcsoft_install_dir = ilcsoft_install_prefix

Expand Down
2 changes: 1 addition & 1 deletion builds/release-ilcsoft.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import os, sys
# read package versions from external file
path_where_this_file_lives = os.path.dirname( config_file )
versions_file = os.path.join( path_where_this_file_lives, "release-versions-HEAD.py" )
execfile( versions_file )
exec(compile(open(versions_file, "rb").read(), versions_file, "exec"))

ilcsoft_install_dir = ilcsoft_install_prefix

Expand Down
2 changes: 1 addition & 1 deletion builds/release-ilcsoft7.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import os, sys
# read package versions from external file
path_where_this_file_lives = os.path.dirname( config_file )
versions_file = os.path.join( path_where_this_file_lives, "release-versions-HEAD7.py" )
execfile( versions_file )
exec(compile(open(versions_file, "rb").read(), versions_file, "exec"))

ilcsoft_install_dir = ilcsoft_install_prefix

Expand Down
106 changes: 106 additions & 0 deletions doc/ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,109 @@
# v02-03-01

* 2022-12-21 Thomas Madlener ([PR#159](https://github.com/iLCSoft/iLCInstall/pull/159))
- Include latest version of packages
- LCIO v02-19
- Marlin v01-19
- ILCUtil v01-07
- MarlinTrkProcessors v02-12-02
- KiTrackMarlin v01-13-02
- MarlinUtil v01-17
- MarlinDD4hep v00-06-02
- MarlinReco v01-33-01
- ILDPerformance v01-11
- lcgeo v00-18
- podio v00-16-01
- EDM4hep v00-07-02

* 2022-12-07 Thomas Madlener ([PR#160](https://github.com/iLCSoft/iLCInstall/pull/160))
- Disable `PathFinder`, `MarlinTPC`, and `BBQ` packages from being installed by default, as they are no longer available from the DESY SVN server and have not yet been fully migrated to the DESY gitlab server.
- Fix tests to work with latest versions of `pytest`. The main reason is that starting with pytest 7.2.0(?) py.test.raises only works if py is also installed. Given https://github.com/pytest-dev/py/issues/288 it is probably easiest to just use pytest directly if possible.
- Fix a few escape sequence warnings in packages.

* 2022-10-20 Andre Sailer ([PR#158](https://github.com/iLCSoft/iLCInstall/pull/158))
- Make sure that `GIT_EXEC_PATH` is also present in `init_ilcsoft.sh` if it has been present in the build environment to ensure git is usable.

* 2022-08-24 Thomas Madlener ([PR#157](https://github.com/iLCSoft/iLCInstall/pull/157))
- Remove ILDConfig from installed packages again as it is installed separately in any case.

# v02-03

* 2022-08-17 Thomas Madlener ([PR#156](https://github.com/iLCSoft/iLCInstall/pull/156))
- Major upgrades to external software, most importantly **switching from python2 to python3**, and to newer version of gcc.
- Update all external software to latest available versions
- Include latest versions of iLCSoft packages
- CED v01-09-04
- MarlinFastJet v00-05-03
- MarlinReco v01-33
- lcgeo v00-16-08
- CEDViewer v01-19-01
- KalTest v02-05-01
- DDKalTest v01-07
- LCIO v02-17-01
- MarlinKinfitProcessors v00-05
- LCCD v01-05-01
- GEAR v01-09-01
- MarlinDD4hep v00-06-01
- MarlinUtil v01-16-02
- MarlinTrk v02-09-01
- MarlinTrkProcessors v02-12-01
- MarlinKinfit v00-06-01
- Overlay v00-22-04
- KiTrackMarlin v01-13-01
- ForwardTracking v01-14-01
- LCTuple v01-14
- ILDConfig v02-03
- Physsim v00-04-02

* 2022-06-29 Thomas Madlener ([PR#144](https://github.com/iLCSoft/iLCInstall/pull/144))
- Update versions of base installation
- Switch to using gcc and python from LCG_99 (i.e. gcc10 and python3)

* 2022-01-25 tmadlener ([PR#134](https://github.com/iLCSoft/iLCInstall/pull/134))
- migrate CI to github actions and run python unittests with python2 and python3.
- Remove coveralls instrumentation from CI

* 2022-01-18 Frank Gaede ([PR#152](https://github.com/iLCSoft/iLCInstall/pull/152))
- add EDM4hep and PODIO to HEAD releases

* 2022-01-18 Thomas Madlener ([PR#143](https://github.com/iLCSoft/iLCInstall/pull/143))
- Make `ilcsoft-install` work with python3. Most of the trivial changes are done via `2to3`. Some others that are necessary for this to work with both python2 and python3 are:
- Fixes to some (relative) imports
- Importing `getoutput` and `getstatusoutput` from the `subprocess` module if possible and only fallback to the `commands` module if it does not exist.
- Replace `execfile` with `exec`, `compile` and `open` combination.
- Some changes to the `Version` class to make it work with the much stricter comparison rules in python3.
- Fix installation of root 6.18/04 by pulling in the patched sources from git directly, instead of using the release tar ball. See: https://root-forum.cern.ch/t/problems-building-root-6-18-04-with-builtin-davix/44225

* 2022-01-17 Frank Gaede ([PR#150](https://github.com/iLCSoft/iLCInstall/pull/150))
- update versions in HEAD release scripts:
- geant4 11.0 root 6.24.06,...
-

* 2022-01-14 Frank Gaede ([PR#149](https://github.com/iLCSoft/iLCInstall/pull/149))
- add support for installing edm4hep and podio
- update macbookfg example install scripts

* 2022-01-14 Frank Gaede ([PR#148](https://github.com/iLCSoft/iLCInstall/pull/148))
- add support for (central) ubuntu installations w/ 20.04
- update download path for boost

# v02-02-03

* 2021-11-22 Thomas Madlener ([PR#147](https://github.com/iLCSoft/iLCInstall/pull/147))
- Update LCIO to v02-17
- Update MarlinReco to v01-32
- Update MarlinTrk to v02-09
- Update MarlinUtil to v01-16-01
- Update CEDViewer to v01-19
- Update LCTuple to v01-13
- Update ConformalTracking to v01-11
- Update MarlinTrkProcessors to v02-12
- Update Overlay to v00-22-03
- Update DDMarlinPandora to v00-12
- Update iLCUtil to v01-06-02
- Update lcgeo to v00-16-07
- Update LCFIPlus to v00-10-01

# v02-02-02

* 2021-06-15 Thomas Madlener ([PR#145](https://github.com/iLCSoft/iLCInstall/pull/145))
Expand Down
Loading

0 comments on commit 3930088

Please sign in to comment.