Merge pull request #74 from jdebacker/version_bump

Bump version to include 3.8

Author: MattHJensen

.travis.yml

@@ -3,6 +3,7 @@ language: python
 python:
   - "3.6"
   - "3.7"
+  - "3.8"
 
 install:
   # Install conda
@@ -14,15 +15,15 @@ install:
   - conda create -n behresp-dev python=$TRAVIS_PYTHON_VERSION;
   - source activate behresp-dev
   - conda env update -f environment.yml
+  - pip install pytest-pycodestyle 
   - pip install pyyaml
-  - pip install pytest-pep8
   - pip install coverage
   - pip install codecov
   - python setup.py install
 
 # command to run tests
 script:
-  - python -c "import behresp"; coverage run -m pytest -v -m "not requires_pufcsv and not pre_release and not local" --pep8
+  - python -c "import behresp"; coverage run -m pytest -v -m "not requires_pufcsv and not pre_release and not local" --pycodestyle
 
 after_success:
   - codecov

behresp/tests/test_behavior.py

@@ -76,9 +76,9 @@ def test_nondefault_response_function(be_inc, cps_subsample):
     del df1
     del df2
     if be_inc == 0.0:
-        assert np.allclose([itax1, itax2], [1461.002, 1407.800])
+        assert np.allclose([itax1, itax2], [1355.556, 1304.984])
     elif be_inc == -0.1:
-        assert np.allclose([itax1, itax2], [1461.002, 1406.627])
+        assert np.allclose([itax1, itax2], [1355.556, 1303.898])
 
 
 def test_alternative_behavior_parameters(cps_subsample):
@@ -107,7 +107,7 @@ def test_alternative_behavior_parameters(cps_subsample):
     itax2 = round((df2['iitax'] * df2['s006']).sum() * 1e-9, 3)
     del df1
     del df2
-    assert np.allclose([itax1, itax2], [1461.002, 1402.725])
+    assert np.allclose([itax1, itax2], [1355.556, 1302.09])
 
 
 def test_quantity_response():

conda.recipe/meta.yaml

@@ -5,11 +5,13 @@ package:
 requirements:
   build:
     - python
-    - "taxcalc>=2.3.0"
+    - "taxcalc>=3.0.0"
+    - pytest
 
   run:
     - python
-    - "taxcalc>=2.3.0"
+    - "taxcalc>=3.0.0"
+    - pytest
 
 test:
   imports:

environment.yml

@@ -1,6 +1,8 @@
 name: behresp-dev
 channels:
 - PSLmodels
+- conda-forge
 dependencies:
 - python
-- "taxcalc>=2.3.0"
+- "taxcalc>=3.0.0"
+- pytest

pytest.ini pytests.inipytest.ini renamed to pytests.ini

@@ -4,7 +4,7 @@
     from distutils.core import setup
 
 with open('README.md') as f:
-        longdesc = f.read()
+    longdesc = f.read()
 
 version = '0.0.0'
 
@@ -30,6 +30,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Software Development :: Libraries :: Python Modules'],
     'tests_require': ['pytest']
 }