Merge branch 'master' into patch-11

Author: viniciusdc

css/theme.css

@@ -380,7 +380,7 @@ footer p {
   margin: 0;
 }
 
-:not(code):not(input)::-moz-selection {
+/* :not(code):not(input)::-moz-selection {
   text-shadow: none;
   background: #fcfcfc;
   background: rgba(255, 255, 255, 0.2);
@@ -390,7 +390,7 @@ footer p {
   text-shadow: none;
   background: #fcfcfc;
   background: rgba(255, 255, 255, 0.2);
-}
+} */
 
 img::selection {
   background: 0 0;

index.html.tmpl

@@ -140,13 +140,34 @@
                   default channel.  Unlike Miniconda, these support
                   ARMv8 64-bit (formally known as `aarch64`).
                 </p>
+                <p>
+                If you'd like to credit conda-forge in your work, you can cite our <a href="https://doi.org/10.5281/zenodo.4774216">zenodo entry</a> like this
+                <br>
+                </p>
+                <blockquote>
+                  conda-forge community. (2015). The conda-forge Project: Community-based Software Distribution Built on the conda Package Format and Ecosystem. Zenodo. http://doi.org/10.5281/zenodo.4774216
+                </blockquote>
+                <p>
+                or use this bibtex entry
+                </p>
+                <pre>{% raw %}@misc{conda_forge_community_2015_4774216,
+  author       = {conda-forge community},
+  title        = {{The conda-forge Project: Community-based Software
+                   Distribution Built on the conda Package Format and
+                   Ecosystem}},
+  month        = jul,
+  year         = 2015,
+  publisher    = {Zenodo},
+  doi          = {10.5281/zenodo.4774216},
+  url          = {https://doi.org/10.5281/zenodo.4774216}
+}{% endraw %}</pre>
                 <p> <br>
                   Learn more about conda-forge by reading our <a href="https://conda-forge.org/docs">docs</a>
                   or watching the following episode of
                   <a href="https://www.quansight.com/open-source-directions">Open Source Directions</a>.
                 </p>
                 <p align="center">
-                    <iframe width="560" class="responsive" height="315" src="https://www.youtube.com/embed/EWh-BtdYE7M" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+                    <iframe width="560" class="responsive" src="https://www.youtube.com/embed/EWh-BtdYE7M" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
                 </p>
             </div>
         </div>

src/maintainer/adding_pkgs.rst

@@ -28,12 +28,9 @@ There are multiple ways to get started:
 #. If it is an R package from `CRAN <https://cran.r-project.org/>`_, kindly
    start by using the `conda-forge helper script for R recipes <https://github.com/bgruening/conda_r_skeleton_helper>`_ instead.
    Then if necessary, you can make manual edits to the recipe.
-#. If it is a python package, you can generate the recipe as a starting point with
-   ``grayskull pypi your_package_name``. To install it you can use ``conda install -c conda-forge grayskull``. You do *not* have to use ``grayskull``, and the
-   recipes produced by ``grayskull`` will need to be reviewed and edited.
-   In particular, you'll at least need to check the build line to :ref:`use pip <use-pip>`,
-   add yourself as a maintainer,
-   and specify a ``license_file``.
+#. If it is a python package, you can generate the recipe as a starting point with ``grayskull``.
+   Use ``conda install -c conda-forge grayskull`` to install ``grayskull``, followed by ``grayskull pypi your_package_name`` to generate the recipe. Note that you do *not* necessarily have to use ``grayskull``, and the
+   recipes produced by ``grayskull`` might need to be reviewed and edited. Read more about ``grayskull`` and how to use it `here <https://github.com/conda-incubator/grayskull#introduction>`_.
 
 Your final recipe should have no comments (unless they're actually relevant to the recipe, and not generic instruction comments), and follow the order in the example.
 

src/maintainer/knowledge_base.rst

@@ -19,11 +19,24 @@ On Windows, you can also use ``nmake`` to build, but that does not need to be ex
         - make  # [not win]
         - ninja  # [win]
 
-For CMake projects using the `FindPython3 <https://cmake.org/cmake/help/git-stage/module/FindPython3.html>`__
-module, you can tell CMake which Python to use by passing ``-DPython3_EXECUTABLE="$PYTHON"``
-(macOS or Linux) or ``-DPython3_EXECUTABLE="%PYTHON%"`` (Windows) as a command line option.
+For CMake projects using the `FindPython <https://cmake.org/cmake/help/git-stage/module/FindPython.html>`__
+module, you can tell CMake which Python to use by passing ``-DPython_EXECUTABLE="$PYTHON"``
+(macOS or Linux) or ``-DPython_EXECUTABLE="%PYTHON%"`` (Windows) as a command line option.
 Older CMake projects may require similar, but slightly different options.
 
+.. tip::
+
+    Don't forget that depending on which CMake module you use you have to use a different command:
+
+    -   `FindPython <https://cmake.org/cmake/help/git-stage/module/FindPython.html>`__:
+        ``-DPython_EXECUTABLE=...``.
+    -   `FindPython3 <https://cmake.org/cmake/help/git-stage/module/FindPython3.html>`__:
+        ``-DPython3_EXECUTABLE=...``.
+    -   `FindPython2 <https://cmake.org/cmake/help/git-stage/module/FindPython2.html>`__:
+        ``-DPython2_EXECUTABLE=...``.
+
+    or if you are still on the deprecated `FindPythonLibs <https://cmake.org/cmake/help/latest/module/FindPythonLibs.html>`__: ``-DPYTHON_EXECUTABLE=...``.
+
 Some optional, but useful CMake options:
 
     - ``-DCMAKE_BUILD_TYPE=Release`` Configure as release build. This is better done on the initial
@@ -189,20 +202,20 @@ To skip building with a particular ``vc`` version, add a skip statement.
     requirements:
       build:
         - {{ compiler('cxx') }}
-        
+
 Using vs2019
 -------------
 
-To use ``vs2019`` make the following changes: 
+To use ``vs2019`` make the following changes:
 
-In conda_build_config.yaml file:    
+In conda_build_config.yaml file:
 
 .. code-block:: yaml
 
-    c_compiler:                    
-    - vs2019                       
-    cxx_compiler:                  
-    - vs2019                       
+    c_compiler:
+    - vs2019
+    cxx_compiler:
+    - vs2019
 
 
 In conda-forge.yml file:
@@ -213,8 +226,8 @@ In conda-forge.yml file:
       settings_win:
           pool:
               vmImage: windows-2019
-     
-      
+
+
 
 For example see the changes made in the ``conda_build_config.yaml`` and ``conda-forge.yml`` files in `this
 <https://github.com/conda-forge/libignition-physics-feedstock/commit/c586d765a2f5fd0ecf6da43c53315c898c9bf6bd>`_ PR.
@@ -259,12 +272,12 @@ Core Dependency Tree Packages (CDTs)
 ------------------------------------
 
 Dependencies outside of the ``conda-forge`` channel should be avoided (see :ref:`no_external_deps`).
-However, there are a few exceptions: 
+However, there are a few exceptions:
 
-Some dependencies are so close to the system that they are not packaged with ``conda-forge``. 
-These dependencies have to be satisfied with *Core Dependency Tree* (CDT) packages. 
+Some dependencies are so close to the system that they are not packaged with ``conda-forge``.
+These dependencies have to be satisfied with *Core Dependency Tree* (CDT) packages.
 
-A CDT package consists of repackaged CentOS binaries from the appropriate version, 
+A CDT package consists of repackaged CentOS binaries from the appropriate version,
 either 6 or 7 depending on user choice and platform. We manage the build of CDT
 packages using a centralized repo, `conda-forge/cdt-builds <https://github.com/conda-forge/cdt-builds>`_,
 as opposed to generating feedstocks for them. (Note that historically we did use feedstocks but this

src/maintainer/maintainer_faq.rst

@@ -91,26 +91,45 @@ FAQ
 
 :ref:`(Q) <mfaq_conda_verify>` **I am seeing** ``Importing conda-verify failed.`` **error message during build. What do I do?**
 
-   ``Importing conda-verify failed. Please be sure to test your packages. conda install conda-verify to make this message go away.``
-You are seeing this error message because by default, conda-build uses conda-verify to ensure that your recipe and package meet some minimum sanity checks. 
-This message can be safely ignored as conda-forge doesn't use conda-verify. 
+    .. code-block:: shell       
+        
+         Importing conda-verify failed. Please be sure to test your packages. conda install conda-verify to make this message go away. 
+
+  You are seeing this error message because by default, conda-build uses conda-verify to ensure that your recipe and package meet some minimum sanity checks. 
+  This message can be safely ignored as conda-forge doesn't use conda-verify. 
 
 
     .. _mfaq_version_update:
 
 :ref:`(Q) <mfaq_version_update>` **When the bot creates a pull request to a feedstock to update the version, should I approve the pull request and wait with merging until everybody else that is a code owner has approved the PR?**
 
    There is no need to approve the PR. Every maintainer can verify and merge the bot PR without waiting on the approval of the other maintainers.
-  
 
 
+    .. _mfaq_docker_139:
+
 :ref:`(Q) <mfaq_docker_139>` **How to fix "build-locally.py fails with exit code 139"?**
 
     With Linux Kernel 4.11 there were some changes in the ``vsyscall`` linking. Depending on your distribution this may cause the above error. You can fix that on Debian by editing ``/etc/default/grub`` and specifiy ``GRUB_CMDLINE_LINUX_DEFAULT="vsyscall=emulate"`` in this file. Afterwards, you need to run ``update-grub`` and reboot your system. On other Linux distributions the fix is similar but you need to edit a different configuration file to change the Linux kernel cmdline. This workaround is only needed for images based on CentOS 6 (``cos6``). You could also workaround this by forcing the CentOS 7 based images using ``DOCKER_IMAGE=quay.io/condaforge/linux-anvil-cos7-x86_64 ./build-locally.py``.
 
     The exit code 139 itself actually is the general exit code for a segmentation fault. This could also mean that you have run into a different issue but the above issue is the most likely one with our CentOS 6-based images.
 
-.. _mfaq_package_submit:
+  .. _mfaq_package_submit:
 
 :ref:`(Q) <mfaq_package_submit>` **Is it necessary for me to be an upstream maintainer of the package I submit to Conda-forge?**
-	Everybody can submit a package to Conda-forge, irrespective of whether they maintain the upstream version or not. Additionally, it’s not required but considered good practice to inform the upstream of a new package and invite them to be maintainers as well.
+
+    Everybody can submit a package to Conda-forge, irrespective of whether they maintain the upstream version or not. Additionally, it’s not required but considered good practice to inform the upstream of a new package and invite them to be maintainers as well.
+
+
+  .. _mfaq_libGL_so_1:
+
+:ref:`(Q) <mfaq_libGL_so_1>` **How do I fix the** ``libGL.so.1`` **import error?**
+
+
+  Error: 
+  
+  .. code-block:: shell
+  
+    ImportError: libGL.so.1: cannot open shared object file: No such file or directory
+    
+  To fix the error, create a  `yum_requirements.txt <https://conda-forge.org/docs/maintainer/knowledge_base.html#yum-deps>`_ file and add *mesa-libGL*.

src/orga/subteams.rst

@@ -263,3 +263,35 @@ Members
 - Anthony Scopatz <[email protected]>
 - Hadrien Mary <[email protected]>
 - Isuru Fernando <[email protected]>
+
+
+Diversity and Inclusion Sub-Team
+================================
+
+Role
+----
+Develop ``conda-forge`` as a diverse community and advocate for 
+actions impacting underrepresented groups in ``conda-forge``.
+
+Charter
+-------
+Dynamic
+
+Responsibility
+--------------
+One of the core strengths of ``conda-forge`` is the diversity of ecosystems it supports.
+Likewise, fostering and advancing a diverse community of users, maintainers, and infrastructure contributors
+is an important part of creating and maintaining a vibrant project.
+The mandate of this subteam is to support and increase the diversity of the ``conda-forge`` 
+community at all levels.
+As such this group can, but is not limited to:
+- provide a place for issues impacting diversity to be heard
+- advocate for underrepresented groups and bring their issues to the attention of core
+- run programs to maintain and grow the community's diversity and inclusiveness
+
+Members
+-------
+- Filipe Fernandes <[email protected]>
+- Christopher J. "CJ" Wright <[email protected]>
+- Marcelo Duarte Trevisani <[email protected]>
+- Peter K. G. Williams <[email protected]>

src/user/announcements.rst

@@ -5,6 +5,15 @@ Announcements
 
 Our announcements are published to an RSS feed `here <https://conda-forge.org/docs/news.rss>`_.
 
+2021
+----
+
+:2020-05-22: ``conda-forge`` is now citable!
+
+    You can now cite ``conda-forge`` using our `Zenodo entry <https://doi.org/10.5281/zenodo.4774216>`_!
+    This entry credits the entire ``conda-forge`` community for its hard work in building our
+    amazing ecosystem.
+
 2020
 ----
 

src/user/introduction.rst

@@ -30,7 +30,7 @@ This came with a list of disadvantages:
 
  - Locating packages was difficult due to them being scattered over many channels.
  - Combining packages across channels was not always possible due to binary incompatibilities.
- - Packages were only available for architectures the developer was interested in or had access to. 
+ - Packages were only available for architectures the developer was interested in or had access to.
  - Channels were often abandoned, updating required locating new channels.
 
 conda-forge is a community effort that tackles these issues:
@@ -43,32 +43,30 @@ conda-forge is a community effort that tackles these issues:
  - An active core developer team is trying to also maintain abandoned packages.
 
 
-
 How can I install packages from conda-forge?
 --------------------------------------------
 
 Using conda-forge is easy!
 
  - Make sure you have ``conda >=4.9``.
- 
+
  .. code-block:: bash
 
   conda --version
   conda update conda
-  
- - Add ``conda-forge`` as the highest priority channel. 
- 
+
+ - Add ``conda-forge`` as the highest priority channel.
+
  .. code-block:: bash
 
   conda config --add channels conda-forge
-  
+
  - Activate ``strict`` channel priority (``strict`` will be activated by default in conda 5.0).
- 
+
  .. code-block:: bash
 
   conda config --set channel_priority strict
 
-
 From now on using ``conda install <package-name>`` will also find packages in our conda-forge channels.
 
 .. note::
@@ -82,7 +80,7 @@ From now on using ``conda install <package-name>`` will also find packages in ou
 .. note::
 
   Please be aware that the order of your conda package channels is important, especially when you combine conda-forge with other channels, e.g. ``bioconda``.
-  
+
 .. note::
 
   `Miniforge <https://github.com/conda-forge/miniforge>`__ is a community
@@ -96,9 +94,36 @@ From now on using ``conda install <package-name>`` will also find packages in ou
   Please refer to :ref:`multiple_channels` for pitfalls and more information.
 
 
+How can I give credit to ``conda-forge``?
+-----------------------------------------
+
+If you'd like to credit ``conda-forge`` in your work, please cite our `Zenodo entry <https://doi.org/10.5281/zenodo.4774216>`_. This citation is
+
+::
+
+  conda-forge community. (2015). The conda-forge Project: Community-based
+  Software Distribution Built on the conda Package Format and Ecosystem.
+  Zenodo. http://doi.org/10.5281/zenodo.4774216
+
+or in `bibtex` it is
+
+::
+
+  @misc{conda_forge_community_2015_4774216,
+    author       = {conda-forge community},
+    title        = {{The conda-forge Project: Community-based Software
+         Distribution Built on the conda Package Format and
+         Ecosystem}},
+    month        = jul,
+    year         = 2015,
+    publisher    = {Zenodo},
+    doi          = {10.5281/zenodo.4774216},
+    url          = {https://doi.org/10.5281/zenodo.4774216}
+  }
+
 
 Display conda-forge packages in Anaconda Navigator
-------------------------------------------------------------
+--------------------------------------------------
 
 #. Open **Anaconda Navigator** by running ``anaconda-navigator``
 #. Go to the **Environments** tab.