Skip to content

Commit 0dd18e9

Browse files
Re-ran make.py. [ci skip]
1 parent fc9f94b commit 0dd18e9

File tree

91 files changed

+320
-280
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+320
-280
lines changed

docs/README.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<html xmlns="http://www.w3.org/1999/xhtml">
77
<head>
88
<meta charset="utf-8" />
9-
<title>&lt;no title&gt; &#8212; conda-forge 2020.11.02 documentation</title>
9+
<title>&lt;no title&gt; &#8212; conda-forge 2020.11.05 documentation</title>
1010
<link rel="stylesheet" href="_static/cloud.css" type="text/css" />
1111
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
1212
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Noticia+Text|Open+Sans|Droid+Sans+Mono" type="text/css" />
@@ -45,7 +45,7 @@ <h3>Navigation</h3>
4545
<li class="right" style="margin-right: 10px">
4646
<a href="genindex.html" title="General Index"
4747
accesskey="I">index</a></li>
48-
<li><a href="index.html">conda-forge 2020.11.02 documentation</a> &#187;</li>
48+
<li><a href="index.html">conda-forge 2020.11.05 documentation</a> &#187;</li>
4949

5050
</ul>
5151
</div>
@@ -125,7 +125,7 @@ <h3>Navigation</h3>
125125
<li class="right" style="margin-right: 10px">
126126
<a href="genindex.html" title="General Index"
127127
>index</a></li>
128-
<li><a href="index.html">conda-forge 2020.11.02 documentation</a> &#187;</li>
128+
<li><a href="index.html">conda-forge 2020.11.05 documentation</a> &#187;</li>
129129

130130
</ul>
131131
</div>

docs/_sources/maintainer/knowledge_base.rst.txt

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -992,20 +992,42 @@ To use a new SDK, add the following in ``recipe/conda_build_config.yaml``
992992

993993
.. code-block:: yaml
994994
995-
MACOSX_DEPLOYMENT_TARGET: # [osx]
996-
- 10.12 # [osx]
995+
# Please consult conda-forge/core before doing this
996+
MACOSX_SDK_VERSION: # [osx and x86_64]
997+
- 10.12 # [osx and x86_64]
998+
999+
Note that this should be done if the error you are getting says that a header is not
1000+
found or a macro is not defined. This will make your package compile with a newer SDK
1001+
but with ``10.9`` as the deployment target.
1002+
WARNING: some packages might use features from ``10.12`` if you do the above due to
1003+
buggy symbol availability checks. For example packages looking for ``clock_gettime``
1004+
will see it as it will be a weak symbol, but the package might not have a codepath
1005+
to handle the weak symbol, in that case, you need to update the ``MACOSX_DEPLOYMENT_TARGET``
1006+
as described below.
1007+
1008+
After increasing the SDK version, if you are getting an error that says that a function
1009+
is available only for macOS x.x, then do the following in ``recipe/conda_build_config.yaml``,
1010+
1011+
.. code-block:: yaml
1012+
1013+
# Please consult conda-forge/core before doing this
1014+
MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64]
1015+
- 10.12 # [osx and x86_64]
1016+
MACOSX_SDK_VERSION: # [osx and x86_64]
1017+
- 10.12 # [osx and x86_64]
1018+
9971019
9981020
In ``recipe/meta.yaml``, add the following to ensure that the user's system is compatible.
9991021

10001022
.. code-block:: yaml
10011023
10021024
requirements:
1003-
run_constrained:
1004-
- __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx]
1025+
run:
1026+
- __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64]
10051027
1006-
Note that the requirement is a `run_constrained`, because the ``__osx`` virtual package
1007-
is supported only by ``conda>=4.8``. Once that conda version is used widely, the
1008-
requirement will be changed from ``run_constrained`` to ``run``.
1028+
Note that this requires ``conda>=4.8``. If you want to support older conda versions
1029+
the requirement should be changed from ``run`` to ``run_constrained``. Note that
1030+
``conda<4.8`` will ignore the condition if it's a ``run_constrained`` on ``__osx``.
10091031

