Skip to content

Commit

Permalink
MNT: Re-rendered with conda-smithy 3.1.11 and pinning 2018.08.05
Browse files Browse the repository at this point in the history
  • Loading branch information
jjhelmus committed Aug 14, 2018
1 parent 4139796 commit d0d6c02
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 24 deletions.
5 changes: 1 addition & 4 deletions .appveyor.yml
Expand Up @@ -9,10 +9,7 @@ environment:
secure: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1

matrix:
- CONFIG: win_c_compilervs2008cxx_compilervs2008
CONDA_INSTALL_LOCN: C:\Miniconda36-x64

- CONFIG: win_c_compilervs2015cxx_compilervs2015
- CONFIG: win_c_compilervs2015cxx_compilervs2015vc14
CONDA_INSTALL_LOCN: C:\Miniconda36-x64


Expand Down
12 changes: 0 additions & 12 deletions .ci_support/win_c_compilervs2008cxx_compilervs2008.yaml

This file was deleted.

Expand Up @@ -3,10 +3,15 @@ c_compiler:
cxx_compiler:
- vs2015
pin_run_as_build:
vc:
max_pin: x
zlib:
max_pin: x.x
vc:
- '14'
zip_keys:
- - c_compiler
- - vc
- c_compiler
- cxx_compiler
zlib:
- '1.2'
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Expand Up @@ -6,7 +6,7 @@ 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`
* [ ] [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)
* [ ] Ensured the license file is being packaged.

<!--
Expand Down
15 changes: 9 additions & 6 deletions README.md
Expand Up @@ -9,6 +9,9 @@ Feedstock license: BSD 3-Clause

Summary: Protocol Buffers - Google's data interchange format. C++ Libraries

Protocol buffers are Google's language-neutral,
platform-neutral, extensible mechanism for serializing structured data-
think XML, but smaller, faster, and simpler.


Current build status
Expand Down Expand Up @@ -58,13 +61,13 @@ for each of the installable packages. Such a repository is known as a *feedstock
A feedstock is made up of a conda recipe (the instructions on what and how to build
the package) and the necessary configurations for automatic building using freely
available continuous integration services. Thanks to the awesome service provided by
[CircleCI](https://circleci.com/), [AppVeyor](http://www.appveyor.com/)
[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/)
and [TravisCI](https://travis-ci.org/) it is possible to build and upload installable
packages to the [conda-forge](https://anaconda.org/conda-forge)
[Anaconda-Cloud](http://docs.anaconda.org/) channel for Linux, Windows and OSX respectively.
[Anaconda-Cloud](https://anaconda.org/) channel for Linux, Windows and OSX respectively.

To manage the continuous integration and simplify feedstock maintenance
[conda-smithy](http://github.com/conda-forge/conda-smithy) has been developed.
[conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed.
Using the ``conda-forge.yml`` within this repository, it is possible to re-render all of
this feedstock's supporting files (e.g. the CI configuration files) with ``conda smithy rerender``.

Expand Down Expand Up @@ -100,7 +103,7 @@ build distinct package versions.

In order to produce a uniquely identifiable distribution:
* If the version of a package **is not** being increased, please add or increase
the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string).
the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string).
* If the version of a package **is** being increased, please remember to return
the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string)
back to 0.
the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string)
back to 0.

0 comments on commit d0d6c02

Please sign in to comment.