From 23d8661b1f23c658fe5f77d80d92efcecd03cc1f Mon Sep 17 00:00:00 2001 From: Karan Shah Date: Tue, 10 Dec 2024 11:04:23 +0530 Subject: [PATCH] Restore `openfl-tutorials` as installable package (#1203) * Add openfl-tutorials as package Signed-off-by: Shah, Karan * Add __init__.py Signed-off-by: Shah, Karan * Add nbformat pkg Signed-off-by: Shah, Karan * Try localhost Signed-off-by: Shah, Karan * Revert "Try localhost" This reverts commit 44b83044cbff55cc13aea2a9a3987cf38cce2a51. Signed-off-by: Shah, Karan * Try python3.10 Signed-off-by: Shah, Karan * Try localhost Signed-off-by: Shah, Karan --------- Signed-off-by: Shah, Karan --- .github/workflows/experimental_workflow_tests.yml | 8 ++++++-- openfl-tutorials/__init__.py | 0 .../workflow/workflow_interface_requirements.txt | 1 + setup.py | 10 +++++++++- 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 openfl-tutorials/__init__.py diff --git a/.github/workflows/experimental_workflow_tests.yml b/.github/workflows/experimental_workflow_tests.yml index 030f42ed145..84166ab3623 100644 --- a/.github/workflows/experimental_workflow_tests.yml +++ b/.github/workflows/experimental_workflow_tests.yml @@ -10,6 +10,10 @@ on: permissions: contents: read +env: + # A workaround for long FQDN names provided by GitHub actions. + FQDN: "localhost" + jobs: build: if: (github.event.pull_request.draft == false && contains(github.event.pull_request.labels.*.name, 'workflow_interface')) @@ -18,10 +22,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up Python 3.8 + - name: Set up Python 3 uses: actions/setup-python@v3 with: - python-version: "3.8" + python-version: "3.10" - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/openfl-tutorials/__init__.py b/openfl-tutorials/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/openfl-tutorials/experimental/workflow/workflow_interface_requirements.txt b/openfl-tutorials/experimental/workflow/workflow_interface_requirements.txt index 6b4abbf54db..fd3a3726675 100644 --- a/openfl-tutorials/experimental/workflow/workflow_interface_requirements.txt +++ b/openfl-tutorials/experimental/workflow/workflow_interface_requirements.txt @@ -5,6 +5,7 @@ dill==0.3.6 matplotlib>=2.0.0 metaflow==2.7.15 nbdev==2.3.12 +nbformat ray==2.9.2 torch torchvision diff --git a/setup.py b/setup.py index 1151bb09562..e5018fb12c8 100644 --- a/setup.py +++ b/setup.py @@ -66,7 +66,15 @@ def run(self): long_description=open("README.md", encoding="utf-8").read(), long_description_content_type='text/markdown', url='https://github.com/securefederatedai/openfl', - packages=find_packages(include=("openfl", "openfl.*", "openfl-docker", "openfl-workspace")), + packages=find_packages( + include=( + "openfl", + "openfl.*", + "openfl-docker", + "openfl-workspace", + "openfl-tutorials", + ) + ), include_package_data=True, setup_requires=['grpcio-tools>=1.56.2,<1.66.0'], # ensure it is in-sync with `install_requires` install_requires=[