diff --git a/.travis.yml b/.travis.yml index 0861d5fbb..2a8bc4912 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ sudo: false language: python python: + - "3.6" - "3.5" - - "3.4" - "2.7" install: diff --git a/appveyor.yml b/appveyor.yml index 85dc2fd3f..4738a1323 100644 --- a/appveyor.yml +++ b/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: diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 1f60694fc..818fc7197 100755 --- a/conda.recipe/meta.yaml +++ b/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 diff --git a/distribution/upload.sh b/distribution/upload.sh deleted file mode 100755 index 66a772d81..000000000 --- a/distribution/upload.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -cd $TAXCALC_PACKAGE_DIR -anaconda upload ~/miniconda3/conda-bld/osx-64/taxcalc-$1-np110py27_0.tar.bz2 -anaconda upload ./linux-32/taxcalc-$1-np110py27_0.tar.bz2 -anaconda upload ./linux-64/taxcalc-$1-np110py27_0.tar.bz2 -anaconda upload ./win-64/taxcalc-$1-np110py27_0.tar.bz2 -anaconda upload ./win-32/taxcalc-$1-np110py27_0.tar.bz2 -echo "FINISHED package upload" diff --git a/distribution/version_and_release.sh b/distribution/version_and_release.sh deleted file mode 100755 index 671ee0bb2..000000000 --- a/distribution/version_and_release.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# Run this at the root of the repo! -source activate taxcalc-dev -git tag $1 -echo "finished tag, now distributing to PyPI" -python setup.py register sdist upload -echo "FINISHED UPLOAD TO PYPI" -git push; git push --tags -echo "FINISHED push " -rm ~/code/tc.tar -echo "FINISHED rm tar " -rm -rf ~/code/Tax-Calculator -echo "FINISHED rm dir " -git archive --prefix=Tax-Calculator/ -o ~/code/tc.tar $1 -echo "FINISHED git archive" -cd ~/code/ -tar xvf tc.tar -echo "FINISHED tar extract" -cd Tax-Calculator/conda.recipe -sed -i '' 's/version: 0.0.0/version: '${1}'/g' meta.yaml -echo "FINISHED changing meta.yaml" -conda build --python 2.7 . -echo "FINISHED CONDA BUILD" -cd $TAXCALC_PACKAGE_DIR -conda convert -p all ~/miniconda3/conda-bld/osx-64/taxcalc-$1-np110py27_0.tar.bz2 -o . -echo "FINISHED CONDA CONVERT" diff --git a/environment.yml b/environment.yml index afca84c78..cc3f1230a 100644 --- a/environment.yml +++ b/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 + diff --git a/read-the-docs/source/contributor_guide.rst b/read-the-docs/source/contributor_guide.rst index 9af0c3c07..1c19702f3 100644 --- a/read-the-docs/source/contributor_guide.rst +++ b/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 diff --git a/setup.py b/setup.py index 8d6574a23..1b1195c8a 100755 --- a/setup.py +++ b/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'] } diff --git a/taxcalc/tests/test_utils.py b/taxcalc/tests/test_utils.py index f51db0ae1..6549f6f02 100644 --- a/taxcalc/tests/test_utils.py +++ b/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'])