Merge 53c9e2b into d4061f6

.travis.yml

@@ -12,9 +12,8 @@ env:
     - python=3.8  CONDA_PY=38    
 
   global:
-    - secure: "X35iAaYPyrxjVwABOPcxkgj/dttGnW6gIRpYOsNbvCtyECKmRnfSuvtC4PVuFi8Y2oJQQE5kZxEsTiwOx1TXirizPwBY1wvxvU9wl1JE3bvqwSKE3x5C3mbj1pu5NjDjNYnU87aNMHdyHv31C9Ekn/yrrtLv613+HwueMqicZMZnTrF5gQKhp6u+YzaKEtW70//txpvz9BV5VW2cmZ7t1Hw+Lie6Atb/YGNf8PrJ3ObZtJOa0SREbNie6klfueXK3aEZud3WEJT9lagARoOp1t6U4Wu6+Ackzgos+H5j54ClvJPgLP6GvXktasBHv5LNudgW5urVHsuze3CBuXogZJXnCTT4menS1WqkiS7fRS5PmNBTzcRQcHUDCryntxzWeBnPA8czRxClXgtGZGn9gLkhZdbHOVMMBWI22uKA6faoCCdn6/2rgE5YDe7t4SvOYtNc2CQBuJCkRXCp3dMfBUh7FgOit54IfZ378J8NGdRHMmbmoymrlAI3el71GEOMzXFQjCfpowOzuyZ1l+mwowe9hu19LDGr3/mA243KceUIxQBUahqHNeIVAN5iARelOLK/k3xoTHt5Gt984rsRmL/3NICaeSYAqwnPCAISo+0lMkRmWIDlGlZiVCKB/goRIeLlZPuC7ZNPe5GoVJKC3s/uTN4PzGjh8f63rJi8+wY="
-    - secure: "Vi6HlKQ3dI3ExosaYUGyDlQ3uhRIE0A8ch1YIBnzqAD1Z89vBYkpCuTzYygGgO553CsCe/ALjsZ+xwWM4OIoqWWS99SFn8vjeO2N4F+MBEvOlCfziClgka11fR+cnLz848eYyykFNYpCCKuF2P46SD0fpf6vAxrf978WD44Xnovb9AhArlNyfyV3zJyde5GOGeHb+b1f2yINtrUdYUBm+0o8+1mAyv00EHQhk24qlsiW04wfjVbueuLRzOr7LV/RUOSRZuqCJ0a8Pk1o88eFFGAK7zCl604GeB83iv0/3eiQE1WJt9zzvl9xrE8KWzOQeXiceX5Z2mAA7Vgg2tHof3QiH2FoqPhp4hmsGKb26sXeMH9EEj6RC+d7AdTW8tm1tvhrqedSiiOFicKbyYnWlX0ydJdIv6ksovEKxfk5v71hvIDJ/O/wxsHvGk1vcJZrrY3pGUxcbdfr6A83TcCRhJYGa67VYwhYNHqQi0GIME+1I55p4Q7bq9p5INVjid6V7nxcY3NRMkAclSmNLfOeiQdsk/K8p7+3M5ERoQ1WktIDiS7T9HQHTuOkThCKgsOWhNVrTrfAby/mw+RBjHMD9+6pEu3ofcUs3X+Sku3+REjn70uu93vyiYvAbw/1P+sdmK/7SH+BivrPTJD691YAFMUYaJxRlAvtKl5UZVFpvWA="
-
+    - secure: "FdEwyZhpmtO+CBhb8pSxW96uxMICV5Lv4Bzg/VlFwOWW16m6LPmGE27Si+yHH968zazKRcrNLJb7utkxR6dDwSoqmpEOklLeyftKb9iGhf47UQPoBFlL/z3gj+Tr4tT+1aEXwyeL0ssNzeQx9F9OZNecuQglmp+bBcw6W6QmT8+8to6RDZ3f1+wqzOM5oAD5BidurxtDK80bgFI289Vl5kVrDfw5CUq61zqdzEaYLJBhRj2yGROn1fiZAOJpTjDsKb9nsRCCbZD+cegAeyPXfygbjOoCqKpmEgWnvr3h8MDY5U4ngTInRxkN9uCILLHfGSaQ8112lX/jlB4U9uJIqteMc0nF+beHKS1MH7bCrJrSklrsEis6+JnD3Y9/ASQujnLuDcvZpKwwaTMMzWVnFm8CJMmiSpFR6Zgt4bNTHcs5r5/21USYDFo6PgWkZlSt4NsWjxF2WLuY54URPJL0RByi7o0EKPgnO6V0mp4caMzwfMfOD6FaPN7PJgBIIgOxYAEXFud14+PBrFbIChCgbwgMAIkvMFt3QZI8hiE5pq8/1/xXzi8CtK67+W1WLlit31LRD679jxCHWdsy5LqclVsf1dZEskLO7WGx0YQhwlKsXP2CwkLtZiOzRy5lCyAjSHYlshwfmhcrN4ZawWhve26vCFEQD9rmqUCx0LUKgTU="
+    - secure: "CjtB9zHLu6/sGlCNZ3W0jY58EvOsJMrMoH4sdzOcs8ix6GbXW2E2m/YdvX4dbG9f3JvfddSpm1QgaEs6m72/uhdAxFoxV4lrJ6/xO4KcD2tOxCZTI71SJWEmtXH0tkpeXHzQI5YJoBWDzDPLF5cp4L/Q5kjfJiZQlELRyYMQkIPbHYcUxcM5ObrxFOQed4hJaMeNUUeU7/Ig1tgJLOJYPj3h3voG1qFjPnsqR5FYbLAKE1GtzEfh57qUiWEAqBn5OQN0uWOD8Gq08UyZxnPWi4yt6xZv9PbxVel/PFiU4CIVL2NsGP+gE8CIvCcOuaeHeiJYAASundVM9v7f5fT8Df0Dp7NZn5haTH/AzXtBr4Ecf7yhXDnlqiaxDM/UcYCfKkhPEXg9UNhjtCHJ9VnRjM/7E36yVXzfRrKdM5iC/5HiC1CelKGQkrqyw9aqCiQgTgejLTV7WaBV14y2th/IMPOjDyl9boS9LuA3xjshru4PwsNzXS/EqQud9NfJjWa2ib3Ixt002nN6wtBxogRYhOhFaHzc2D1jchgB6WgkOP+MZLlhCCbsvPSHxFPm+x1iSXLoFIvcXmejsm8AY1zSjU1pxD+B+gKXCtQZ1pl4NSbwUnZALC3YnhRUyZInjYmxRhqbgEKAo/cAfm5lTPeSc66Ghecln+qdxEbWEZXDNGc="
 
 before_install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi
