Skip to content

Commit

Permalink
Merge pull request #51 from sys-bio/issue-48
Browse files Browse the repository at this point in the history
Issue 48
  • Loading branch information
Ciaran Welsh committed Apr 7, 2021
2 parents c1b23a3 + c322f56 commit a980fa3
Show file tree
Hide file tree
Showing 452 changed files with 22,319 additions and 22,491 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,7 @@ third_party/curl-7.69.1/docs
ExtraSearchDirectories.txt
PipWheels

biomodels



2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.15)
# Set version.
set(VERSION_MAJOR 1)
set(VERSION_MINOR 2)
set(VERSION_MICRO 5)
set(VERSION_MICRO 6)

set(LIBOMEXMETA_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO})
configure_file(VERSION.txt.in VERSION.txt)
Expand Down
404 changes: 255 additions & 149 deletions azure-pipelines.yml

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions docker/ManyLinux2014/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@

FROM quay.io/pypa/manylinux2014_x86_64

RUN git clone https://github.com/microsoft/vcpkg.git
RUN cd vcpkg \
&& ./bootstrap-vcpkg.sh
RUN cd vcpkg ./vcpkg integrate install
RUN cd vcpkg && ./vcpkg install curl pcre openssl yajl sqlite3 liblzma

RUN yum install -y wget
RUN wget https://repo.anaconda.com/miniconda/Miniconda3-py39_4.9.2-Linux-x86_64.sh
RUN bash Miniconda3-py39_4.9.2-Linux-x86_64.sh -b -p /Miniconda3

RUN /Miniconda3/bin/conda create -y --name py37 python=3.7 pytest
RUN /Miniconda3/bin/conda create -y --name py38 python=3.8 pytest
RUN /Miniconda3/bin/conda create -y --name py39 python=3.9 pytest



36 changes: 36 additions & 0 deletions docker/libOmexMeta-ManyLinux/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
FROM ciaranwelsh/manylinux2014

RUN git clone https://github.com/sys-bio/libOmexMeta.git --recurse-submodules
RUN cd /libOmexMeta && mkdir build && cd build \
&& cmake -DCMAKE_INSTALL_PREFIX=../install-docker -DCMAKE_BUILD_TYPE=Release -DVCPKG_ROOT=/vcpkg -DBUILD_TESTS=ON .. \
&& cmake --build . --target install -j 12 --config Release


RUN cd /libOmexMeta && mkdir build-py37 && cd build-py37 \
&& cmake -DCMAKE_INSTALL_PREFIX=../install-docker-py37 -DCMAKE_BUILD_TYPE=Release -DVCPKG_ROOT=/vcpkg -DBUILD_TESTS=ON -DBUILD_PYTHON=ON -DPython_ROOT_DIR=/Miniconda3/envs/py37 ..
RUN cd /libOmexMeta/build-py37 \
&& cmake --build . --target install -j 12 --config Release
RUN ctest --verbose --extra-verbose

RUN cd /libOmexMeta/install-docker-py37 \
&& /Miniconda3/envs/py37/bin/python ./setup.py bdist_wheel


RUN cd /libOmexMeta && mkdir build-py38 && cd build-py38 \
&& cmake -DCMAKE_INSTALL_PREFIX=../install-docker-py38 -DCMAKE_BUILD_TYPE=Release -DVCPKG_ROOT=/vcpkg -DBUILD_TESTS=ON -DBUILD_PYTHON=ON -DPython_ROOT_DIR=/Miniconda3/envs/py38 ..
RUN cd /libOmexMeta/build-py38 \
&& cmake --build . --target install -j 12 --config Release
RUN ctest --verbose --extra-verbose

RUN cd /libOmexMeta/install-docker-py38 \
&& /Miniconda3/envs/py38/bin/python ./setup.py bdist_wheel


RUN cd /libOmexMeta && mkdir build-py39 && cd build-py39 \
&& cmake -DCMAKE_INSTALL_PREFIX=../install-docker-py39 -DCMAKE_BUILD_TYPE=Release -DVCPKG_ROOT=/vcpkg -DBUILD_TESTS=ON -DBUILD_PYTHON=ON -DPython_ROOT_DIR=/Miniconda3/envs/py39 ..
RUN cd /libOmexMeta/build-py39 \
&& cmake --build . --target install -j 12 --config Release
RUN ctest --verbose --extra-verbose

RUN cd /libOmexMeta/install-docker-py39 \
&& /Miniconda3/envs/py39/bin/python ./setup.py bdist_wheel
Loading

0 comments on commit a980fa3

Please sign in to comment.