diff options
| author | Daniil Kazantsev <dkazanc3@googlemail.com> | 2019-03-17 11:12:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-17 11:12:23 +0000 |
| commit | ce6ec432cca73780e6f30e7075c0eb1b661a13be (patch) | |
| tree | b8654877391908a82e2284f2b00d57a3bac67920 /recipe | |
| parent | 514ba391805517a999db7ef42808b9ae9662b67b (diff) | |
| parent | 527e8b28aad16d09b37fa8c9d8790a89276d68b1 (diff) | |
| download | regularization-ce6ec432cca73780e6f30e7075c0eb1b661a13be.tar.gz regularization-ce6ec432cca73780e6f30e7075c0eb1b661a13be.tar.bz2 regularization-ce6ec432cca73780e6f30e7075c0eb1b661a13be.tar.xz regularization-ce6ec432cca73780e6f30e7075c0eb1b661a13be.zip | |
Merge pull request #110 from vais-ral/tol
Tolerance-based stopping criterion, fixes for a new structure, new demos
Diffstat (limited to 'recipe')
| -rw-r--r-- | recipe/meta.yaml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 111cd68..e3d74d6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,16 +1,16 @@ package: name: ccpi-regulariser version: {{CIL_VERSION}} - + build: preserve_egg_dir: False number: 0 script_env: - CIL_VERSION - + test: source_files: - - ./test/ + - ./test/ requires: - pillow - pillow=4.1.1 # [win] @@ -23,17 +23,17 @@ requirements: - numpy {{ numpy }} - setuptools - cython - - vc 14 # [win and py36] - - vc 14 # [win and py35] + - vc 14 # [win and py36] + - vc 14 # [win and py35] - vc 9 # [win and py27] - - cmake + - cmake run: - {{ pin_compatible('numpy', max_pin='x.x') }} - python - numpy - - vc 14 # [win and py36] - - vc 14 # [win and py35] + - vc 14 # [win and py36] + - vc 14 # [win and py35] - vc 9 # [win and py27] - libgcc-ng # [unix] |