Skip to content

Commit

Permalink
updated packages
Browse files Browse the repository at this point in the history
  • Loading branch information
yiiyama committed Jun 20, 2023
1 parent cc2a4bd commit a17a80a
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 9 deletions.
8 changes: 5 additions & 3 deletions .binder/postBuild
Expand Up @@ -2,6 +2,8 @@

ROOTDIR=$(git rev-parse --show-toplevel 2>/dev/null)

git clone https://github.com/derlin/hepqpr-qallse
cp -r hepqpr-qallse/src/hepqpr $ROOTDIR/source
ln -s $ROOTDIR/source/hepqpr $ROOTDIR/source/ja/hepqpr
# Binder runtime environment is primarily derived from requirements.txt in this directory; anything that can't be pip-installed must be processed here

git clone https://github.com/LAL/trackml-library.git
pip3 install ./trackml-library
rm -rf trackml-library
1 change: 1 addition & 0 deletions .binder/requirements.txt
Expand Up @@ -11,3 +11,4 @@ plotly
pandas
scikit-learn
tabulate
dwave-qbsolv
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Expand Up @@ -15,7 +15,7 @@ jobs:

- name: Build the books
run: |
docker run --rm --mount type=bind,src=$GITHUB_WORKSPACE,dst=/qc-workbook yiiyama/jupyterbook-qiskit:1.1.1 /qc-workbook/build-runner/build_and_publish.py --account $GITHUB_REPOSITORY_OWNER --keep-reports
docker run --rm --mount type=bind,src=$GITHUB_WORKSPACE,dst=/qc-workbook yiiyama/jupyterbook-qiskit:1.1.2 /qc-workbook/build-runner/build_and_publish.py --account $GITHUB_REPOSITORY_OWNER --keep-reports
- name: GitHub Pages action
uses: peaceiris/actions-gh-pages@v3.7.3
Expand Down
2 changes: 1 addition & 1 deletion build-runner/Dockerfile.buildenv
@@ -1,4 +1,4 @@
FROM yiiyama/jupyterbook-qiskit-packages:1.1.1 AS packages_cleaned
FROM yiiyama/jupyterbook-qiskit-packages:1.1.2 AS packages_cleaned

COPY clean_packages.sh /
RUN /clean_packages.sh
Expand Down
13 changes: 9 additions & 4 deletions build-runner/Dockerfile.packages
@@ -1,10 +1,7 @@
FROM ubuntu:latest

RUN apt-get -y update && \
apt-get install -y \
python3 \
python3-venv \
python3-pip
apt-get install -y python3 python3-venv python3-pip git

# First line: jupyter-book installs a bunch of dependencies and some have
# superficially conflicting version requirements. Conflict occurs because
Expand All @@ -18,4 +15,12 @@ RUN pip3 install --no-cache-dir mdit-py-plugins==0.3.5 docutils==0.17.1 pydata-s
pip3 install --no-cache-dir scikit-learn==1.2.2 && \
pip3 install --no-cache-dir jupyter-book==0.15.1 tabulate==0.9.0

# The next two blocks are libraries required at runtime (not build time) only, so they are not needed in principle
# (Cells using these libraries are tagged as "throws-exception")
RUN pip3 install dwave-qbsolv

RUN git clone https://github.com/LAL/trackml-library.git && \
pip3 install ./trackml-library && \
rm -rf trackml-library

# Tag as yiiyama/jupyterbook-qiskit-packages:__version__

0 comments on commit a17a80a

Please sign in to comment.