diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 3563d31d10..d2eb5e30d0 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -7,8 +7,6 @@ cross_compiler_target_platform: # [win] c_compiler: - gcc # [linux] - clang # [osx] - - vs2008 # [win] - - vs2015 # [win] - vs2015 # [win] c_compiler_version: # [unix] - 9 # [osx] @@ -17,8 +15,6 @@ c_compiler_version: # [unix] cxx_compiler: - gxx # [linux] - clangxx # [osx] - - vs2008 # [win] - - vs2015 # [win] - vs2015 # [win] cxx_compiler_version: # [unix] - 9 # [osx] @@ -128,9 +124,6 @@ docker_image: # [linux] zip_keys: - - python - - vc # [win] - - c_compiler # [win] - - cxx_compiler # [win] - # [linux64] - cuda_compiler_version # [linux64] - docker_image # [linux64] @@ -560,7 +553,6 @@ poppler: proj: - 6.3.1 python: - - 2.7.* *_cpython # [not (aarch64 or ppc64le)] - 3.6.* *_cpython - 3.7.* *_cpython python_impl: @@ -596,8 +588,6 @@ tk: tiledb: - 1.7.0 vc: # [win] - - 9 # [win] - - 14 # [win] - 14 # [win] vlfeat: - 0.9.20 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ad038bd37e..39fe057ede 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "2020.03.19" %} +{% set version = "2020.03.20" %} package: name: conda-forge-pinning diff --git a/recipe/migrations/pypy.yaml b/recipe/migrations/pypy.yaml index 808ed05c0e..1c41a8c14e 100644 --- a/recipe/migrations/pypy.yaml +++ b/recipe/migrations/pypy.yaml @@ -13,7 +13,6 @@ __migrator: bump_number: 1 # Hashes changed for cpython, so it's better to bump build numbers. python: - - 2.7.* *_cpython # [not (aarch64 or ppc64le)] - 3.6.* *_cpython - 3.7.* *_cpython - 3.8.* *_cpython @@ -23,14 +22,12 @@ numpy: - 1.14 # [not (aarch64 or ppc64le)] - 1.14 # [not (aarch64 or ppc64le)] - 1.14 # [not (aarch64 or ppc64le)] - - 1.14 # [not (aarch64 or ppc64le)] - 1.16 # [aarch64 or ppc64le] - 1.16 # [aarch64 or ppc64le] - 1.16 # [aarch64 or ppc64le] - 1.18 # [not win64] python_impl: - - cpython # [not (aarch64 or ppc64le)] - cpython - cpython - cpython @@ -42,9 +39,6 @@ zip_keys: - python - numpy - python_impl - - vc # [win] - - c_compiler # [win] - - cxx_compiler # [win] - # [linux64] - cuda_compiler_version # [linux64] - docker_image # [linux64] diff --git a/recipe/migrations/python38.yaml b/recipe/migrations/python38.yaml index a5a200e0bc..39ebf95fbb 100644 --- a/recipe/migrations/python38.yaml +++ b/recipe/migrations/python38.yaml @@ -1,35 +1,16 @@ migrator_ts: 1569538102 # The timestamp of when the migration was made -__migrator: - kind: +__migrator: + kind: version exclude: - c_compiler - vc - cxx_compiler migration_number: # Only use this if the bot messes up, putting this in will cause a complete rerun of the migration - 1 + 1 bump_number: 0 python: - - 2.7.* *_cpython # [not (aarch64 or ppc64le)] - 3.6.* *_cpython - 3.7.* *_cpython - 3.8.* *_cpython - -c_compiler: # [win] - - vs2008 # [win] - - vs2015 # [win] - - vs2015 # [win] - - vs2015 # [win] - -cxx_compiler: # [win] - - vs2008 # [win] - - vs2015 # [win] - - vs2015 # [win] - - vs2015 # [win] - -vc: # [win] - - 9 # [win] - - 14 # [win] - - 14 # [win] - - 14 # [win]