From fcb5314bf7b3f6f5b370c9515e932efd2fc37e9b Mon Sep 17 00:00:00 2001
From: "UnravelSports [JB]" <jors@unravelsports.com>
Date: Mon, 22 Jul 2024 19:54:11 +0200
Subject: [PATCH] fix versioning

---
 .github/workflows/pytest.yml                     | 3 ++-
 .gitignore                                       | 7 ++++++-
 requirements.txt                                 | 9 +++++----
 setup.py                                         | 9 +++++----
 unravel/utils/objects/custom_spektral_dataset.py | 8 --------
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 0f15ac2..4afe5d7 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - bug/crystal_conv_saving
   pull_request:
     branches:
       - main
@@ -13,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ['3.10', '3.11', '3.12']
+        python-version: ['3.11']
 
     runs-on: ${{ matrix.os }}
 
diff --git a/.gitignore b/.gitignore
index 3a39dc1..bc2b6cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -167,6 +167,7 @@ cython_debug/
 /.venv
 /.pytest_cache
 .DS_Store
+.venv*
 
 dev.py
 bug.py
@@ -179,5 +180,9 @@ build.py
 /pickle_files
 **/pickle_files
 
-tut.ipynb
+*.ipynb
+*.keras
+*.pkl
+*.txt
 
+/models
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 568b0d3..9e57e4a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
-spektral==1.3.1
-kloppy @ git+https://github.com/PySport/kloppy.git@9ccbc77c57c2caafaaf04f5aaf090deea8f03b7d
-pytest==8.2.2
-"black[jupyter]==24.4.2"
\ No newline at end of file
+spektral==1.2.0
+git+https://github.com/PySport/kloppy.git@9ccbc77c57c2caafaaf04f5aaf090deea8f03b7d
+tensorflow>=2.14.0; platform_machine != 'arm64' or platform_system != 'Darwin'
+tensorflow-macos>=2.14.0; platform_machine == 'arm64' and platform_system == 'Darwin'
+keras==2.14.0
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 27c6a40..6135ee2 100644
--- a/setup.py
+++ b/setup.py
@@ -11,16 +11,17 @@
     url="https://github.com/unravelsports/unravelsports",
     packages=["unravel"] + ["unravel." + pkg for pkg in find_packages("unravel")],
     classifiers=[
-        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
         "License :: OSI Approved :: GNU Affero General Public License version 3",
         "Operating System :: OS Independent",
     ],
-    python_requires=">=3.10",
+    python_requires="~=3.11",
     install_requires=[
-        "spektral==1.3.1",
+        "spektral==1.2.0",
         "kloppy @ git+https://github.com/PySport/kloppy.git@9ccbc77c57c2caafaaf04f5aaf090deea8f03b7d",
+        "tensorflow>=2.14.0;platform_machine != 'arm64' or platform_system != 'Darwin'",
+        "tensorflow-macos>=2.14.0;platform_machine == 'arm64' and platform_system == 'Darwin'",
+        "keras==2.14.0",
     ],
     extras_require={
         "test": [
diff --git a/unravel/utils/objects/custom_spektral_dataset.py b/unravel/utils/objects/custom_spektral_dataset.py
index 5a20ac5..df0f66e 100644
--- a/unravel/utils/objects/custom_spektral_dataset.py
+++ b/unravel/utils/objects/custom_spektral_dataset.py
@@ -223,11 +223,3 @@ def __handle_graph_id(i):
                 return self[train_idxs], self[test_idxs], self[validation_idxs]
             else:
                 return self[train_idxs], self[test_idxs]
-
-    def get_config(self):
-        config = {"kwargs": self._kwargs}
-        return config
-
-    @classmethod
-    def from_config(cls, config):
-        return cls(**config["kwargs"])