Only python3 on OSX.

.travis.yml

@@ -1,13 +1,13 @@
-sudo : required
-
 matrix:
   include:
+    - os: osx
+      osx_image: xcode12
     - os : osx
       osx_image: xcode11
     - os: osx
       osx_image: xcode10
     - os: linux
-      sudo: required
+
 
 services:
   - docker

BuildImages2014/Dockerfile

@@ -0,0 +1,15 @@
+FROM quay.io/pypa/manylinux2014_x86_64
+MAINTAINER Dilawar Singh <dilawar.s.rajput@gmail.com>
+
+ARG PYPI_PASSWORD
+
+MAINTAINER Dilawar Singh <dilawar.s.rajput@gmail.com>
+ENV PATH=/usr/local/bin:$PATH
+RUN yum install -y cmake3 wget vim git 
+WORKDIR /root
+RUN curl -O https://ftp.gnu.org/gnu/gsl/gsl-2.4.tar.gz && \
+  tar xvf gsl*.tar.gz && \
+  cd gsl* && CFLAGS=-fPIC ./configure --enable-static && make $MAKEOPTS && make install 
+COPY build_wheels_linux.sh .
+# RUN ./build_wheels_linux.sh
+CMD [ "bash" ]

BuildImages2014/Makefile

@@ -0,0 +1,7 @@
+IMAGE := bhallalab/manylinux
+
+all : Dockerfile
+	docker build -t $(IMAGE) .
+
+run : 
+	docker run -it $(IMAGE) bash

BuildImages2014/build_wheels_linux.sh

