Merge pull request #228 from jdebacker/channel

Update conda channel from ospc to PSLmodels

.travis.yml

@@ -2,7 +2,6 @@ sudo: false
 
 language: Python
 python:
-  - "2.7"
   - "3.6"
 
 install:
@@ -17,7 +16,7 @@ install:
   - conda install --file conda-requirements.txt # xlrd, possibly others
   - export BUILD_DIR=`pwd`
   - pip install -r requirements.txt
-  - conda install -c ospc taxcalc
+  - conda install -c PSLmodels taxcalc
   - export BTAX_OUT_DIR=btax_output_dir # make an output dir
   - export BTAX_CUR_DIR=${BUILD_DIR}/btax
   - mkdir btax_output_dir

environment.yml

@@ -1,6 +1,6 @@
 name: btax-dev
 channels:
-- ospc
+- PSLmodels
 dependencies:
 - python=3.6
 - taxcalc

setup.py

@@ -12,7 +12,6 @@
     'description': 'B-Tax: A Cost of Capital Calculator',
     'url': 'https://github.com/open-source-economics/B-Tax',
     'download_url': 'https://github.com/open-source-economics/B-Tax',
-    'description': 'btax',
     'long_description': longdesc,
     'version': version,
     'license': 'CC0 1.0 Universal public domain dedication',