Binary build fixes

.gitlab-ci.yml

@@ -77,3 +77,12 @@ Python 2.7 with legacy PyOpenCL:
 #   - amd-cl-cpu
 #   except:
 #   - tags
+
+CentOS binary:
+  script:
+  - (cd build-helpers; make-linux-build-docker.sh --nodate)
+  artifacts:
+    paths:
+    - build-helpers/loopy-centos6
+  tags:
+  - docker

build-helpers/loopy.spec

@@ -10,9 +10,16 @@ debug = False
 
 from os.path import expanduser
 
+import packaging # pip install packaging to add
+
 a = Analysis(['../bin/loopy'],
              pathex=[expanduser('~/src/loopy')],
-             hiddenimports=["appdirs"],
+             hiddenimports=[
+                "appdirs",
+                "packaging.markers",
+                "packaging.specifiers",
+                "packaging.version",
+                ],
              hookspath=None,
              runtime_hooks=None,
              excludes=["hedge", "meshpy", "pyopencl", "PIL"]

build-helpers/make-linux-build-docker-inner.sh

@@ -22,7 +22,7 @@ source .env/bin/activate
 curl -k https://ssl.tiker.net/software/ez_setup.py | python -
 curl -k https://gitlab.tiker.net/inducer/pip/raw/7.0.3/contrib/get-pip.py | python -
 
-pip install pyinstaller
+pip install pyinstaller packaging
 git clone --recursive git://github.com/inducer/loopy
 cd loopy
 

build-helpers/make-linux-build-docker.sh

@@ -2,9 +2,19 @@
 
 # should be run in this directory (build-helpers)
 
+if test "$1" = "--nodate"; then
+  TGT_NAME=loopy-centos6
+else
+  TGT_NAME=loopy-centos6-$(date +"%Y-%m-%d")
+fi
+
+echo "Generating $TGT_NAME..."
+
 set -e
 set -x
 
+docker pull centos:6
+
 CNT=$(docker create -t -v $(pwd):/mnt centos:6 /mnt/make-linux-build-docker-inner.sh)
 echo "working in container $CNT"
 
@@ -12,7 +22,7 @@ docker start -i $CNT
 
 docker cp $CNT:/tmp/build/loopy/dist/loopy $(pwd) || true
 
-mv loopy loopy-centos6-$(date +"%Y-%m-%d")
+mv loopy $TGT_NAME
 
 docker rm $CNT
 

requirements.txt

@@ -8,3 +8,6 @@ hg+https://bitbucket.org/inducer/f2py
 
 # Optional, needed for using the C preprocessor on Fortran
 ply>=3.6
+
+# This is needed for the pyinstaller executable to be usable.
+packaging