Merge pull request #165 from HubLot/conda

Conda update

CHANGELOG

@@ -1,6 +1,8 @@
 **Dev**
 - Add a version option for scripts (based on pbxplore.__version__)
 - update doc for installation and configuration
+- Fix weblogo compatibility
+- Update conda procedure
 
 **1.3.5**
 - Update documentation

devtools/RELEASE.md

@@ -64,15 +64,15 @@ Doc:
 
 1. Build the package (inside `conda` directory)
 
-    `conda build --python 2.7 --python 3.3 --python 3.4 --python 3.5 -c bioconda -c mdanalysis pbxplore`
+    `conda-build --python 2.7 --python 3.4 --python 3.5 --python 3.6 -c bioconda -c mdanalysis pbxplore`
 
 
 2. The path of the created archive will be given at the end of the process
 
 
 3. Convert it for all plateforms (where `X.X.X` is the pbxplore version and `YY` is the Python version)
 
-    `conda convert --platform all /path/to/archive/pbxplore-X.X.X-pyYY_0.tar.bz2`
+    `conda-convert --platform all /path/to/archive/pbxplore-X.X.X-pyYY_0.tar.bz2`
 
 
 4. Upload it to anaconda

devtools/conda/pbxplore/meta.yaml

@@ -3,16 +3,14 @@ package:
   version: "1.3.5"
 
 source:
-  git_url: https://github.com/pierrepo/PBxplore
-  git_branch: master
+  git_url: https://github.com/pierrepo/PBxplore.git
+  git_rev: v1.3.5
 
 build:
   entry_points:
     - PBassign = pbxplore.scripts.PBassign:pbassign_cli
-    - PBclust  = pbxplore.scripts.PBclust:pbclust_cli
     - PBcount  = pbxplore.scripts.PBcount:pbcount_cli
     - PBstat   = pbxplore.scripts.PBstat:pbstat_cli
-    - PBdata   = pbxplore.scripts.PBdata:pbdata_cli
 
 
 requirements:
@@ -35,17 +33,14 @@ test:
   imports:
     - pbxplore
     - pbxplore.analysis
-    - pbxplore.demo
     - pbxplore.io
     - pbxplore.structure
     - pbxplore.tests
 
   commands:
     - PBassign --help
-    - PBclust --help
     - PBcount --help
     - PBstat --help
-    - PBdata --help
     - python -c 'import pbxplore; pbxplore.test()'
 
 

pbxplore/analysis/visualization.py

@@ -21,7 +21,7 @@
     # it is 'SymbolColor'. Here, we change to always have 'ColorGroup'.
     try:
         ColorGroup = weblogolib.SymbolColor
-    except NameError:
+    except AttributeError:
         ColorGroup = weblogolib.ColorGroup
 except ImportError:
     IS_WEBLOGO = False