From f4fb27b7dc75122e539d77ef2f56a380429ada6e Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Mon, 16 Mar 2020 09:45:29 -0500 Subject: [PATCH 1/2] DEP remove python 2.7 and vs2008 --- recipe/conda_build_config.yaml | 4 ---- recipe/meta.yaml | 2 +- recipe/migrations/pypy.yaml | 3 --- recipe/migrations/python38.yaml | 10 +++------- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index a8bf5e885f..052c4a2259 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -7,7 +7,6 @@ cross_compiler_target_platform: # [win] c_compiler: - gcc # [linux] - clang # [osx] - - vs2008 # [win] - vs2015 # [win] - vs2015 # [win] c_compiler_version: # [unix] @@ -17,7 +16,6 @@ c_compiler_version: # [unix] cxx_compiler: - gxx # [linux] - clangxx # [osx] - - vs2008 # [win] - vs2015 # [win] - vs2015 # [win] cxx_compiler_version: # [unix] @@ -562,7 +560,6 @@ poppler: proj: - 6.3.1 python: - - 2.7.* *_cpython # [not (aarch64 or ppc64le)] - 3.6.* *_cpython - 3.7.* *_cpython python_impl: @@ -598,7 +595,6 @@ tk: tiledb: - 1.7.0 vc: # [win] - - 9 # [win] - 14 # [win] - 14 # [win] vlfeat: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9d2edcef41..1dadd506e9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "2020.03.14" %} +{% set version = "2020.03.16" %} package: name: conda-forge-pinning diff --git a/recipe/migrations/pypy.yaml b/recipe/migrations/pypy.yaml index 808ed05c0e..5efe5635f9 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 diff --git a/recipe/migrations/python38.yaml b/recipe/migrations/python38.yaml index a5a200e0bc..64ea263c2a 100644 --- a/recipe/migrations/python38.yaml +++ b/recipe/migrations/python38.yaml @@ -1,35 +1,31 @@ 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] From 95d830a63290b3efc5327db169f37cac62a4bff5 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Mon, 16 Mar 2020 11:44:10 -0500 Subject: [PATCH 2/2] try to unzip --- recipe/conda_build_config.yaml | 6 ------ recipe/migrations/pypy.yaml | 3 --- recipe/migrations/python38.yaml | 15 --------------- 3 files changed, 24 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 052c4a2259..3ba9ef7f5c 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -8,7 +8,6 @@ c_compiler: - gcc # [linux] - clang # [osx] - vs2015 # [win] - - vs2015 # [win] c_compiler_version: # [unix] - 9 # [osx] - 7 # [linux64 or aarch64] @@ -17,7 +16,6 @@ cxx_compiler: - gxx # [linux] - clangxx # [osx] - vs2015 # [win] - - vs2015 # [win] cxx_compiler_version: # [unix] - 9 # [osx] - 7 # [linux64 or aarch64] @@ -126,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] @@ -596,7 +591,6 @@ tiledb: - 1.7.0 vc: # [win] - 14 # [win] - - 14 # [win] vlfeat: - 0.9.20 vtk: diff --git a/recipe/migrations/pypy.yaml b/recipe/migrations/pypy.yaml index 5efe5635f9..1c41a8c14e 100644 --- a/recipe/migrations/pypy.yaml +++ b/recipe/migrations/pypy.yaml @@ -39,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 64ea263c2a..39ebf95fbb 100644 --- a/recipe/migrations/python38.yaml +++ b/recipe/migrations/python38.yaml @@ -14,18 +14,3 @@ python: - 3.6.* *_cpython - 3.7.* *_cpython - 3.8.* *_cpython - -c_compiler: # [win] - - vs2015 # [win] - - vs2015 # [win] - - vs2015 # [win] - -cxx_compiler: # [win] - - vs2015 # [win] - - vs2015 # [win] - - vs2015 # [win] - -vc: # [win] - - 14 # [win] - - 14 # [win] - - 14 # [win]