Merge pull request #51 from X-DataInitiative/TICK-389-fix-release-scheme

TICK-389 fix release scheme

setup.py

@@ -93,7 +93,9 @@
         numpy_include = np.get_numpy_include()
 
     # Determine if we have an available BLAS implementation
-    blas_info = get_info("blas_opt", 0)
+    if 'bdist_wheel' not in sys.argv:
+        blas_info = get_info("blas_opt", 0)
+
     numpy_available = True
 except ImportError as e:
     if is_building_tick:

tick/preprocessing/build/__init__.py

@@ -0,0 +1 @@
+# License: BSD 3 clause

tick/simulation/src/hawkes.h

@@ -7,6 +7,8 @@
 
 // License: BSD 3 clause
 
+#include "defs.h"
+
 #include <memory>
 
 #include <cfloat>

tick/simulation/src/hawkes_baselines/baseline.h

@@ -4,9 +4,10 @@
 
 // License: BSD 3 clause
 
-#include <memory>
 #include "base.h"
 
+#include <memory>
+
 /*! \class HawkesBaseline
  * \brief A abstract class for Hawkes baselines
  */

tick/simulation/src/hawkes_baselines/constant_baseline.h

@@ -4,9 +4,10 @@
 
 // License: BSD 3 clause
 
-#include <cereal/types/polymorphic.hpp>
 #include "baseline.h"
 
+#include <cereal/types/polymorphic.hpp>
+
 /*! \class HawkesConstantBaseline
  * \brief A basic wrapper of double to represent \f$ \mu \f$ of Hawkes processes
  */

tick/simulation/src/hawkes_baselines/timefunction_baseline.h

@@ -4,10 +4,11 @@
 
 // License: BSD 3 clause
 
-#include <cereal/types/polymorphic.hpp>
 #include "base.h"
 #include "baseline.h"
 
+#include <cereal/types/polymorphic.hpp>
+
 /*! \class HawkesBaseline
  * \brief Class of time varying baselines modeled by TimeFunction
  */

tools/docker/build_wheels.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -e -x
+
+python_versions=(cp34-cp34m  cp35-cp35m  cp36-cp36m)
+
+for PYVER in ${python_versions[@]}; do
+    PYBIN=/opt/python/${PYVER}/bin
+
+    cd /io
+
+    "${PYBIN}/python3" -mpip install -r requirements.txt
+    "${PYBIN}/python3" setup.py bdist_wheel --dist-dir=/tick/wheelhouse
+done
+
+for whl in /tick/wheelhouse/*.whl; do
+    auditwheel repair "$whl" -w /io/wheelhouse/
+done

tools/docker/tick_manylinux1_x86_64/Dockerfile

@@ -5,32 +5,19 @@ RUN yum update -y && yum install -y zlib-devel bzip2 bzip2-devel readline-devel
 
 ENV PATH="/root/.pyenv/bin:$PATH" SWIG_VER=3.0.12
 
-# Installing pyenv
-RUN curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash
-
 # Installing swig
 RUN curl -O https://kent.dl.sourceforge.net/project/swig/swig/swig-${SWIG_VER}/swig-${SWIG_VER}.tar.gz && tar -xf swig-${SWIG_VER}.tar.gz && \
-	cd swig-${SWIG_VER} && ./configure && make && make install && \
+	cd swig-${SWIG_VER} && ./configure && make -j4 && make install && \
 	rm -rf swig-${SWIG_VER}.tar.gz swig-${SWIG_VER} 
 
 # Installing cmake
 RUN curl -O https://cmake.org/files/v3.8/cmake-3.8.0.tar.gz && tar -xf cmake-3.8.0.tar.gz && \
-    (cd cmake-3.8.0 && ./configure && gmake && gmake install) && \
+    (cd cmake-3.8.0 && ./configure && gmake -j4 && gmake install) && \
     rm -rf cmake-3.8.0.tar.gz cmake-3.8.0
 
 # Installing googletest
 RUN git clone https://github.com/google/googletest.git && \
-	(cd googletest && mkdir -p build && cd build && cmake .. && make && make install) && \
+	(cd googletest && mkdir -p build && cd build && cmake .. && make -j4 && make install) && \
 	rm -rf googletest
 
-# Installing necessary python versions
-RUN pyenv install 3.4.6 && pyenv install 3.5.3 && pyenv install 3.6.1
-
-COPY requirements.txt requirements.txt
-
-RUN eval "$(pyenv init -)" && \
-	pyenv local 3.4.6 && pip install -r requirements.txt -U pip && \
-	pyenv local 3.5.3 && pip install -r requirements.txt -U pip && \
-	pyenv local 3.6.1 && pip install -r requirements.txt -U pip
-
 LABEL maintainer "[email protected]"