Skip to content

Commit

Permalink
Merge branch 'development' into test_jupyterlab2
Browse files Browse the repository at this point in the history
  • Loading branch information
pgleeson committed Oct 4, 2024
2 parents dc7afef + 9b7c146 commit 42d80bc
Show file tree
Hide file tree
Showing 7 changed files with 68 additions and 67 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-image-intel.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Docker Image Test Build - Intel drivers
name: Docker Image Build - Intel drivers

on:
push:
Expand All @@ -18,7 +18,7 @@ jobs:
- name: Build the Docker image
run: |
chmod a+w output/
ls -alt
ls -alth
./build_intel.sh
- name: Info on Docker images
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-image-quickrun.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Docker Image Test - quick
name: Docker Image Quick Run

on:
push:
Expand All @@ -17,7 +17,7 @@ jobs:
- name: Build the Docker image
run: |
chmod a+w output/
ls -alt
ls -alth
./build.sh
- name: Info on Docker images
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Docker Image Test Build
name: Docker Image Build & Run

on:
push:
Expand All @@ -17,7 +17,7 @@ jobs:
- name: Build the Docker image
run: |
chmod a+w output/
ls -alt
ls -alth
./build.sh
- name: Info on Docker images
run: |
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ RUN mkdir -p /etc/sudoers.d && \

ENV DEBIAN_FRONTEND noninteractive # TODO: change


################################################################################
######## Update/install essential libraries

Expand Down Expand Up @@ -60,7 +61,7 @@ RUN pip3 install neuron==8.0.1

RUN git clone https://github.com/openworm/c302.git && \
cd c302 && \
git checkout ow-0.9.4 && \
git checkout ow-0.9.5 && \
sudo pip install .

# Note: pyNeuroML installed with the above library
Expand All @@ -74,7 +75,7 @@ RUN owm bundle remote --user add ow 'https://raw.githubusercontent.com/openworm/

RUN git clone https://github.com/openworm/sibernetic.git && \
cd sibernetic && \
git checkout ow-0.9.4 # fixed to a specific branch
git checkout ow-0.9.5 # fixed to a specific branch


################################################################################
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile_intel
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ RUN pip3 install neuron==8.0.1

RUN git clone https://github.com/openworm/c302.git && \
cd c302 && \
git checkout ow-0.9.4 && \
git checkout ow-0.9.5 && \
sudo pip install .

# Note: pyNeuroML installed with the above library
Expand All @@ -75,7 +75,7 @@ RUN owm bundle remote --user add ow 'https://raw.githubusercontent.com/openworm/

RUN git clone https://github.com/openworm/sibernetic.git && \
cd sibernetic && \
git checkout ow-0.9.4 # fixed to a specific branch
git checkout ow-0.9.5 # fixed to a specific branch


################################################################################
Expand Down
112 changes: 56 additions & 56 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.4
0.9.5

0 comments on commit 42d80bc

Please sign in to comment.