From dd7c464793f3858c96a74c75ff77c52f3240c8bd Mon Sep 17 00:00:00 2001
From: Robbe Sneyders <robbe.sneyders@ml6.eu>
Date: Tue, 20 Feb 2024 15:07:14 +0100
Subject: [PATCH 1/2] Add pre- and post-build script to work around Poetry bug

---
 .github/workflows/prep-release.yaml |  1 +
 pyproject.toml                      |  4 ++--
 scripts/post-build.sh               | 14 ++++++++++++++
 scripts/pre-build.sh                | 17 +++++++++++++++++
 tox.ini                             |  3 +++
 5 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100755 scripts/post-build.sh
 create mode 100755 scripts/pre-build.sh

diff --git a/.github/workflows/prep-release.yaml b/.github/workflows/prep-release.yaml
index b38c7634..1217e142 100644
--- a/.github/workflows/prep-release.yaml
+++ b/.github/workflows/prep-release.yaml
@@ -71,6 +71,7 @@ jobs:
       - name: Build a binary wheel and a source tarball
         run: |
           pip install poetry
+          ./scripts/pre-build.sh
           poetry build
 
       - name: Publish distribution 📦 to Test PyPI
diff --git a/pyproject.toml b/pyproject.toml
index 7e256746..1bd40cd0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,8 +21,8 @@ maintainers = [
     "Niels Rogge <niels.rogge@ml6.eu>",
 ]
 repository = "https://github.com/ml6team/fondant"
-include = ["*.txt", "*.rst", "*.md", "src/fondant/components/**/*.yaml"]
-exclude = ["src/fondant/components"]  # Exclude everything except for component specs
+include = ["*.txt", "*.rst", "*.md", "fondant/components/**/*.yaml"]
+exclude = ["fondant/components"]  # Exclude everything except for component specs
 classifiers = [
     "Development Status :: 2 - Pre-Alpha",
     "Intended Audience :: Developers",
diff --git a/scripts/post-build.sh b/scripts/post-build.sh
new file mode 100755
index 00000000..0bd43717
--- /dev/null
+++ b/scripts/post-build.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# This script reverts the `scripts/pre-build.sh` script by moving the package code back into a
+# `src` directory.
+# It should be run after running scripts/pre-build.sh and building the fondant package
+set -e
+
+scripts_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
+root_path=$(dirname "$scripts_path")
+
+pushd "$root_path"
+mkdir -p src/fondant
+mv fondant/* src/fondant
+rm -rf fondant
+popd
diff --git a/scripts/pre-build.sh b/scripts/pre-build.sh
new file mode 100755
index 00000000..ebb71262
--- /dev/null
+++ b/scripts/pre-build.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+# This script unpacks the src folder before building to make the poetry `include` and `exclude`
+# sections work correctly for both sdist and wheel
+# (https://github.com/python-poetry/poetry/issues/8994)
+# Building without running this script also works, but includes the full code for the components.
+# This script makes changes to the local files, which should not be committed to git. Run
+# scripts/post-build.sh to clean them up.
+set -e
+
+scripts_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
+root_path=$(dirname "$scripts_path")
+
+pushd "$root_path"
+mkdir fondant
+mv src/fondant/* fondant
+rm -rf src
+popd
diff --git a/tox.ini b/tox.ini
index 71e9116b..0c417a9b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,8 +42,11 @@ allowlist_externals=
     /bin/bash
     /usr/bin/bash
 commands_pre=
+    bash ./scripts/pre-build.sh
     poetry lock
     poetry install --all-extras
     poetry show
 commands=
     poetry run python -m pytest tests -vv --cov fondant --cov-report term-missing --ignore=tests/integration_tests
+commands_post=
+    bash ./scripts/post-build.sh

From fff4071230483155ca34c1f20fd198c45b959cef Mon Sep 17 00:00:00 2001
From: Robbe Sneyders <robbe.sneyders@ml6.eu>
Date: Tue, 20 Feb 2024 16:40:27 +0100
Subject: [PATCH 2/2] Properly build package before testing with tox

---
 pyproject.toml | 3 +++
 tox.ini        | 9 ++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 1bd40cd0..8c95d3fa 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -75,6 +75,9 @@ vertex = ["docker", "kfp", "google-cloud-aiplatform"]
 sagemaker = ["sagemaker", "boto3"]
 docker = ["docker"]
 
+all = ["dask", "dask-cuda", "s3fs", "adlfs", "gcsfs", "docker", "kfp", "google-cloud-aiplatform",
+    "sagemaker", "boto3"]
+
 [tool.poetry.group.test]
 optional = true
 
diff --git a/tox.ini b/tox.ini
index 0c417a9b..e584a3b3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -43,10 +43,9 @@ allowlist_externals=
     /usr/bin/bash
 commands_pre=
     bash ./scripts/pre-build.sh
-    poetry lock
-    poetry install --all-extras
-    poetry show
+    poetry build
+    poetry run pip install dist/fondant-0.1.dev0-py3-none-any.whl[all]
+    poetry run pip list
+    bash ./scripts/post-build.sh
 commands=
     poetry run python -m pytest tests -vv --cov fondant --cov-report term-missing --ignore=tests/integration_tests
-commands_post=
-    bash ./scripts/post-build.sh