merge master and resolve conflicts

Signed-off-by: Daniel Sola <[email protected]>

.github/workflows/checks.yml

@@ -136,7 +136,7 @@ jobs:
           --force
           tar -xvf flyte-package.tgz
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: snacks-examples-${{ matrix.example }}
           path: examples/${{ matrix.example }}/**/*.pb
@@ -155,7 +155,7 @@ jobs:
         run: |
           mkdir download-artifact
       - name: Download artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           path: ./download-artifact/
       - name: setup sandbox
@@ -216,7 +216,7 @@ jobs:
         run: |
           mkdir download-artifact
       - name: Download artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           path: ./download-artifact/
       - name: Package Examples
@@ -293,7 +293,7 @@ jobs:
           pip install uv
           uv venv
           source .venv/bin/activate
-          uv pip install "flytekit>=1.12.2" flytekitplugins-deck-standard torch tabulate pyarrow
+          uv pip install "flytekit>=1.12.2" flytekitplugins-deck-standard torch tabulate pyarrow pandas
           pip freeze
       - name: Checkout flytesnacks
         uses: actions/checkout@v3

.github/workflows/monodocs_build.yml

@@ -65,6 +65,7 @@ jobs:
         shell: bash -el {0}
         env:
           FLYTESNACKS_LOCAL_PATH: ${{ github.workspace }}/flytesnacks
+          DOCSEARCH_API_KEY: fake_docsearch_api_key  # must be set to get doc build to succeed
         run: |
           conda activate monodocs-env
           make -C docs html SPHINXOPTS="-W"

.github/workflows/serialize_example.yml

@@ -38,7 +38,7 @@ jobs:
           ./scripts/serialize-example.sh ${{ matrix.directory }} ${{ github.sha }}
           tar -xvf ${{ matrix.directory }}/flyte-package.tgz -C ${{ matrix.directory }}
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: snacks-${{ steps.example_id.outputs.EXAMPLE_ID }}
           path: ${{ matrix.directory }}/**/*.pb
@@ -57,7 +57,7 @@ jobs:
         run: |
           mkdir download-artifact
       - name: Download artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           path: ./download-artifact/
       - name: setup sandbox

.gitignore

@@ -3,7 +3,6 @@ __pycache__/
 .idea
 .jpg
 .ipynb_checkpoints/
-*.csv
 *.dat
 .DS_Store
 gen_modules

.readthedocs.yml

@@ -7,7 +7,7 @@ version: 2
 build:
   os: "ubuntu-22.04"
   tools:
-    python: "3.11"
+    python: "3.12"
   apt_packages:
     - pandoc
 

README.md

@@ -3,10 +3,10 @@
         <img src="https://raw.githubusercontent.com/flyteorg/static-resources/main/common/flyte_circle_gradient_1_4x4.png" alt="Flyte Logo" width="100">
     </p>
     <h1 align="center">
-        Flyte User Guide & Tutorials
+        Flyte tutorials and integrations examples
     </h1>
     <p align="center">
-        Flytesnacks encompasses code examples showcasing Flytekit Python
+        Flytesnacks encompasses tutorials and integrations examples showcasing Flytekit Python
     </p>
     <p align="center">
         <a href="https://slack.flyte.org">
@@ -30,11 +30,10 @@
 
 > To get the hang of Python SDK, refer to the [Getting Started](https://docs.flyte.org/en/latest/getting_started.html) tutorial before exploring the examples.
 
-The [User Guide](https://docs.flyte.org/projects/cookbook/en/latest/index.html) section has code examples, tips, and tricks that showcase the usage of Flyte features and integrations.
+The [Tutorials](https://docs.flyte.org/en/latest/flytesnacks/tutorials/index.html) section has real-world examples, ranging from machine learning training, data processing to feature engineering.
 
-The [Tutorials](https://docs.flyte.org/projects/cookbook/en/latest/tutorials.html) section has real-world examples, ranging from machine learning training, data processing to feature engineering.
+the [Integrations](https://docs.flyte.org/en/latest/flytesnacks/integrations/index.html) section demonstrates how to use Flyte with other tools and frameworks.
 
-the [Integrations](https://docs.flyte.org/projects/cookbook/en/latest/integrations.html) section demonstrates how to use Flyte with other tools and frameworks.
 
 > Flytesnacks currently has all examples in Python (Flytekit Python SDK).
 
@@ -44,12 +43,12 @@ the [Integrations](https://docs.flyte.org/projects/cookbook/en/latest/integratio
     </h2>
 </html>
 
-You can find the detailed contribution guide [here](docs/contribute.md).
+You can find the detailed contribution guide [here](https://docs.flyte.org/en/latest/community/contribute_docs.html#contributing-tutorials-and-integrations-examples).
 
 <html>
     <h2 id="file-an-issue">
         🐞 File an Issue
     </h2>
 </html>
 
-Refer to the [issues](https://docs.flyte.org/en/latest/community/contribute.html##file-an-issue) section in the contribution guide if you'd like to file an issue.
+Refer to the [issues](https://docs.flyte.org/en/latest/community/contribute.html#file-an-issue) section in the contribution guide if you'd like to file an issue.

_example_template/Dockerfile

@@ -1,5 +1,5 @@
 FROM python:3.8-slim-buster
-LABEL org.opencontainers.image.source https://github.com/flyteorg/flytesnacks
+LABEL org.opencontainers.image.source=https://github.com/flyteorg/flytesnacks
 
 WORKDIR /root
 ENV VENV /opt/venv