@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+
+set -e -x
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+NPROC=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l)
+NUM_WORKERS=$((NPROC+1))
+
+if [ "$TRAVIS" == "true" ]; then
+    NUM_WORKERS=3
+fi
+MAKEOPTS="-j$NUM_WORKERS"
+
+# Place to store wheels.
+WHEELHOUSE=${1-$HOME/wheelhouse}
+echo "Path to store wheels : $WHEELHOUSE"
+mkdir -p $WHEELHOUSE
+
+# tag on github and revision number. Make sure that they are there.
+[ -f ./BRANCH ] || echo "master" >> ./BRANCH
+BRANCH=$(cat ./BRANCH)
+VERSION="3.2.0.dev$(date +%Y%m%d)"
+
+echo "Building version $REVISION, from branch $BRANCH"
+
+GSL_STATIC_LIBS="/usr/local/lib/libgsl.a;/usr/local/lib/libgslcblas.a"
+
+if [ ! -f /usr/local/lib/libgsl.a ]; then 
+    #wget --no-check-certificate ftp://ftp.gnu.org/gnu/gsl/gsl-2.4.tar.gz 
+    curl -O https://ftp.gnu.org/gnu/gsl/gsl-2.4.tar.gz
+    tar xvf gsl-2.4.tar.gz 
+    cd gsl-2.4 
+    CFLAGS=-fPIC ./configure --enable-static && make $MAKEOPTS
+    make install 
+    cd ..
+fi 
+
+MOOSE_SOURCE_DIR=$SCRIPT_DIR/moose-core
+
+if [ ! -d $MOOSE_SOURCE_DIR ]; then
+    git clone https://github.com/dilawar/moose-core --depth 10 --branch $BRANCH
+fi
+
+# Try to link statically.
+CMAKE=/usr/bin/cmake3
+
+# Build wheels here.
+for PYV in 38 37m 36m; do
+    PYDIR=/opt/python/cp${PYV}-cp${PYV}
+    PYVER=$(basename $PYDIR)
+    mkdir -p $PYVER
+    (
+        cd $PYVER
+        echo "Building using $PYDIR in $PYVER"
+        PYTHON=$(ls $PYDIR/bin/python?.?)
+        $PYTHON -m pip install numpy twine
+        $PYTHON -m pip install matplotlib
+        $PYTHON -m pip install twine
+        $PYTHON -m pip uninstall pymoose -y || echo "No pymoose"
+	git pull || echo "Failed to pull $BRANCH"
+        $CMAKE -DPYTHON_EXECUTABLE=$PYTHON  \
+            -DGSL_STATIC_LIBRARIES=$GSL_STATIC_LIBS \
+            -DVERSION_MOOSE=$VERSION \
+            ${MOOSE_SOURCE_DIR}
+        make  $MAKEOPTS
+
+        # Now build bdist_wheel
+        cd python
+        cp setup.cmake.py setup.py
+        $PYTHON -m pip wheel . -w $WHEELHOUSE 
+        echo "Content of WHEELHOUSE"
+        ls -lh $WHEELHOUSE/*.whl
+    )
+done
+
+# List all wheels.
+ls -lh $WHEELHOUSE/*.whl
+
+# now check the wheels.
+for whl in $WHEELHOUSE/pymoose*.whl; do
+    auditwheel show "$whl"
+done
+
+echo "Installing before testing ... "
+
+/opt/python/cp36-cp36/bin/pip install $WHEELHOUSE/pymoose-$VERSION-py3-none-any.whl
+/opt/python/cp38-cp38/bin/pip install $WHEELHOUSE/pymoose-$VERSION-py3-none-any.whl
+for PYV in 38 36; do
+    /opt/python/cp${PYV}-cp${PYV}/bin/pip install $WHEELHOUSE/pymoose-$VERSION-py3-none-any.whl
+    PYDIR=/opt/python/cp${PYV}-cp${PYV}
+    PYTHON=$(ls $PYDIR/bin/python?.?)
+    $PYTHON -c 'import moose; print(moose.__version__)'
+done

Dockerfile

@@ -1,10 +1,21 @@
-# This docker image is based on bhallalab/manylinux2010 which is
-# ./hub.docker.com/wheel/Makefile
-FROM bhallalab/manylinux2010:latest
+FROM quay.io/pypa/manylinux2010_x86_64
 MAINTAINER Dilawar Singh <dilawar.s.rajput@gmail.com>
+
 ARG PYMOOSE_PYPI_PASSWORD
-ENV PYMOOSE_PYPI_PASSWORD=$PYMOOSE_PYPI_PASSWORD
+
+RUN yum install -y cmake3 git tree && rm -rf /var/cache/yum/*
+
+ENV PATH /usr/local/bin:$PATH 
+RUN ln -s /usr/bin/cmake3 /usr/local/bin/cmake
+
 WORKDIR /root
-COPY ./BRANCH .
+
+RUN curl -O https://ftp.gnu.org/gnu/gsl/gsl-2.4.tar.gz \
+    && tar xvf gsl-2.4.tar.gz  \
+    && cd gsl-2.4  \
+    && CFLAGS=-fPIC ./configure --enable-static && make $MAKEOPTS \
+    && make install
+
 COPY ./build_wheels_linux.sh .
-RUN PYMOOSE_PYPI_PASSWORD=$PYMOOSE_PYPI_PASSWORD ./build_wheels_linux.sh
+RUN ./build_wheels_linux.sh
+CMD [ "bash", "-c", "./build_wheels_linux.sh"]

Makefile

@@ -1,14 +1,14 @@
-VERSION:=$(shell cat ./VERSION)
-
 all : wheels
 
-DOCKERFILE:="bhallalab/pymoose_wheels_$(USER):$(VERSION)"
+DOCKERFILE:="dilawars/pymoose-manylinux2010:latest"
 
 wheels : ./Dockerfile ./build_wheels_linux.sh 
 	mkdir -p $(HOME)/wheelhouse
-	docker build \
-	    -t $(DOCKERFILE) \
+	docker build -t $(DOCKERFILE) \
 	    --build-arg PYMOOSE_PYPI_PASSWORD=$(PYMOOSE_PYPI_PASSWORD) . 
 
-run:
-	docker run -it $(DOCKERFILE) /bin/bash
+run : ./Dockerfile
+	docker run -it quay.io/pypa/manylinux2010_x86_64
+
+upload: 
+	docker push $(DOCKERFILE)

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/BhallaLab/deploy.svg?branch=master)](https://travis-ci.org/BhallaLab/deploy)
+[![Build Status](https://travis-ci.org/dilawar/pymoose-deploy.svg?branch=master)](https://travis-ci.org/dilawar/pymoose-deploy)
 
 This repository contains all scripts required to build and release pymoose.
 

build_wheels_linux.sh

@@ -4,7 +4,11 @@ set -e -x
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 NPROC=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l)
-NUM_WORKERS=$((NPROC))
+NUM_WORKERS=$((NPROC-1))
+
+if [ "$TRAVIS" == "true" ]; then
+    NUM_WORKERS=2
+fi
 MAKEOPTS="-j$NUM_WORKERS"
 
 # Place to store wheels.
@@ -14,8 +18,8 @@ echo "Path to store wheels : $WHEELHOUSE"
 mkdir -p $WHEELHOUSE
 
 # tag on github and revision number. Make sure that they are there.
+[ -f ./BRANCH ] || echo "master" > ./BRANCH
 BRANCH=$(cat ./BRANCH)
-VERSION="3.2dev$(date +%Y%m%d)"
 
 # Create a test script and upload.
 TESTFILE=/tmp/test.py
@@ -27,52 +31,45 @@ moose.reinit()
 moose.start( 1 )
 EOF
 
-
-echo "Building version $VERSION, from branch $BRANCH"
-
 if [ ! -f /usr/local/lib/libgsl.a ]; then 
-    #wget --no-check-certificate ftp://ftp.gnu.org/gnu/gsl/gsl-2.4.tar.gz 
     curl -O https://ftp.gnu.org/gnu/gsl/gsl-2.4.tar.gz
     tar xvf gsl-2.4.tar.gz 
     cd gsl-2.4 
     CFLAGS=-fPIC ./configure --enable-static && make $MAKEOPTS
     make install 
+
+    # GSL will be linked statically.
+    GSL_STATIC_LIBS="/usr/local/lib/libgsl.a;/usr/local/lib/libgslcblas.a"
+
     cd ..
 fi 
 
 MOOSE_SOURCE_DIR=$SCRIPT_DIR/moose-core
-if [ -d $MOOSE_SOURCE_DIR ]; then
-  cd $MOOSE_SOURCE_DIR && git checkout $BRANCH && git pull origin $BRANCH
-  rm -rf dist
-else
-  git clone https://github.com/dilawar/moose-core $MOOSE_SOURCE_DIR \
-    --depth 1 --branch $BRANCH
+
+if [ ! -d $MOOSE_SOURCE_DIR ]; then
+    git clone https://github.com/dilawar/moose-core --depth 10 --branch $BRANCH
 fi
 
 # Try to link statically.
 GSL_STATIC_LIBS="/usr/local/lib/libgsl.a;/usr/local/lib/libgslcblas.a"
-CMAKE=/usr/bin/cmake3
 
 # Build wheels here.
-PY27=$(ls /opt/python/cp27-cp27m/bin/python?.?)
-PY35=$(ls /opt/python/cp35-cp35m/bin/python?.?)
 PY36=$(ls /opt/python/cp36-cp36m/bin/python?.?)
 PY37=$(ls /opt/python/cp37-cp37m/bin/python?.?)
 PY38=$(ls /opt/python/cp38-cp38/bin/python?.?)
 
-for PYTHON in $PY38 $PY37 $PY36 $PY35 $PY27; do
+# install latest cmake using pip and its location to PATH
+$PY38 -m pip install cmake --user
+$PY38 -m pip install twine auditwheel
+
+export PATH=/opt/python/cp38-cp38/bin:/root/.local/bin:$PATH
+
+for PYTHON in $PY38 $PY37 $PY36; do
   echo "========= Building using $PYTHON ..."
   $PYTHON -m pip install pip setuptools --upgrade
-  if [[ "$PYV" -eq "27" ]]; then
-    $PYTHON -m pip install numpy==1.15
-    $PYTHON -m pip install matplotlib==2.2.3
-  else
-    $PYTHON -m pip install numpy twine
-    $PYTHON -m pip install matplotlib
-  fi
-
+  $PYTHON -m pip install numpy twine
+  $PYTHON -m pip install matplotlib
   $PYTHON -m pip install twine
-
   # Removing existing pymoose if any.
   $PYTHON -m pip uninstall pymoose -y || echo "No pymoose"
 
@@ -82,44 +79,26 @@ for PYTHON in $PY38 $PY37 $PY36 $PY35 $PY27; do
   $PYTHON setup.py bdist_wheel --skip-build 
   ( 
       echo "Install and test this wheel"
-      # NOTE: Not sure why I have to do this. But cant install wheel from build
-      # directory.
+      auditwheel repair $MOOSE_SOURCE_DIR/dist/*.whl -w $WHEELHOUSE/
+      $PYTHON -m pip install $MOOSE_SOURCE_DIR/dist/*.whl  || echo "Failed to install"
       cd /tmp
-      $PYTHON -m pip install $MOOSE_SOURCE_DIR/dist/*.whl 
       $PYTHON $TESTFILE
-      mv $MOOSE_SOURCE_DIR/dist/*.whl $WHEELHOUSE
       rm -rf $MOOSE_SOURCE_DIR/dist/*.whl
   )
 done
 
+
 # List all wheels.
 ls -lh $WHEELHOUSE/*.whl
-
-# now check the wheels.
-for whl in $WHEELHOUSE/pymoose*.whl; do
-    auditwheel show "$whl"
-    # Fix the tag and remove the old wheel.
-    auditwheel repair "$whl" -w $WHEELHOUSE && rm -f "$whl"
-done
-
-# upload to PYPI.
-$PY38 -m pip install twine
-TWINE="$PY38 -m twine"
-for whl in `find $WHEELHOUSE -name "pymoose*.whl"`; do
-    # If successful, upload using twine.
-    if [ -n "$PYMOOSE_PYPI_PASSWORD" ]; then
-        $TWINE upload $whl \
-          --user bhallalab \
-          --password $PYMOOSE_PYPI_PASSWORD --skip-existing
-    else
-        echo "PYPI password is not set"
-    fi
-done
+$PY38 -m twine upload $WHEELHOUSE/*.whl \
+    --user __token__ --password $PYMOOSE_PYPI_PASSWORD \
+    --skip-existing 
 
 # Now upload the source distribution.
+set -e
 cd $MOOSE_SOURCE_DIR 
-rm -rf dist
-$PY38 setup.py sdist 
-$TWINE upload dist/pymoose*.tar.gz \
-  --user bhallalab --password $PYMOOSE_PYPI_PASSWORD \
-  --skip-existing || echo "Failed to upload source distribution."
+rm -rf dist && \
+    $PY38 setup.py sdist && \
+    $PY38 -m twine upload dist/pymoose*.tar.gz \
+        --user __token__ --password $PYMOOSE_PYPI_PASSWORD \
+        --skip-existing || echo "Failed to upload source distribution."