Merge pull request #1361 from martinholmer/update-env

Update Tax-Calculator testing/build environments

.travis.yml

@@ -2,8 +2,8 @@ sudo: false
 
 language: python
 python:
+  - "3.6"
   - "3.5"
-  - "3.4"
   - "2.7"
 
 install:

appveyor.yml

@@ -10,10 +10,8 @@ environment:
 
   matrix:
     # Since appveyor is quite slow, we only use a single configuration
-    - PYTHON: "3.5"
+    - PYTHON: "3.6"
       ARCH: "64"
-      NUMPY: "1.10"
-      PANDAS: "0.18"
       CONDA_ENV: taxcalc-dev
 
 init:

conda.recipe/meta.yaml

@@ -8,20 +8,16 @@ build:
 
 requirements:
   build:
-    - pytest
-    - setuptools
     - python
-    - numpy >=1.11.2
-    - pandas >=0.18.0
+    - numpy >=1.12.1
+    - pandas >=0.20.1
     - numba
     - toolz
     - six
   run:
-    - pytest
-    - setuptools
     - python
-    - numpy >=1.11.2
-    - pandas >=0.18.0
+    - numpy >=1.12.1
+    - pandas >=0.20.1
     - numba
     - toolz
     - six

environment.yml

@@ -1,9 +1,7 @@
 name: taxcalc-dev
 dependencies:
-- pytest
-- setuptools
-- numpy >=1.11.2
-- pandas >=0.18.0
+- numpy >=1.12.1
+- pandas >=0.20.1
 - numba
 - toolz
 - six
@@ -12,5 +10,5 @@ dependencies:
 - pep8
 - pylint
 - coverage
-- pip:
-  - pytest-pep8
+- pytest-pep8
+

read-the-docs/source/contributor_guide.rst

@@ -109,7 +109,6 @@ Setup Git
    .. code-block:: python
 
       tax-calculator$ conda update conda
-      tax-calculator$ conda update anaconda
       tax-calculator$ conda env update
 
 If you've made it this far, you've successfully made a remote copy (a

setup.py

@@ -40,8 +40,8 @@
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Software Development :: Libraries :: Python Modules'],
     'tests_require': ['pytest']
 }

taxcalc/tests/test_utils.py

@@ -8,7 +8,6 @@
 # pylint: disable=missing-docstring
 
 import os
-import sys
 import math
 import filecmp
 import tempfile
@@ -303,9 +302,6 @@ def test_weighted_share_of_total():
 EPSILON = 1e-5
 
 
-@pytest.mark.skipif((sys.version_info.major == 3 and
-                     sys.version_info.minor == 4),
-                    reason="name is string (not interval) in Python 3.4")
 def test_add_income_bins():
     dta = np.arange(1, 1e6, 5000)
     dfx = pd.DataFrame(data=dta, columns=['expanded_income'])
@@ -327,9 +323,6 @@ def test_add_income_bins():
         idx += 1
 
 
-@pytest.mark.skipif((sys.version_info.major == 3 and
-                     sys.version_info.minor == 4),
-                    reason="name is string (not interval) in Python 3.4")
 def test_add_income_bins_soi():
     dta = np.arange(1, 1e6, 5000)
     dfx = pd.DataFrame(data=dta, columns=['expanded_income'])
@@ -352,9 +345,6 @@ def test_add_income_bins_soi():
         idx += 1
 
 
-@pytest.mark.skipif((sys.version_info.major == 3 and
-                     sys.version_info.minor == 4),
-                    reason="name is string (not interval) in Python 3.4")
 def test_add_exp_income_bins():
     dta = np.arange(1, 1e6, 5000)
     dfx = pd.DataFrame(data=dta, columns=['expanded_income'])