Skip to content

Commit b13791e

Browse files
feat: Update PYTHIA to v8.308 (#21)
* Update PYTHIA to v8.308. * Add 'make check' to LHAPDF build. * Properly quote Bash string manipulation.
1 parent 16b3926 commit b13791e

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
password: ${{ secrets.DOCKER_PASSWORD }}
2323
repository: matthewfeickert/pythia-python
2424
dockerfile: Dockerfile
25-
tags: latest,pythia8.307,pythia8.307-hepmc2.06.11-fastjet3.4.0-python3.10
25+
tags: latest,pythia8.308,pythia8.308-hepmc2.06.11-fastjet3.4.0-python3.10
2626
- name: Build and Publish to Registry with Release Tag
2727
if: startsWith(github.ref, 'refs/tags/')
2828
uses: docker/build-push-action@v1
@@ -31,5 +31,5 @@ jobs:
3131
password: ${{ secrets.DOCKER_PASSWORD }}
3232
repository: matthewfeickert/pythia-python
3333
dockerfile: Dockerfile
34-
tags: latest,latest-stable,pythia8.307,pythia8.307-hepmc2.06.11-fastjet3.4.0-python3.10
34+
tags: latest,latest-stable,pythia8.308,pythia8.308-hepmc2.06.11-fastjet3.4.0-python3.10
3535
tag_with_ref: true

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ RUN mkdir /code && \
6262
./configure \
6363
--prefix=/usr/local/venv && \
6464
make -j$(nproc --ignore=1) && \
65+
make check && \
6566
make install && \
6667
rm -rf /code
6768

@@ -83,15 +84,15 @@ RUN mkdir /code && \
8384
rm -rf /code
8485

8586
# Install PYTHIA
86-
ARG PYTHIA_VERSION=8307
87+
ARG PYTHIA_VERSION=8308
8788
# PYTHON_VERSION already exists in the base image
8889
RUN mkdir /code && \
8990
cd /code && \
9091
wget --quiet "https://pythia.org/download/pythia${PYTHIA_VERSION:0:2}/pythia${PYTHIA_VERSION}.tgz" && \
9192
tar xvfz pythia${PYTHIA_VERSION}.tgz && \
9293
cd pythia${PYTHIA_VERSION} && \
9394
./configure --help && \
94-
export PYTHON_MINOR_VERSION=${PYTHON_VERSION%.*} && \
95+
export PYTHON_MINOR_VERSION="${PYTHON_VERSION%.*}" && \
9596
./configure \
9697
--prefix=/usr/local/venv \
9798
--arch=Linux \
@@ -106,7 +107,7 @@ RUN mkdir /code && \
106107
--with-python-include=/usr/local/include/python${PYTHON_MINOR_VERSION} \
107108
--cxx-common="-O2 -m64 -pedantic -W -Wall -Wshadow -fPIC -std=c++17" \
108109
--cxx-shared="-shared -std=c++17" && \
109-
make -j$(nproc --ignore=1) && \
110+
make --jobs $(nproc --ignore=1) && \
110111
make install && \
111112
rm -rf /code
112113

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ image:
99
--build-arg HEPMC_VERSION=2.06.11 \
1010
--build-arg LHAPDF_VERSION=6.5.3 \
1111
--build-arg FASTJET_VERSION=3.4.0 \
12-
--build-arg PYTHIA_VERSION=8307 \
13-
--tag matthewfeickert/pythia-python:pythia8.307 \
14-
--tag matthewfeickert/pythia-python:pythia8.307-hepmc2.06.11-fastjet3.4.0-python3.10 \
12+
--build-arg PYTHIA_VERSION=8308 \
13+
--tag matthewfeickert/pythia-python:pythia8.308 \
14+
--tag matthewfeickert/pythia-python:pythia8.308-hepmc2.06.11-fastjet3.4.0-python3.10 \
1515
--tag matthewfeickert/pythia-python:latest
1616

1717
run:

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ The Docker image contains:
1515
* [HepMC2](http://hepmc.web.cern.ch/hepmc/) `v2.06.11`
1616
* [LHAPDF](https://lhapdf.hepforge.org/) `v6.5.3`
1717
* [FastJet](http://fastjet.fr/) `v3.4.0`
18-
* [PYTHIA](https://pythia.org/) `v8.307`
18+
* [PYTHIA](https://pythia.org/) `v8.308`
1919

2020
## Installation
2121

2222
- Check the [list of available tags on Docker Hub](https://hub.docker.com/r/matthewfeickert/pythia-python/tags?page=1) to find the tag you want.
2323
- Use `docker pull` to pull down the image corresponding to the tag. For example:
2424

2525
```
26-
docker pull matthewfeickert/pythia-python:pythia8.307
26+
docker pull matthewfeickert/pythia-python:pythia8.308
2727
```
2828

2929
## Use
@@ -35,7 +35,7 @@ docker run \
3535
--rm \
3636
--user $(id -u $USER):$(id -g) \
3737
--volume $PWD:/work \
38-
matthewfeickert/pythia-python:pythia8.307 \
38+
matthewfeickert/pythia-python:pythia8.308 \
3939
'python tests/main01.py > main01_out_py.txt'
4040
```
4141

@@ -46,7 +46,7 @@ docker run \
4646
--rm \
4747
--user $(id -u $USER):$(id -g) \
4848
--volume $PWD:/work \
49-
matthewfeickert/pythia-python:pythia8.307 \
49+
matthewfeickert/pythia-python:pythia8.308 \
5050
'g++ tests/main01.cc -o tests/main01 $(pythia8-config --ldflags); ./tests/main01 > main01_out_cpp.txt'
5151
```
5252

0 commit comments

Comments
 (0)