diff options
| author | vais-ral <rlcr8@stfc.ac.uk> | 2019-01-29 09:04:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-29 09:04:02 +0000 |
| commit | e9203bf4b19efecff2b02c6214ab92fb655759fe (patch) | |
| tree | c4840113c121a9ca52ce112136e8dca86e629d66 /Wrappers/Python | |
| parent | ba9994e131dae1e1c09f156df12327f2ef10beb4 (diff) | |
| parent | ed7c78377ef03c185f2fce7435742c5dc6d105e7 (diff) | |
| download | framework-e9203bf4b19efecff2b02c6214ab92fb655759fe.tar.gz framework-e9203bf4b19efecff2b02c6214ab92fb655759fe.tar.bz2 framework-e9203bf4b19efecff2b02c6214ab92fb655759fe.tar.xz framework-e9203bf4b19efecff2b02c6214ab92fb655759fe.zip | |
Merge pull request #177 from TomasKulhanek/master
Universal build script
Diffstat (limited to 'Wrappers/Python')
| -rw-r--r-- | Wrappers/Python/conda-recipe/conda_build_config.yaml | 3 | ||||
| -rw-r--r-- | Wrappers/Python/conda-recipe/meta.yaml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Wrappers/Python/conda-recipe/conda_build_config.yaml b/Wrappers/Python/conda-recipe/conda_build_config.yaml index b7977f3..96a211f 100644 --- a/Wrappers/Python/conda-recipe/conda_build_config.yaml +++ b/Wrappers/Python/conda-recipe/conda_build_config.yaml @@ -3,5 +3,6 @@ python: - 3.5 - 3.6 numpy: - - 1.12 + # TODO investigage, as it doesn't currently build with cvxp, requires >1.14 + #- 1.12 - 1.15 diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index 840590f..1b7cae6 100644 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -2,7 +2,6 @@ package: name: ccpi-framework version: {{ environ['CIL_VERSION'] }} - build: preserve_egg_dir: False script_env: @@ -21,6 +20,7 @@ requirements: - setuptools run: + - {{ pin_compatible('numpy', max_pin='x.x') }} - python - numpy - scipy |