Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEP remove python 2.7 and vs2008 #491

Merged
merged 3 commits into from
Mar 19, 2020
Merged

DEP remove python 2.7 and vs2008 #491

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4fb27b
DEP remove python 2.7 and vs2008
beckermr Mar 16, 2020
95d830a
try to unzip
beckermr Mar 16, 2020
85a2e67
Merge branch 'master' into py2-bye-bye
beckermr Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -562,7 +555,6 @@ poppler:
proj:
- 6.3.1
python:
- 2.7.* *_cpython # [not (aarch64 or ppc64le)]
- 3.6.* *_cpython
- 3.7.* *_cpython
python_impl:
Expand Down Expand Up @@ -598,8 +590,6 @@ tk:
tiledb:
- 1.7.0
vc: # [win]
- 9 # [win]
- 14 # [win]
- 14 # [win]
vlfeat:
- 0.9.20
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "2020.03.14" %}
{% set version = "2020.03.16" %}

package:
name: conda-forge-pinning
Expand Down
6 changes: 0 additions & 6 deletions recipe/migrations/pypy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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]
25 changes: 3 additions & 22 deletions recipe/migrations/python38.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]