Merge branch 'main' into bump-netcdf4_1.7.2_to_1.7.3_for_emscripten-4x

Author: IsabelParedes

.github/copilot-instructions.md

@@ -91,7 +91,7 @@ To build the recipe you worked on with rattler-build with:
 
   rattler-build build \
   --package-format tar-bz2 \
-  -c https://repo.prefix.dev/emscripten-forge-dev \
+  -c https://repo.prefix.dev/emscripten-forge-4x \
   -c microsoft \
   -c conda-forge \
   --target-platform emscripten-wasm32 \

.github/workflows/build_docs.yaml

@@ -24,7 +24,7 @@ jobs:
       # SETUP
       ################################################################
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

.github/workflows/build_recipes.yaml

@@ -3,7 +3,7 @@ name: Build Recipes
 on:
   push:
     branches:
-      - "emscripten-4x"
+      - "main"
     paths:
       - "recipes/**"
   pull_request:
@@ -15,6 +15,7 @@ jobs:
   build_recipes:
     runs-on: ubuntu-latest
     env:
+      FORCE_COLOR: 1
       TARGET_PLATFORM: emscripten-wasm32
       GITHUB_OWNER: "emscripten-forge"
     strategy:
@@ -25,17 +26,10 @@ jobs:
       # SETUP
       ################################################################
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
-      - name: Maximize build space
-        run: |
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
-          sudo rm -rf "/usr/local/share/boost"
-          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-
       - name: apt-install playwright dependencies
         run: |
           sudo apt-get update -y && sudo apt-get install -y  \
@@ -76,7 +70,7 @@ jobs:
         shell: bash -el {0}
         if: github.event_name == 'push'
         run: |
-          python -m emci build changed $GITHUB_WORKSPACE/ origin/emscripten-4x~1 origin/emscripten-4x
+          python -m emci build changed $GITHUB_WORKSPACE/ origin/main~1 origin/main
 
       ################################################################
       # PULL_REQUEST
@@ -85,7 +79,7 @@ jobs:
         shell: bash -el {0}
         if: github.event_name == 'pull_request'
         run: |
-          python -m emci build changed $GITHUB_WORKSPACE/ origin/emscripten-4x HEAD
+          python -m emci build changed $GITHUB_WORKSPACE/ origin/main HEAD
 
       ################################################################
       # UPLOAD

.github/workflows/copilot-setup-steps.yml

@@ -27,7 +27,7 @@ jobs:
     steps:
 
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
-      - uses: prefix-dev/setup-pixi@v0.9.0
+      - uses: prefix-dev/setup-pixi@v0.9.0

.github/workflows/delete_package.py

@@ -6,14 +6,14 @@ def main():
     parser = argparse.ArgumentParser(description='Delete a package from prefix.dev')
     parser.add_argument('--token', required=True, help='API token')
     parser.add_argument('--package', required=True, help='Package file name')
-
+    parser.add_argument('--channel', required=True, help='Package file name')
     args = parser.parse_args()
 
     token = args.token
     package_file_name = args.package
+    channel = args.channel
 
     base_url = "https://prefix.dev/api/v1"
-    channel = "emscripten-forge-dev"
     subdir = "emscripten-wasm32"
     headers = {"Authorization": f"Bearer {token}"}
     delete_url = f"{base_url}/delete/{channel}/{subdir}/{package_file_name}"

.github/workflows/delete_package.yaml

@@ -7,13 +7,17 @@ on:
         description: Name of the package to be deleted
         required: true
         default: myBadPackage-9.4.0-py313h6e18b15_0.tar.bz2
+      channel_name:
+        description: Name of the channel
+        required: true
+        default: emscripten-forge-4x
 
 jobs:
   delete_package:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install micromamba
         uses: mamba-org/setup-micromamba@v2
@@ -29,7 +33,10 @@ jobs:
         env:
           PREFIX_DEV_API_KEY: ${{ secrets.PREFIX_DEV_API_KEY }}
           PACKAGE_NAME: ${{ github.event.inputs.package_name }}
+          CHANNEL_NAME: ${{ github.event.inputs.channel_name }}
         run: |
           python .github/workflows/delete_package.py \
-            --token "$PREFIX_DEV_API_KEY" --package "$PACKAGE_NAME"
+            --token "$PREFIX_DEV_API_KEY" \
+            --package "$PACKAGE_NAME" \
+            --channel "$CHANNEL_NAME"
 

