Skip to content

Commit

Permalink
Merge pull request #47 from conda-forge/jschueller-patch-1
Browse files Browse the repository at this point in the history
Update meta.yaml
  • Loading branch information
jschueller authored Oct 22, 2019
2 parents b2f645a + a5b6dc5 commit f1265d5
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .ci_support/osx_python2.7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '4'
- '9'
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '4'
- '9'
libxml2:
- '2.9'
macos_machine:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_python3.6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '4'
- '9'
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '4'
- '9'
libxml2:
- '2.9'
macos_machine:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_python3.7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '4'
- '9'
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '4'
- '9'
libxml2:
- '2.9'
macos_machine:
Expand Down
10 changes: 6 additions & 4 deletions .gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
15 changes: 10 additions & 5 deletions build-locally.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ source:
- no_pyi.patch # [osx]

build:
number: 1
number: 2
skip: true # [win and vc<14]
detect_binary_files_with_prefix: True

Expand Down

0 comments on commit f1265d5

Please sign in to comment.