Skip to content

Commit 5166bf8

Browse files
authored
Merge branch 'main' into 2023-05-03-meeting-notes
2 parents 22d00e4 + fbc8321 commit 5166bf8

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

src/maintainer/conda_forge_yml.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@ automatic version updates/migrations for feedstocks. The current options are
128128
# to the default branch
129129
abi_migration_branches:
130130
- v1.10.x
131+
132+
version_updates:
133+
# use this for packages that are updated too frequently
134+
random_fraction_to_keep: 0.1 # keeps 10% of versions at random
131135
132136
The ``abi_migration_branches`` feature is useful to, for example, add a
133137
long-term support (LTS) branch for a package.

src/maintainer/infrastructure.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,14 @@ that adds the given user to the feedstock. A maintainer or member of ``core`` ca
157157
this PR to add the user. Please do not modify this PR or adjust the commit message. This
158158
PR is designed to skip building the package.
159159

160+
@conda-forge-admin, update version
161+
----------------------------------
162+
163+
Entering the above phrase in the title of an issue on a feedstock will request the bot
164+
to check if there are any new versions available. If there are, it will open a PR with
165+
with the needed changes. Note that the bot might start by opening a PR with only partial
166+
changes. The rest of the contents will be added in a subsequent commit after a few minutes.
167+
160168

161169
CI build services
162170
=================

src/maintainer/knowledge_base.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ Tips & tricks for CMD/Batch syntax
231231
Windows recipes rely on CMD/Batch scripts (``.bat``) by default.
232232
Batch syntax is a bit different from Bash and friends on Unix, so we have collected some tips here to help you get started if you are not familiar with this scripting language.
233233

234-
* Check if you need to write a Batch script first!
234+
* Check if you need to write a Batch script first!
235235
Simple recipes might not need shell-specific code and can be written in an agnostic way.
236236
Use the ``build.script`` item in ``meta.yaml`` (see `conda-build docs <https://docs.conda.io/projects/conda-build/en/stable/resources/define-metadata.html#script>`__).
237237
This item can take a string or a list of strings (one per line).
@@ -305,7 +305,7 @@ In the build script, it would need to update the config files and guard any test
305305
306306
# Get an updated config.sub and config.guess
307307
cp $BUILD_PREFIX/share/gnuconfig/config.* .
308-
308+
309309
# Skip ``make check`` when cross-compiling
310310
if [[ "${CONDA_BUILD_CROSS_COMPILATION}" != "1" ]]; then
311311
make check
@@ -1694,7 +1694,7 @@ You are also free to download recipes and rebuild them yourself, if you would li
16941694
2. Each feedstock can only upload packages for that feedstock. This is enforced by using a cf-staging channel where builds are first sent.
16951695
A bot then assesses that the submitting feedstock has permission to build the package it has submitted, and only then will it relay the build to the conda-forge channel.
16961696
This helps mitigate against a bad actor gaining access to an inconspicuous feedstock and then trying to push a build with malicious code into essential infrastructure packages (e.g., OpenSSL or Python).
1697-
3. We have `artifact-validation <https://github.com/conda-forge/artifact-validation>`__ for validating all the ``conda-forge`` artifacts before they are uploaded to ``anaconda.org``. This validation looks for various security-related items, such as artifacts that overwrite key pieces of certain packages.
1697+
3. We have `artifact-validation <https://github.com/conda-forge/artifact-validation>`__ for validating all the ``conda-forge`` artifacts uploaded to ``anaconda.org``. This validation scans for various security-related items, such as artifacts that overwrite key pieces of certain packages.
16981698
4. We have a dedicated `Security and Systems Sub-Team <https://conda-forge.org/docs/orga/subteams.html?highlight=security+team#security-and-systems-sub-team>`__ who works hard towards making sure to secure and maintain appropriate access to the credentials and services/systems used by ``conda-forge``.
16991699
17001700
Significant Changes To Upstream Projects

0 commit comments

Comments
 (0)