.github/workflows/lint_recipes.yaml

@@ -15,13 +15,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           ref: ${{ github.sha }}
 
-      - name: Fetch emscripten-4x branch
-        run: git fetch origin emscripten-4x
+      - name: Fetch main branch
+        run: git fetch origin main
 
       - name: Install micromamba
         uses: mamba-org/setup-micromamba@v2
@@ -36,7 +36,7 @@ jobs:
           set -e
 
           if [ "${{ github.event_name }}" = "pull_request" ]; then
-            BASE_REF="origin/emscripten-4x"
+            BASE_REF="origin/main"
             HEAD_REF="HEAD"
           else
             BASE_REF="HEAD~1"

.github/workflows/new_versions.yaml

@@ -5,17 +5,18 @@ on:
   schedule:
   - cron: '0 0 * * *'
 
+
 jobs:
 
   update_versions:
     strategy:
       matrix:
-        branch: [main]
+        branch: [main, emscripten-3x]
 
     if: (github.event_name == 'schedule' && github.repository == 'emscripten-forge/recipes') || (github.event_name != 'schedule')
     runs-on: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           ref: main
 
@@ -26,6 +27,6 @@ jobs:
 
       - name: Determine new package version and open/merge PRs
         shell: bash -l -eo pipefail {0}
-        run:  python -m emci bot bump-recipes-versions  ${{ matrix.branch }}
+        run:  python -m emci bot bump-recipes-versions ${{ matrix.branch }}
         env:
           GITHUB_TOKEN: ${{ secrets.BOT_ACCESS_TOKEN }}

.github/workflows/update_matplotlib_fontcache.yaml

@@ -0,0 +1,35 @@
+name: Matplotlib Fontcache Update Bot
+
+on:
+  workflow_dispatch:
+  schedule:
+  - cron: '0 0 * * *'
+
+jobs:
+
+  update_matplotlib_fontcache:
+    strategy:
+      fail-fast: false
+
+    if: (github.event_name == 'schedule' && github.repository == 'emscripten-forge/recipes') || (github.event_name != 'schedule')
+    runs-on: [ubuntu-latest]
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          ref: ${{ matrix.branch }}
+
+      - name: Install micromamba
+        uses: mamba-org/setup-micromamba@v2
+        with:
+          environment-file: ci_env.yml
+          create-args: >-
+            microsoft::playwright
+            pyjs_code_runner
+
+      - name: Update matplotlib font cache if needed
+        shell: bash -l -eo pipefail {0}
+        run: |
+          playwright install
+          python -m emci bot update-matplotlib-fontcache main
+        env:
+          GITHUB_TOKEN: ${{ secrets.BOT_ACCESS_TOKEN }}

docs/development/adding_packages.md

@@ -144,3 +144,39 @@ requirements:
 * [cryptography](https://github.com/emscripten-forge/recipes/tree/main/recipes/recipes_emscripten/cryptography)
 * [pydantic-core](https://github.com/emscripten-forge/recipes/tree/main/recipes/recipes_emscripten/cryptography)
 * [pycrdt](https://github.com/emscripten-forge/recipes/tree/main/recipes/recipes_emscripten/pycrdt)
+
+## R Packages
+
+For a package without dependencies of other R packages, only these requirements are usually necessary:
+
+```yaml
+requirements:
+  build:
+  - cross-r-base_${{ target_platform }}
+  - ${{ compiler("c") }}
+```
+
+Some R packages use the [Rcpp] package for a seamless integration of R and C++. [Rcpp] and all other R-dependencies must be in all 3 `requirements` sections (`build`, `host`, and `run`). For example,
+
+```yaml
+requirements:
+  build:
+  - cross-r-base_${{ target_platform }}
+  - ${{ compiler("c") }}
+  - r-rcpp
+  host:
+  - r-rcpp
+  run:
+  - r-rcpp
+```
+
+There needs to be 2 urls because very frequently the first one is not reachable.
+
+For the tests, we only check that the shared library for the package exists. Eventually we should be able to load the package and do actual tests, but that's not available yet.
+
+**Example recipes**:
+
+* [r-yaml](https://github.com/emscripten-forge/recipes/blob/main/recipes/recipes_emscripten/r-yaml/)
+* [r-plyr](https://github.com/emscripten-forge/recipes/blob/main/recipes/recipes_emscripten/r-plyr/)
+
+[Rcpp]: https://cran.r-project.org/web/packages/Rcpp/index.html