@@ -24,12 +23,16 @@ before_install:
   - export PATH=$HOME/miniconda3/bin:$PATH
   - conda update --yes conda
   - conda create --yes -n ingeotec python=$python
-  - source activate ingeotec  
+  - source activate ingeotec
+  - conda config --append channels ingeotec  
+  - conda install --yes numpy 
+  - conda install --yes scipy 
+  - conda install --yes scikit-learn
+  # - conda install --yes gensim
+  - conda install --yes nltk nose
   - conda install --yes pip
   - pip install coverage
   - pip install coveralls
-  - conda config --append channels ingeotec  
-  - conda install --yes numpy scipy scikit-learn gensim nltk nose
   - python setup.py build_ext --inplace
 
 script:

ConceptModelling/__init__.py

@@ -12,4 +12,4 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-__version__ = '0.1.1'
+__version__ = '0.1.2'

appveyor.yml

@@ -1,7 +1,7 @@
 environment:
   # See README for information on the token
   BINSTAR_TOKEN:
-    secure: FU5GdoruzB7YIvgFGqewEPvLiKhu8nY9m92egLN6lAFeIj+dlkKm5zBeRzmAM35G
+    secure: rZkidrXyfugJVOvrTMe/S364IGc+K+H8a1Lt/UGBXh5AqqdaFfN2U+JnPJangzx3
 
   global:
     # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the

conda-recipe/meta.yaml

@@ -1,6 +1,6 @@
 package:
   name: conceptmodelling
-  version: "0.1.1"
+  version: "0.1.2"
 
 requirements:
   build:
@@ -16,7 +16,7 @@ test:
         - numpy
         - scipy
         - scikit-learn
-        - gensim
+        # - gensim
         - nltk
         - coverage