From 446ca0f51b0aac6847d8b3d5854f8b6f5d0b17a0 Mon Sep 17 00:00:00 2001
From: chenkins <chenkins44@gmail.com>
Date: Thu, 20 Feb 2025 10:19:13 +0100
Subject: [PATCH 1/2] Add tox env verifying plain install (without dev
 requirements).

---
 tox.ini | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 3dfa3b1b..2ecbf3f4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-env_list = py{310,311,312},notebooks,py{310,311,312}-ml
+env_list = py{310,311,312},notebooks,py{310,311,312}-ml,py{310,311,312}-verify-install
 
 [gh-actions]
 python =
@@ -123,3 +123,10 @@ deps =
     -r requirements-dev.txt
 commands =
     python -m build
+
+[testenv:py{310,311,312}-verify-install]
+# install flatland-rl without additional dependencies
+skip_install = false
+commands =
+    python --version
+    python -c 'from flatland.evaluators.service import FlatlandRemoteEvaluationService'

From 8670cd25433bd3713c4a21aa938c336acea09918 Mon Sep 17 00:00:00 2001
From: chenkins <chenkins44@gmail.com>
Date: Thu, 20 Feb 2025 10:43:54 +0100
Subject: [PATCH 2/2] Install attrs instead of attr package.

---
 pyproject.toml       | 4 +++-
 requirements-dev.txt | 3 +--
 requirements-ml.txt  | 3 +--
 requirements.txt     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 0b187318..5a2a7f7b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -19,7 +19,7 @@ classifiers = [
     'Programming Language :: Python :: 3.12',
 ]
 dependencies = [
-    "attr",
+    "attrs",
     "boto3",
     "click",
     "crowdai_api",
@@ -42,6 +42,8 @@ dependencies = [
     "recordtype",
     "redis",
     "seaborn",
+    # https://docs.python.org/3/whatsnew/3.12.html: Python 3.12 has removed pkg_resources from the standard library (moved to setuptools):
+    "setuptools",
     "svgutils",
     "timeout_decorator",
 
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 0b2e2288..d168cccb 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -24,11 +24,10 @@ async-lru==2.0.4
     # via jupyterlab
 async-timeout==5.0.1
     # via redis
-attr==0.3.2
-    # via flatland-rl (pyproject.toml)
 attrs==25.1.0
     # via
     #   flake8-eradicate
+    #   flatland-rl (pyproject.toml)
     #   jsonschema
     #   referencing
 babel==2.17.0
diff --git a/requirements-ml.txt b/requirements-ml.txt
index fe3c9daa..44ae942a 100644
--- a/requirements-ml.txt
+++ b/requirements-ml.txt
@@ -24,11 +24,10 @@ async-timeout==5.0.1
     # via
     #   aiohttp
     #   redis
-attr==0.3.2
-    # via flatland-rl (pyproject.toml)
 attrs==25.1.0
     # via
     #   aiohttp
+    #   flatland-rl (pyproject.toml)
     #   jsonschema
     #   referencing
 boto3==1.36.20
diff --git a/requirements.txt b/requirements.txt
index acae3028..f05793a4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ asttokens==3.0.0
     # via stack-data
 async-timeout==5.0.1
     # via redis
-attr==0.3.2
+attrs==25.1.0
     # via flatland-rl (pyproject.toml)
 boto3==1.36.20
     # via flatland-rl (pyproject.toml)