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.

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

Tighten freetype pin #215

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .azure-pipelines/azure-pipelines-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ jobs:
- job: linux
pool:
vmImage: ubuntu-16.04
timeoutInMinutes: 240
timeoutInMinutes: 360
strategy:
maxParallel: 8
matrix:
linux_:
CONFIG: linux_
UPLOAD_PACKAGES: False
UPLOAD_PACKAGES: True
steps:
- script: |
sudo pip install --upgrade pip
sudo pip install setuptools shyaml
displayName: Install dependencies

# configure qemu binfmt-misc running. This allows us to run docker containers
# configure qemu binfmt-misc running. This allows us to run docker containers
# embedded qemu-static
- script: |
docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
Expand Down
39 changes: 0 additions & 39 deletions .circleci/build_steps.sh

This file was deleted.

27 changes: 0 additions & 27 deletions .circleci/checkout_merge_commit.sh

This file was deleted.

22 changes: 8 additions & 14 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,20 @@
version: 2

jobs:
build_linux_:
build:
working_directory: ~/test
machine: true
environment:
- CONFIG: "linux_"
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./.circleci/fast_finish_ci_pr_build.sh
./.circleci/checkout_merge_commit.sh
- run:
command: docker pull condaforge/linux-anvil-comp7
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./.circleci/run_docker_build.sh
# The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish.
command: exit 0

workflows:
version: 2
build_and_test:
jobs:
- build_linux_
- build:
filters:
branches:
ignore:
- /.*/
4 changes: 0 additions & 4 deletions .circleci/fast_finish_ci_pr_build.sh

This file was deleted.

57 changes: 0 additions & 57 deletions .circleci/run_docker_build.sh

This file was deleted.

7 changes: 1 addition & 6 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,9 @@ Checklist
* [ ] Used a fork of the feedstock to propose changes
* [ ] Bumped the build number (if the version is unchanged)
* [ ] Reset the build number to `0` (if the version changed)
* [ ] [Re-rendered]( https://conda-forge.org/docs/conda_smithy.html#how-to-re-render ) with the latest `conda-smithy` (Use the phrase <code>@<space/>conda-forge-admin, please rerender</code> in a comment in this PR for automated rerendering)
* [ ] [Re-rendered]( https://conda-forge.org/docs/maintainer/updating_pkgs.html#rerendering-feedstocks ) with the latest `conda-smithy` (Use the phrase <code>@<space/>conda-forge-admin, please rerender</code> in a comment in this PR for automated rerendering)
* [ ] Ensured the license file is being packaged.

### Migration
<!--
If this is an ABI incompatible change which requries a migration, please note it and ping ``@conda-forge/bot``.
-->

<!--
Please note any issues this fixes using [closing keywords]( https://help.github.com/articles/closing-issues-using-keywords/ ):
-->
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
BSD 3-clause license
Copyright (c) 2015-2018, conda-forge
Copyright (c) 2015-2019, conda-forge
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Expand Down
14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<!--
# -*- mode: jinja -*-
-->

About conda-forge-pinning
=========================

Expand All @@ -18,8 +14,14 @@ Summary: The baseline versions of software for the conda-forge ecosystem
Current build status
====================

All platforms:
[![noarch](https://img.shields.io/circleci/project/github/conda-forge/conda-forge-pinning-feedstock/master.svg?label=noarch)](https://circleci.com/gh/conda-forge/conda-forge-pinning-feedstock)

<table><tr>
<td>All platforms:</td>
<td>
<img src="https://img.shields.io/badge/noarch-disabled-lightgrey.svg" alt="noarch disabled">
</td>
</tr>
</table>

Current release info
====================
Expand Down
6 changes: 3 additions & 3 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ pin_run_as_build:
fontconfig:
max_pin: x
freetype:
max_pin: x
max_pin: x.x
gsl:
max_pin: x.x
gdal:
Expand Down Expand Up @@ -380,7 +380,7 @@ flann:
fontconfig:
- 2.13
freetype:
- 2.9.1
- 2.10.0
gf2x:
- 1.2
gdk_pixbuf:
Expand Down Expand Up @@ -557,7 +557,7 @@ sox:
sqlite:
- 3
sundials:
- 3.2
- 3.2
tk:
- 8.6 # [not ppc64le]
vc: # [win]
Expand Down