10101032

10111033
PyPy builds

docs/_static/documentation_options.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var DOCUMENTATION_OPTIONS = {
22
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
3-
VERSION: '2020.11.02',
3+
VERSION: '2020.11.05',
44
LANGUAGE: 'None',
55
COLLAPSE_INDEX: false,
66
BUILDER: 'html',

docs/contracting/00_intro.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<html xmlns="http://www.w3.org/1999/xhtml">
77
<head>
88
<meta charset="utf-8" />
9-
<title>Contracting Information &#8212; conda-forge 2020.11.02 documentation</title>
9+
<title>Contracting Information &#8212; conda-forge 2020.11.05 documentation</title>
1010
<link rel="stylesheet" href="../_static/cloud.css" type="text/css" />
1111
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
1212
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Noticia+Text|Open+Sans|Droid+Sans+Mono" type="text/css" />
@@ -49,7 +49,7 @@ <h3>Navigation</h3>
4949
<li class="right" >
5050
<a href="../misc/00_intro.html" title="Miscellaneous"
5151
accesskey="P">previous</a> &nbsp; &nbsp;</li>
52-
<li><a href="../index.html">conda-forge 2020.11.02 documentation</a> &#187;</li>
52+
<li><a href="../index.html">conda-forge 2020.11.05 documentation</a> &#187;</li>
5353

5454
</ul>
5555
</div>
@@ -177,7 +177,7 @@ <h3>Navigation</h3>
177177
<li class="right" >
178178
<a href="../misc/00_intro.html" title="Miscellaneous"
179179
>previous</a> &nbsp; &nbsp;</li>
180-
<li><a href="../index.html">conda-forge 2020.11.02 documentation</a> &#187;</li>
180+
<li><a href="../index.html">conda-forge 2020.11.05 documentation</a> &#187;</li>
181181

182182
</ul>
183183
</div>

docs/genindex.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<html xmlns="http://www.w3.org/1999/xhtml">
88
<head>
99
<meta charset="utf-8" />
10-
<title>Index &#8212; conda-forge 2020.11.02 documentation</title>
10+
<title>Index &#8212; conda-forge 2020.11.05 documentation</title>
1111
<link rel="stylesheet" href="_static/cloud.css" type="text/css" />
1212
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
1313
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Noticia+Text|Open+Sans|Droid+Sans+Mono" type="text/css" />
@@ -46,7 +46,7 @@ <h3>Navigation</h3>
4646
<li class="right" style="margin-right: 10px">
4747
<a href="#" title="General Index"
4848
accesskey="I">index</a></li>
49-
<li><a href="index.html">conda-forge 2020.11.02 documentation</a> &#187;</li>
49+
<li><a href="index.html">conda-forge 2020.11.05 documentation</a> &#187;</li>
5050

5151
</ul>
5252
</div>
@@ -154,7 +154,7 @@ <h3>Navigation</h3>
154154
<li class="right" style="margin-right: 10px">
155155
<a href="#" title="General Index"
156156
>index</a></li>
157-
<li><a href="index.html">conda-forge 2020.11.02 documentation</a> &#187;</li>
157+
<li><a href="index.html">conda-forge 2020.11.05 documentation</a> &#187;</li>
158158

159159
</ul>
160160
</div>

docs/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<html xmlns="http://www.w3.org/1999/xhtml">
77
<head>
88
<meta charset="utf-8" />
9-
<title>Table of Contents &#8212; conda-forge 2020.11.02 documentation</title>
9+
<title>Table of Contents &#8212; conda-forge 2020.11.05 documentation</title>
1010
<link rel="stylesheet" href="_static/cloud.css" type="text/css" />
1111
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
1212
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Noticia+Text|Open+Sans|Droid+Sans+Mono" type="text/css" />
@@ -49,7 +49,7 @@ <h3>Navigation</h3>
4949
<li class="right" >
5050
<a href="user/00_intro.html" title="User Documentation"
5151
accesskey="N">next</a> &nbsp; &nbsp;</li>
52-
<li><a href="#">conda-forge 2020.11.02 documentation</a> &#187;</li>
52+
<li><a href="#">conda-forge 2020.11.05 documentation</a> &#187;</li>
5353

5454
</ul>
5555
</div>
@@ -181,7 +181,7 @@ <h3>Navigation</h3>
181181
<li class="right" >
182182
<a href="user/00_intro.html" title="User Documentation"
183183
>next</a> &nbsp; &nbsp;</li>
184-
<li><a href="#">conda-forge 2020.11.02 documentation</a> &#187;</li>
184+
<li><a href="#">conda-forge 2020.11.05 documentation</a> &#187;</li>
185185

186186
</ul>
187187
</div>

docs/maintainer/00_intro.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<html xmlns="http://www.w3.org/1999/xhtml">
77
<head>
88
<meta charset="utf-8" />
9-
<title>Maintainer Documentation &#8212; conda-forge 2020.11.02 documentation</title>
9+
<title>Maintainer Documentation &#8212; conda-forge 2020.11.05 documentation</title>
1010
<link rel="stylesheet" href="../_static/cloud.css" type="text/css" />
1111
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
1212
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Noticia+Text|Open+Sans|Droid+Sans+Mono" type="text/css" />
@@ -53,7 +53,7 @@ <h3>Navigation</h3>
5353
<li class="right" >
5454
<a href="../user/how_to_get_help.html" title="How to get help in conda-forge"
5555
accesskey="P">previous</a> &nbsp; &nbsp;</li>
56-
<li><a href="../index.html">conda-forge 2020.11.02 documentation</a> &#187;</li>
56+
<li><a href="../index.html">conda-forge 2020.11.05 documentation</a> &#187;</li>
5757

5858
</ul>
5959
</div>
@@ -410,7 +410,7 @@ <h3>Navigation</h3>
410410
<li class="right" >
411411
<a href="../user/how_to_get_help.html" title="How to get help in conda-forge"
412412
>previous</a> &nbsp; &nbsp;</li>
413-
<li><a href="../index.html">conda-forge 2020.11.02 documentation</a> &#187;</li>
413+
<li><a href="../index.html">conda-forge 2020.11.05 documentation</a> &#187;</li>
414414

415415
</ul>
416416
</div>

docs/maintainer/adding_pkgs.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<html xmlns="http://www.w3.org/1999/xhtml">
77
<head>
88
<meta charset="utf-8" />
9-
<title>Contributing packages &#8212; conda-forge 2020.11.02 documentation</title>
9+
<title>Contributing packages &#8212; conda-forge 2020.11.05 documentation</title>
1010
<link rel="stylesheet" href="../_static/cloud.css" type="text/css" />
1111
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
1212
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Noticia+Text|Open+Sans|Droid+Sans+Mono" type="text/css" />
@@ -53,7 +53,7 @@ <h3>Navigation</h3>
5353
<li class="right" >
5454
<a href="infrastructure.html" title="Infrastructure"
5555
accesskey="P">previous</a> &nbsp; &nbsp;</li>
56-
<li><a href="../index.html">conda-forge 2020.11.02 documentation</a> &#187;</li>
56+
<li><a href="../index.html">conda-forge 2020.11.05 documentation</a> &#187;</li>
5757

5858
<li class="nav-item nav-item-1"><a href="00_intro.html" accesskey="U">Maintainer Documentation</a> &#187;</li>
5959
</ul>
@@ -886,7 +886,7 @@ <h3>Navigation</h3>
886886
<li class="right" >
887887
<a href="infrastructure.html" title="Infrastructure"
888888
>previous</a> &nbsp; &nbsp;</li>
889-
<li><a href="../index.html">conda-forge 2020.11.02 documentation</a> &#187;</li>
889+
<li><a href="../index.html">conda-forge 2020.11.05 documentation</a> &#187;</li>
890890

891891
<li class="nav-item nav-item-1"><a href="00_intro.html" >Maintainer Documentation</a> &#187;</li>
892892
</ul>

docs/maintainer/conda_forge_yml.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<html xmlns="http://www.w3.org/1999/xhtml">
77
<head>
88
<meta charset="utf-8" />
9-
<title>Configuring conda-forge.yml &#8212; conda-forge 2020.11.02 documentation</title>
9+
<title>Configuring conda-forge.yml &#8212; conda-forge 2020.11.05 documentation</title>
1010
<link rel="stylesheet" href="../_static/cloud.css" type="text/css" />
1111
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
1212
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Noticia+Text|Open+Sans|Droid+Sans+Mono" type="text/css" />
@@ -53,7 +53,7 @@ <h3>Navigation</h3>
5353
<li class="right" >
5454
<a href="pinning_deps.html" title="Pinned dependencies"
5555
accesskey="P">previous</a> &nbsp; &nbsp;</li>
56-
<li><a href="../index.html">conda-forge 2020.11.02 documentation</a> &#187;</li>
56+
<li><a href="../index.html">conda-forge 2020.11.05 documentation</a> &#187;</li>
5757

5858
<li class="nav-item nav-item-1"><a href="00_intro.html" accesskey="U">Maintainer Documentation</a> &#187;</li>
5959
</ul>
@@ -567,7 +567,7 @@ <h3>Navigation</h3>
567567
<li class="right" >
568568
<a href="pinning_deps.html" title="Pinned dependencies"
569569
>previous</a> &nbsp; &nbsp;</li>
570-
<li><a href="../index.html">conda-forge 2020.11.02 documentation</a> &#187;</li>
570+
<li><a href="../index.html">conda-forge 2020.11.05 documentation</a> &#187;</li>
571571

572572
<li class="nav-item nav-item-1"><a href="00_intro.html" >Maintainer Documentation</a> &#187;</li>
573573
</ul>

docs/maintainer/infrastructure.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<html xmlns="http://www.w3.org/1999/xhtml">
77
<head>
88
<meta charset="utf-8" />
9-
<title>Infrastructure &#8212; conda-forge 2020.11.02 documentation</title>
9+
<title>Infrastructure &#8212; conda-forge 2020.11.05 documentation</title>
1010
<link rel="stylesheet" href="../_static/cloud.css" type="text/css" />
1111
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
1212
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Noticia+Text|Open+Sans|Droid+Sans+Mono" type="text/css" />
@@ -53,7 +53,7 @@ <h3>Navigation</h3>
5353
<li class="right" >
5454
<a href="00_intro.html" title="Maintainer Documentation"
5555
accesskey="P">previous</a> &nbsp; &nbsp;</li>
56-
<li><a href="../index.html">conda-forge 2020.11.02 documentation</a> &#187;</li>
56+
<li><a href="../index.html">conda-forge 2020.11.05 documentation</a> &#187;</li>
5757

5858
<li class="nav-item nav-item-1"><a href="00_intro.html" accesskey="U">Maintainer Documentation</a> &#187;</li>
5959
</ul>
@@ -488,7 +488,7 @@ <h3>Navigation</h3>
488488
<li class="right" >
489489
<a href="00_intro.html" title="Maintainer Documentation"
490490
>previous</a> &nbsp; &nbsp;</li>
491-
<li><a href="../index.html">conda-forge 2020.11.02 documentation</a> &#187;</li>
491+
<li><a href="../index.html">conda-forge 2020.11.05 documentation</a> &#187;</li>
492492

493493
<li class="nav-item nav-item-1"><a href="00_intro.html" >Maintainer Documentation</a> &#187;</li>
494494
</ul>

0 commit comments

Comments
 (0)