DIST conda: remove rpy2 run dependency, clean build env

christianbrodbeck · Feb 2, 2017 · a91456a · a91456a
1 parent 6765629
commit a91456a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/conda/eelbrain/meta.yaml b/conda/eelbrain/meta.yaml
@@ -13,17 +13,15 @@ requirements:
     - python
     - pywin32-ctypes  # [win]
     - setuptools >=17
-    - colormath >=2.1
+    - numpy x.x
+    # the rest so that setuptools does not try to download them
+    - pillow
     - keyring >=5
-    - matplotlib >=1.1
-    - mayavi
+    - tex >=1.8
     - mne >=0.13.1
     - nibabel >=2.0
-    - numpy >=1.0
-    - pillow
-    - scipy >=0.16
-    - tex >=1.8
     - tqdm >=4.8
+    - colormath >=2.1
 
   run:
     - python
@@ -36,7 +34,6 @@ requirements:
     - numpy >=1.0
     - pillow
     - pysurfer >=0.7
-    - rpy2
     - scipy >=0.16
     - tex >=1.8
     - tqdm >=4.8

diff --git a/conda/readme.rst b/conda/readme.rst
@@ -30,9 +30,11 @@ $ anaconda upload /anaconda/conda-bld/win-64/<package>.tar.bz2
 Eelbrain
 --------
 
-- Update version in ./eelbrain/meta.yaml
-- run $ conda build eelbrain
+- Update version in ``setup.py`` and ``meta.yaml``
+- run with appropriate numpy version:
 
-Upload as beta:
+ 	$ conda build eelbrain --numpy 1.11
 
-$ anaconda upload -l beta /anaconda/conda-bld/osx-64/<package>-py27_0.tar.bz2
+- Upload as beta:
+
+	$ anaconda upload -l beta /anaconda/conda-bld/<platform>/<package>.tar.bz2