Skip to content

Commit

Permalink
Merge branch 'master' into py2-bye-bye
Browse files Browse the repository at this point in the history
  • Loading branch information
beckermr authored Mar 19, 2020
2 parents 95d830a + 4cb9674 commit 85a2e67
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 16 deletions.
6 changes: 2 additions & 4 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,6 @@ BUILD: armv7-conda_cos7-linux-gnueabihf # [armv7l]

# TODO: remove these when run_exports are added to the packages.
pin_run_as_build:
abseil-cpp:
max_pin: x.x
arpack:
max_pin: x.x.x
boost:
Expand Down Expand Up @@ -343,7 +341,7 @@ blas_impl:
- blis # [x86 or x86_64]

abseil_cpp:
- 20190808.0
- 20200225.1
arb:
- 2.17
arpack:
Expand Down Expand Up @@ -391,7 +389,7 @@ gst_plugins_base:
gdal:
- 3.0
geos:
- 3.8.0
- 3.8.1
geotiff:
- 1.5.1
giflib:
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "2020.03.16" %}
{% set version = "2020.03.20" %}

package:
name: conda-forge-pinning
Expand Down
11 changes: 0 additions & 11 deletions recipe/migrations/abseilcpp20200225-1.yaml

This file was deleted.

0 comments on commit 85a2e67

Please sign in to comment.