Merge pull request #3 from mrahnis/dev

Update requirements to include adjusttext
mrahnis · Sep 30, 2018 · 846e6bb · 846e6bb
2 parents 155630b + fa0690e
commit 846e6bb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/appveyor.yml b/appveyor.yml
@@ -20,8 +20,9 @@ install:
   - conda install conda-build anaconda-client
   - conda info -a
   - conda config --add channels conda-forge
+  - conda config --add channels phlya
   - conda config --add channels mrahnis
-  - "conda create -q -n test-environment python=%PYTHON_VERSION% fiona rasterio shapely click networkx drapery pytest"
+  - "conda create -q -n test-environment python=%PYTHON_VERSION% fiona rasterio shapely click networkx adjusttext drapery pytest"
   - activate test-environment
   - conda build .
   - conda install surficial --use-local

diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -27,6 +27,7 @@ requirements:
     - rasterio
     - fiona
     - networkx
+    - adjusttext
     - drapery
 
 test:

diff --git a/requirements.txt b/requirements.txt
@@ -6,4 +6,5 @@ descartes
 rasterio
 fiona
 networkx
+adjusttext
 drapery
diff --git a/setup.py b/setup.py
@@ -31,6 +31,7 @@
         'rasterio',
         'fiona',
         'networkx',
+        'adjusttext',
         'drapery'
     ],
     entry_points='''