additional dependency

Author: ma595

docs/source/installation.rst

@@ -6,7 +6,7 @@ Building Detectree2
 Getting up and running quickly 
 ==============================
 
-To get up and running quickly it is possible to install detectree2 and its dependencies with Conda. Simply do::
+For users wanting to run detectree2 only it is possible to install detectree2 and its dependencies with Conda. Simply do::
 
     conda install -c ma595 detectree2
 
@@ -35,6 +35,8 @@ Then point to preinstalled GDAL header files (not necessary if include directory
     export CPLUS_INCLUDE_PATH=/usr/include/gdal
     export C_INCLUDE_PATH=/usr/include/gdal
 
+Depending on the version of setuptools installed, it may be necessary to downgrade to install GDAL. This may in the process break pytorch. 
+
 then::
 
     git clone [email protected]:PatBall1/detectree2.git

setup.py

@@ -29,7 +29,12 @@
         "pypng",
         "pygeos",
         "geopandas",
+<<<<<<< HEAD
         "rasterio==1.3.2",
+=======
+        "opencv-python",
+        "rasterio==1.2.10",
+>>>>>>> b8a1ce3 (additional dependency)
         "fiona",
         "pycrs",
         "descartes",