diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2020-01-17 10:22:05 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <wjp@usecode.org> | 2020-02-07 10:57:37 +0100 |
| commit | 82fc179f39ed6da308b0f229769f899570a1d9ea (patch) | |
| tree | d3b8b7700df4dbce65eee12649fa6af6dd8667d2 /python/conda/astra-toolbox | |
| parent | b85922700332c8270b144d6fa80d7b08e24bf5ac (diff) | |
| download | astra-82fc179f39ed6da308b0f229769f899570a1d9ea.tar.gz astra-82fc179f39ed6da308b0f229769f899570a1d9ea.tar.bz2 astra-82fc179f39ed6da308b0f229769f899570a1d9ea.tar.xz astra-82fc179f39ed6da308b0f229769f899570a1d9ea.zip | |
Use numpy backward binary compatibility for conda packages
We now only build a single package built with numpy 1.11.x for numpy>=1.11,<2 .
There is no guarantee that every future numpy version covered by this
will be compatible with numpy 1.11, but numpy checks this internally at
run-time, and should report this (noisily) when this occurs.
Diffstat (limited to 'python/conda/astra-toolbox')
| -rw-r--r-- | python/conda/astra-toolbox/conda_build_config_py36.yaml | 12 | ||||
| -rw-r--r-- | python/conda/astra-toolbox/conda_build_config_py37.yaml | 12 | ||||
| -rw-r--r-- | python/conda/astra-toolbox/conda_build_config_py38.yaml | 12 | ||||
| -rw-r--r-- | python/conda/astra-toolbox/linux_build_config.yaml (renamed from python/conda/astra-toolbox/conda_build_config_py27.yaml) | 6 | ||||
| -rw-r--r-- | python/conda/astra-toolbox/meta.yaml | 3 |
5 files changed, 4 insertions, 41 deletions
diff --git a/python/conda/astra-toolbox/conda_build_config_py36.yaml b/python/conda/astra-toolbox/conda_build_config_py36.yaml deleted file mode 100644 index 571a9e5..0000000 --- a/python/conda/astra-toolbox/conda_build_config_py36.yaml +++ /dev/null @@ -1,12 +0,0 @@ -python: - - 3.6 - -numpy: - - 1.11 - - 1.15 - - 1.16 - - 1.17 -c_compiler_version: - - 7.3 -cxx_compiler_version: - - 7.3 diff --git a/python/conda/astra-toolbox/conda_build_config_py37.yaml b/python/conda/astra-toolbox/conda_build_config_py37.yaml deleted file mode 100644 index c654075..0000000 --- a/python/conda/astra-toolbox/conda_build_config_py37.yaml +++ /dev/null @@ -1,12 +0,0 @@ -python: - - 3.7 - -numpy: - - 1.11 - - 1.15 - - 1.16 - - 1.17 -c_compiler_version: - - 7.3 -cxx_compiler_version: - - 7.3 diff --git a/python/conda/astra-toolbox/conda_build_config_py38.yaml b/python/conda/astra-toolbox/conda_build_config_py38.yaml deleted file mode 100644 index 96934dd..0000000 --- a/python/conda/astra-toolbox/conda_build_config_py38.yaml +++ /dev/null @@ -1,12 +0,0 @@ -python: - - 3.8 - -numpy: - - 1.11 - - 1.13 - - 1.14 - - 1.17 -c_compiler_version: - - 7.3 -cxx_compiler_version: - - 7.3 diff --git a/python/conda/astra-toolbox/conda_build_config_py27.yaml b/python/conda/astra-toolbox/linux_build_config.yaml index d453378..91cc0e4 100644 --- a/python/conda/astra-toolbox/conda_build_config_py27.yaml +++ b/python/conda/astra-toolbox/linux_build_config.yaml @@ -1,10 +1,10 @@ python: - 2.7 - + - 3.6 + - 3.7 + - 3.8 numpy: - 1.11 - - 1.15 - - 1.16 c_compiler_version: - 7.3 diff --git a/python/conda/astra-toolbox/meta.yaml b/python/conda/astra-toolbox/meta.yaml index 78a7394..0526778 100644 --- a/python/conda/astra-toolbox/meta.yaml +++ b/python/conda/astra-toolbox/meta.yaml @@ -8,7 +8,6 @@ source: build: number: 0 - string: py_{{ python }}_numpy_{{ numpy }} test: imports: @@ -36,7 +35,7 @@ requirements: - libastra ==1.9.9.dev0 run: - python - - {{ pin_compatible('numpy', min_pin='x.x', max_pin='x.x') }} + - {{ pin_compatible('numpy', min_pin='x.x', max_pin='x') }} - scipy - six - libastra ==1.9.9.dev0 |