mirror of
https://github.com/CoolProp/CoolProp.git
synced 2026-04-23 03:00:17 -04:00
Merge branch 'master' of https://github.com/coolprop/coolprop
This commit is contained in:
Ian Bell
@@ -62,6 +62,7 @@ c['slaves'] = [BuildSlave("linux-slave", pass_dict["linux-slave"], **slave_commo
|
||||
BuildSlave("OSX-IPU-slave", pass_dict["OSX-IPU-slave"], **slave_commons),
|
||||
BuildSlave("Linux64-IPU-slave", pass_dict["Linux64-IPU-slave"], **slave_commons),
|
||||
BuildSlave("Linux32-IPU-slave", pass_dict["Linux32-IPU-slave"], **slave_commons),
|
||||
BuildSlave("LinuxWeb-IPU-slave", pass_dict["LinuxWeb-IPU-slave"], **slave_commons),
|
||||
# BuildSlave("docker-slave", pass_dict["docker-slave"], **slave_commons),
|
||||
]
|
||||
|
||||
@@ -332,7 +333,7 @@ def getBaseFactory():
|
||||
return factory
|
||||
|
||||
def docActivateCmd():
|
||||
#return 'source activate CoolPropDocs &&'
|
||||
#return 'source activate CoolPropWeb &&'
|
||||
return ''
|
||||
|
||||
@properties.renderer
|
||||
@@ -985,6 +986,14 @@ c['builders'].append(
|
||||
)
|
||||
)
|
||||
|
||||
#c['builders'].append(
|
||||
# BuilderConfig(
|
||||
# name="Sphinx docs",
|
||||
# slavenames=["LinuxWeb-IPU-slave"],
|
||||
# factory = websiteFactory(platform = 'linux')
|
||||
# )
|
||||
#)
|
||||
|
||||
c['builders'].append(
|
||||
BuilderConfig(name="Javascript-linux",
|
||||
slavenames=["linux-slave"],
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
SLAVEDIR=/home/buildbot/slavedir
|
||||
MASTERHOST=bots.coolprop.org:port
|
||||
SLAVENAME=slavename
|
||||
SLAVEPASSWORD=pass
|
||||
BOTADMIN=Author Name
|
||||
BOTEMAIL=noreply@coolprop.org
|
||||
BOTHOST=A short description of the host computer
|
||||
@@ -1,39 +0,0 @@
|
||||
# Set the base image to Debian
|
||||
FROM debian:stable
|
||||
|
||||
# File Author / Maintainer
|
||||
MAINTAINER Jorrit Wronski (jowr@ipu.dk)
|
||||
|
||||
# Just to make sure
|
||||
USER root
|
||||
WORKDIR /
|
||||
|
||||
# Install system tools for compilation
|
||||
RUN apt-get update -qq && \
|
||||
apt-get install -y build-essential gfortran gcc cmake git && \
|
||||
apt-get install -y bash rsync curl wget && \
|
||||
apt-get install -y python-dev python-pip && \
|
||||
apt-get clean
|
||||
|
||||
# Install the buildbot slave software and add the appropriate user
|
||||
RUN pip install buildbot-slave
|
||||
RUN groupadd -r buildbot && \
|
||||
useradd -r -d /home/buildbot -m -s /bin/bash -g buildbot buildbot # && mkdir /buildslave && chown buildbot:buildbot /buildslave
|
||||
|
||||
# Make sure bash is the standard shell
|
||||
RUN rm /bin/sh && ln -sf /bin/bash /bin/sh
|
||||
USER buildbot
|
||||
WORKDIR /home/buildbot
|
||||
|
||||
# Add some standard hosts
|
||||
RUN \
|
||||
mkdir .ssh && \
|
||||
ssh-keyscan github.com >> .ssh/known_hosts && \
|
||||
ssh-keyscan bitbucket.org >> .ssh/known_hosts && \
|
||||
ssh-keyscan coolprop.org >> .ssh/known_hosts && \
|
||||
ssh-keyscan coolprop.dreamhosters.com >> .ssh/known_hosts && \
|
||||
cat .ssh/known_hosts
|
||||
|
||||
# Add the entrypoint that creates a repository on first launch
|
||||
COPY ./Dockerfile.slave.entrypoint.sh /
|
||||
ENTRYPOINT ["/Dockerfile.slave.entrypoint.sh"]
|
||||
@@ -1,40 +0,0 @@
|
||||
#!/bin/bash
|
||||
CTRLAPP="/usr/local/bin/buildslave"
|
||||
function shutdown()
|
||||
{
|
||||
$CTRLAPP stop ${SLAVEDIR}
|
||||
exit 0
|
||||
}
|
||||
|
||||
function startup()
|
||||
{
|
||||
if [ ! -d "${SLAVEDIR}" ]; then
|
||||
/usr/local/bin/buildslave create-slave ${SLAVEDIR} ${MASTERHOST} ${SLAVENAME} ${SLAVEPASSWORD}
|
||||
echo "${BOTADMIN} <${BOTEMAIL}>" > ${SLAVEDIR}/info/admin
|
||||
echo "${BOTHOST}" > ${SLAVEDIR}/info/host
|
||||
fi
|
||||
# Remove the security relevant variable from the environment
|
||||
unset MASTERHOST
|
||||
unset SLAVEPASSWORD
|
||||
unset BOTADMIN
|
||||
unset BOTEMAIL
|
||||
unset BOTHOST
|
||||
$CTRLAPP start ${SLAVEDIR}
|
||||
echo "Remember to update the SSH configuration:"
|
||||
echo "docker cp \${HOME}/.ssh ${SLAVENAME}:${HOME}/"
|
||||
echo "docker cp \${HOME}/.pypirc ${SLAVENAME}:${HOME}/"
|
||||
echo "docker exec ${SLAVENAME} chown -R buildbot ${HOME}/"
|
||||
}
|
||||
|
||||
trap shutdown TERM SIGTERM SIGKILL SIGINT
|
||||
|
||||
startup;
|
||||
|
||||
# Just idle for one hour and keep the process alive
|
||||
# waiting for SIGTERM.
|
||||
while : ; do
|
||||
sleep 3600 & wait
|
||||
done
|
||||
#
|
||||
echo "The endless loop terminated, something is wrong here."
|
||||
exit 1
|
||||
@@ -1,32 +0,0 @@
|
||||
# Set the base image
|
||||
FROM coolprop/slavebase
|
||||
|
||||
# File Author / Maintainer
|
||||
MAINTAINER Jorrit Wronski (jowr@ipu.dk)
|
||||
|
||||
# Just to make sure
|
||||
USER root
|
||||
WORKDIR /
|
||||
|
||||
# Install system tools for compilation of Python extensions numpy, scipy and pandas
|
||||
RUN apt-get update -qq && \
|
||||
apt-get install -y build-essential gcc python-dev \
|
||||
libhdf5-serial-dev libnetcdf-dev liblapack-dev libatlas-dev libblas-dev && \
|
||||
apt-get clean
|
||||
|
||||
# Run as user
|
||||
USER buildbot
|
||||
WORKDIR /home/buildbot
|
||||
|
||||
# Install miniconda Python distribution
|
||||
RUN curl -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh && \
|
||||
chmod +x miniconda.sh && ./miniconda.sh -b && rm miniconda.sh && \
|
||||
echo "export PATH=/home/buildbot/miniconda3/bin:/home/buildbot/miniconda/bin:$PATH" >> /home/buildbot/.bash_profile
|
||||
env PATH /home/buildbot/miniconda3/bin:/home/buildbot/miniconda/bin:$PATH
|
||||
|
||||
# Add the miniconda environments for the Python builds
|
||||
RUN \
|
||||
conda create -n CoolProp27 python=2.7 cython pip requests jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && \
|
||||
conda create -n CoolProp33 python=3.3 cython pip requests jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && \
|
||||
conda create -n CoolProp34 python=3.4 cython pip requests jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && \
|
||||
conda clean -yilts
|
||||
@@ -1,39 +0,0 @@
|
||||
# Set the base image
|
||||
FROM coolprop/slavebase
|
||||
|
||||
# File Author / Maintainer
|
||||
MAINTAINER Jorrit Wronski (jowr@ipu.dk)
|
||||
|
||||
# Just to make sure
|
||||
USER root
|
||||
WORKDIR /
|
||||
|
||||
# Install system tools for compilation of Python extensions numpy, scipy and pandas
|
||||
RUN apt-get update -qq && \
|
||||
apt-get install -y build-essential git gcc gfortran cmake python-dev \
|
||||
libhdf5-serial-dev libnetcdf-dev liblapack-dev libatlas-dev libblas-dev \
|
||||
libxml2-dev libxslt1-dev libxslt1.1 doxygen libtool \
|
||||
libatlas3-base libblas3 liblapack3 libatlas-dev libblas-dev liblapack-dev \
|
||||
libpng-dev tk libfreetype6-dev && \
|
||||
apt-get clean
|
||||
|
||||
# Run as user
|
||||
USER buildbot
|
||||
WORKDIR /home/buildbot
|
||||
|
||||
# Install miniconda Python distribution
|
||||
RUN curl -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh && \
|
||||
chmod +x miniconda.sh && ./miniconda.sh -b && rm miniconda.sh && \
|
||||
echo "export PATH=/home/buildbot/miniconda3/bin:/home/buildbot/miniconda/bin:$PATH" >> /home/buildbot/.bash_profile
|
||||
env PATH /home/buildbot/miniconda3/bin:/home/buildbot/miniconda/bin:$PATH
|
||||
|
||||
# Add the additional packages to the conda environment
|
||||
RUN \
|
||||
conda create -n CoolPropWeb python=2.7 setuptools requests cython numpy scipy matplotlib pandas ipython wxpython && \
|
||||
conda clean -yilts
|
||||
|
||||
# Add some pip packages that only exist there
|
||||
RUN \
|
||||
source activate CoolPropWeb && \
|
||||
pip install sphinx cloud-sptheme sphinxcontrib-bibtex sphinxcontrib-doxylink sphinxcontrib-napoleon && \
|
||||
source deactivate
|
||||
Reference in New Issue
Block a user