From c3df322a70c9213451c60f9ed60bc414628cd018 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Tue, 5 Oct 2021 22:04:55 +0200
Subject: [PATCH] Move scipy requirement to requirements_extra.txt

---
 docs/source/Contribs/XYZGrid.md   | 17 +++++++++++++----
 evennia/contrib/xyzgrid/README.md | 10 +++++++---
 requirements.txt                  |  3 ---
 requirements_extra.txt            |  3 +++
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/docs/source/Contribs/XYZGrid.md b/docs/source/Contribs/XYZGrid.md
index f863a0b4fc..4fc3975619 100644
--- a/docs/source/Contribs/XYZGrid.md
+++ b/docs/source/Contribs/XYZGrid.md
@@ -40,11 +40,20 @@ Exits: northeast and east
 
 ## Installation
 
-1. Import and add the `evennia.contrib.commands.XYZGridCmdSet` to the
+1. XYZGrid requires the `scipy` library. Easiest is to just install the
+   optional/contrib requirements in `evennia/requirements_extra.txt` by
+   doing
+
+        (cd to evennia/ folder)
+        pip install -r requirements_extra.txt
+        (then go back to your mygame/ folder)
+
+   This will install all optional requirements of Evennia.
+2. Import and add the `evennia.contrib.commands.XYZGridCmdSet` to the
    `CharacterCmdset` cmdset in `mygame/commands.default_cmds.py`. Reload
    the server. This makes the `map`, `goto/path` and the modified `teleport` and
    `open` commands available in-game.
-2. Edit `mygame/server/conf/settings.py` and add
+3. Edit `mygame/server/conf/settings.py` and add
 
        EXTRA_LAUNCHER_COMMANDS['xyzgrid'] = 'evennia.contrib.launchcmd.xyzcommand'
 
@@ -55,8 +64,8 @@ Exits: northeast and east
    This will add the new ability to enter `evennia xyzgrid <option>` on the
    command line.  It will also make the `xyz_room` and `xyz_exit` prototypes
    available for use as prototype-parents when spawning the grid.
-3. Run `evennia xyzgrid help` for available options.
-4. (Optional): By default, the xyzgrid will only spawn module-based
+4. Run `evennia xyzgrid help` for available options.
+5. (Optional): By default, the xyzgrid will only spawn module-based
    [prototypes](../Components/Prototypes). This is an optimization and usually makes sense
    since the grid is entirely defined outside the game anyway. If you want to
    also make use of in-game (db-) created prototypes, add
diff --git a/evennia/contrib/xyzgrid/README.md b/evennia/contrib/xyzgrid/README.md
index a2d69c29f0..5822aee634 100644
--- a/evennia/contrib/xyzgrid/README.md
+++ b/evennia/contrib/xyzgrid/README.md
@@ -25,15 +25,19 @@ in the docs.
 
 ## Installation
 
-1. Import and add the `evennia.contrib.xyzgrid.commands.XYZGridCmdSet` to the
+
+1. If you haven't before, install the extra contrib requirements.
+   You can do so by doing `pip install -r requirements_extra.txt` from the
+   `evennia/` folder.
+2. Import and add the `evennia.contrib.xyzgrid.commands.XYZGridCmdSet` to the
    `CharacterCmdset` cmdset in `mygame/commands.default_cmds.py`. Reload
    the server. This makes the `map`, `goto/path` and modified `teleport`  and
    `open` commands available in-game.
-2. Edit `mygame/server/conf/settings.py` and set
+3. Edit `mygame/server/conf/settings.py` and set
 
         EXTRA_LAUNCHER_COMMANDS['xyzgrid'] = 'evennia.contrib.xyzgrid.launchcmd.xyzcommand'
 
-3. Run the new `evennia xyzgrid help` for instructions on how to spawn the grid.
+4. Run the new `evennia xyzgrid help` for instructions on how to spawn the grid.
 
 ## Example usage
 
diff --git a/requirements.txt b/requirements.txt
index 8580fb7593..d8a4df3b12 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -26,6 +26,3 @@ parameterized==0.8.1
 
 # windows-specific
 pypiwin32;platform_system=="Windows"
-
-# xyzroom contrib
-scipy==1.7.1
diff --git a/requirements_extra.txt b/requirements_extra.txt
index c7a911f4e1..f14f24e321 100644
--- a/requirements_extra.txt
+++ b/requirements_extra.txt
@@ -19,3 +19,6 @@ botocore >= 1.15
 jupyter >= 1.0.0
 ipython >= 7.19.0
 django-extensions >= 3.1.0
+
+# xyzroom contrib
+scipy==1.7.1