From c4f70f57094502f8a009735d6bcd7f6548b45234 Mon Sep 17 00:00:00 2001
From: Jan Caron <j.caron@fz-juelich.de>
Date: Fri, 21 Jul 2017 14:40:53 +0200
Subject: [PATCH] Short test with ubuntu:16.04 and on the fly installation of
miniconda.
---
.gitlab-ci.yml | 8 +++++---
environment.yml | 6 ------
setup.py | 4 ++--
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f31040e..271b63b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,6 +74,7 @@
image: ubuntu:16.04
before_script:
+
# # Check and print Python version
# - python --version
# Create SSH configuration directory if necessary (also parents with -p, mode: read/write/exec):
@@ -89,13 +90,14 @@ before_script:
# Provide read access to owner (octal value code: 400) to known_hosts with chmod:
- chmod 400 ~/.ssh/known_hosts
- # Script from Ingo Heimabach:
+ # Script from Ingo Heimbach:
- apt-get update
- - apt-get install -y curl bzip2
+ - apt-get install -y curl bzip2 git
- curl -O -L https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
- chmod +x Miniconda3-latest-Linux-x86_64.sh
- ./Miniconda3-latest-Linux-x86_64.sh -b -p /opt/miniconda3
- export PATH="/opt/miniconda3/bin:${PATH}"
+ - apt-cache policy git
# - conda create -y -n pyramid python
# - source activate test_env
# - conda install -y numpy
@@ -111,7 +113,7 @@ test_conda:
script:
# Install requirements:
- conda info --envs
- - conda env create -y -q # -q: quiet/ no progressbar, because it spams the log!
+ - conda env create -q # -q: quiet/ no progressbar, because it spams the log!
- source activate pyramid
- conda info --envs
# Install jutil via secure ssh connection:
diff --git a/environment.yml b/environment.yml
index 481a532..47f7050 100644
--- a/environment.yml
+++ b/environment.yml
@@ -50,9 +50,3 @@ dependencies:
# - pip:
# # ALSO NEEDS JUTIL!
# - "git+ssh://gitlab@iffgit.fz-juelich.de/unger/jutil.git"
-#
-# # FOLLOWING NOT USED ANYMORE, CONDA WORKS, TOO (with appropriate channels):
-# # Install pyFFTW=0.10 from wheel:
-# - http://www.lfd.uci.edu/~gohlke/pythonlibs/pyFFTW‑0.10.4‑cp35‑cp35m‑win_amd64.whl
-# # Install mayavi=4.5 and VTK from wheel:
-# - http://www.lfd.uci.edu/~gohlke/pythonlibs/mayavi‑4.5.0+vtk71‑cp35‑cp35m‑win_amd64.whl
diff --git a/setup.py b/setup.py
index c8b78df..9215f64 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ import re
import subprocess
import sys
import itertools
-from distutils.command.build import build
+#from distutils.command.build import build
#import numpy
from setuptools import setup, find_packages
@@ -168,6 +168,6 @@ setup(name=DISTNAME,
#tests_require=['pytest', 'pytest-cov', 'pytest-flake8'],
install_requires=install_requires,
extras_require=extras_require,
- cmdclass={'build': build} # TODO: necessary?
+ #cmdclass={'build': build} # TODO: necessary?
)
print('-------------------------------------------------------------------------------\n')
--
GitLab