Skip to content

Commit

Permalink
MNT: Re-rendered with conda-build 3.18.9, conda-smithy 3.6.0, and con…
Browse files Browse the repository at this point in the history
…da-forge-pinning 2019.10.11

[ci skip][skip ci][skip appveyor]
  • Loading branch information
ocefpaf committed Oct 14, 2019
1 parent 803c626 commit 98c35a0
Show file tree
Hide file tree
Showing 12 changed files with 164 additions and 20 deletions.
11 changes: 8 additions & 3 deletions .azure-pipelines/azure-pipelines-linux.yml

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

3 changes: 2 additions & 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.

4 changes: 3 additions & 1 deletion .azure-pipelines/azure-pipelines-win.yml

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

17 changes: 15 additions & 2 deletions .ci_support/linux_.yaml → .ci_support/linux_ruby2.5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,13 @@ icu:
jpeg:
- '9'
libpng:
- 1.6.35
- '1.6'
libxml2:
- '2.9'
nspr:
- '4.20'
nss:
- '3.39'
openssl:
- 1.1.1a
pin_run_as_build:
Expand All @@ -53,14 +57,23 @@ pin_run_as_build:
max_pin: x.x
libxml2:
max_pin: x.x
nspr:
max_pin: x
nss:
max_pin: x
openssl:
max_pin: x.x.x
readline:
max_pin: x
sqlite:
max_pin: x
zlib:
max_pin: x.x
readline:
- '8.0'
ruby:
- '2.5'
sqlite:
- '3'
zlib:
- '1.2'

79 changes: 79 additions & 0 deletions .ci_support/linux_ruby2.6.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
c_compiler:
- gcc
c_compiler_version:
- '7'
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '7'
dbus:
- '1'
docker_image:
- condaforge/linux-anvil-comp7
expat:
- '2.2'
fontconfig:
- '2.13'
freetype:
- 2.9.1
glib:
- '2.58'
gst_plugins_base:
- 1.14.4
gstreamer:
- 1.14.4
icu:
- '64.2'
jpeg:
- '9'
libpng:
- '1.6'
libxml2:
- '2.9'
nspr:
- '4.20'
nss:
- '3.39'
openssl:
- 1.1.1a
pin_run_as_build:
dbus:
max_pin: x
expat:
max_pin: x.x
fontconfig:
max_pin: x
freetype:
max_pin: x
icu:
max_pin: x
jpeg:
max_pin: x
libpng:
max_pin: x.x
libxml2:
max_pin: x.x
nspr:
max_pin: x
nss:
max_pin: x
openssl:
max_pin: x.x.x
readline:
max_pin: x
sqlite:
max_pin: x
zlib:
max_pin: x.x
readline:
- '8.0'
ruby:
- '2.6'
sqlite:
- '3'
zlib:
- '1.2'
14 changes: 11 additions & 3 deletions .ci_support/osx_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,29 @@ 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'
icu:
- '64.2'
jpeg:
- '9'
libpng:
- 1.6.35
- '1.6'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
nspr:
- '4.20'
nss:
- '3.39'
openssl:
- 1.1.1a
pin_run_as_build:
Expand All @@ -31,6 +35,10 @@ pin_run_as_build:
max_pin: x
libpng:
max_pin: x.x
nspr:
max_pin: x
nss:
max_pin: x
openssl:
max_pin: x.x.x
sqlite:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_cxx_compilervs2015vc14.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ icu:
jpeg:
- '9'
libpng:
- 1.6.35
- '1.6'
openssl:
- 1.1.1a
pin_run_as_build:
Expand Down
17 changes: 17 additions & 0 deletions .gitattributes

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

Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ source run_conda_forge_build_setup
# "recipe/yum_requirements.txt" file. After updating that file,
# run "conda smithy rerender" and this line will be updated
# automatically.
/usr/bin/sudo -n yum install -y mesa-libGL libX11-devel libXt-devel libXext-devel chrpath libXrender-devel gtk2-devel dbus-devel libSM-devel libICE-devel xorg-x11-server-Xvfb ruby
/usr/bin/sudo -n yum install -y libX11-devel libXt-devel libXext-devel chrpath libXrender-devel gtk2-devel dbus-devel libSM-devel libICE-devel xorg-x11-server-Xvfb ruby


# make the build number clobber
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ docker run ${DOCKER_RUN_ARGS} \
-e BINSTAR_TOKEN \
-e HOST_USER_ID \
-e UPLOAD_PACKAGES \
-e GIT_BRANCH \
-e UPLOAD_ON_BRANCH \
-e CI \
$DOCKER_IMAGE \
bash \
Expand Down
18 changes: 15 additions & 3 deletions README.md

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

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.

0 comments on commit 98c35a0

Please sign in to comment.