From 82db6aca07cdef1ae3056f4839b3e8837611020f Mon Sep 17 00:00:00 2001
From: Samuel Moors <samuel.moors@vub.be>
Date: Wed, 20 Sep 2023 17:22:23 +0200
Subject: [PATCH] fix pip install for older setuptools

---
 pyproject.toml                                            | 3 +--
 setup.cfg                                                 | 8 ++++----
 src/eessi/__init__.py                                     | 1 +
 src/eessi/testsuite/__init__.py                           | 0
 {eessi => src/eessi}/testsuite/common_config.py           | 0
 {eessi => src/eessi}/testsuite/constants.py               | 0
 {eessi => src/eessi}/testsuite/hooks.py                   | 0
 {eessi => src/eessi}/testsuite/tests/apps/gromacs.py      | 0
 .../testsuite/tests/apps/tensorflow/src/mnist_setup.py    | 0
 .../eessi}/testsuite/tests/apps/tensorflow/src/tf_test.py | 0
 .../eessi}/testsuite/tests/apps/tensorflow/tensorflow.py  | 0
 {eessi => src/eessi}/testsuite/utils.py                   | 0
 12 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 src/eessi/__init__.py
 create mode 100644 src/eessi/testsuite/__init__.py
 rename {eessi => src/eessi}/testsuite/common_config.py (100%)
 rename {eessi => src/eessi}/testsuite/constants.py (100%)
 rename {eessi => src/eessi}/testsuite/hooks.py (100%)
 rename {eessi => src/eessi}/testsuite/tests/apps/gromacs.py (100%)
 rename {eessi => src/eessi}/testsuite/tests/apps/tensorflow/src/mnist_setup.py (100%)
 rename {eessi => src/eessi}/testsuite/tests/apps/tensorflow/src/tf_test.py (100%)
 rename {eessi => src/eessi}/testsuite/tests/apps/tensorflow/tensorflow.py (100%)
 rename {eessi => src/eessi}/testsuite/utils.py (100%)

diff --git a/pyproject.toml b/pyproject.toml
index 65cb01e9..c9b42b0a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,6 +18,5 @@ requires-python = ">=3.6"
 "Bug Tracker" = "https://github.com/EESSI/test-suite/issues"
 
 [tool.setuptools.packages.find]
-where = ["eessi/testsuite"]
+where = ["src"]
 include = ["eessi*"]
-namespaces = true
diff --git a/setup.cfg b/setup.cfg
index b6329a2f..ecc8d491 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,11 +13,11 @@ project_urls =
 install_requires =
     setuptools
 python_requires = >=3.6
-packages = find:
 package_dir =
-    =eessi/testsuite
+    =src
+packages = find:
+namespace_packages = eessi
 
 [options.packages.find]
-where = eessi/testsuite
+where = src
 include = eessi*
-namespaces = true
diff --git a/src/eessi/__init__.py b/src/eessi/__init__.py
new file mode 100644
index 00000000..5284146e
--- /dev/null
+++ b/src/eessi/__init__.py
@@ -0,0 +1 @@
+__import__("pkg_resources").declare_namespace(__name__)
diff --git a/src/eessi/testsuite/__init__.py b/src/eessi/testsuite/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/eessi/testsuite/common_config.py b/src/eessi/testsuite/common_config.py
similarity index 100%
rename from eessi/testsuite/common_config.py
rename to src/eessi/testsuite/common_config.py
diff --git a/eessi/testsuite/constants.py b/src/eessi/testsuite/constants.py
similarity index 100%
rename from eessi/testsuite/constants.py
rename to src/eessi/testsuite/constants.py
diff --git a/eessi/testsuite/hooks.py b/src/eessi/testsuite/hooks.py
similarity index 100%
rename from eessi/testsuite/hooks.py
rename to src/eessi/testsuite/hooks.py
diff --git a/eessi/testsuite/tests/apps/gromacs.py b/src/eessi/testsuite/tests/apps/gromacs.py
similarity index 100%
rename from eessi/testsuite/tests/apps/gromacs.py
rename to src/eessi/testsuite/tests/apps/gromacs.py
diff --git a/eessi/testsuite/tests/apps/tensorflow/src/mnist_setup.py b/src/eessi/testsuite/tests/apps/tensorflow/src/mnist_setup.py
similarity index 100%
rename from eessi/testsuite/tests/apps/tensorflow/src/mnist_setup.py
rename to src/eessi/testsuite/tests/apps/tensorflow/src/mnist_setup.py
diff --git a/eessi/testsuite/tests/apps/tensorflow/src/tf_test.py b/src/eessi/testsuite/tests/apps/tensorflow/src/tf_test.py
similarity index 100%
rename from eessi/testsuite/tests/apps/tensorflow/src/tf_test.py
rename to src/eessi/testsuite/tests/apps/tensorflow/src/tf_test.py
diff --git a/eessi/testsuite/tests/apps/tensorflow/tensorflow.py b/src/eessi/testsuite/tests/apps/tensorflow/tensorflow.py
similarity index 100%
rename from eessi/testsuite/tests/apps/tensorflow/tensorflow.py
rename to src/eessi/testsuite/tests/apps/tensorflow/tensorflow.py
diff --git a/eessi/testsuite/utils.py b/src/eessi/testsuite/utils.py
similarity index 100%
rename from eessi/testsuite/utils.py
rename to src/eessi/testsuite/utils.py