diff --git a/.travis.yml b/.travis.yml index e478d71a5c350..405f9a013a330 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,14 +36,6 @@ matrix: env: - JOB="3.7" ENV_FILE="ci/deps/travis-37.yaml" PATTERN="(not slow and not network)" - - dist: trusty - env: - - JOB="2.7" ENV_FILE="ci/deps/travis-27.yaml" PATTERN="(not slow or (single and db))" - addons: - apt: - packages: - - python-gtk2 - - dist: trusty env: - JOB="3.6, locale" ENV_FILE="ci/deps/travis-36-locale.yaml" PATTERN="((not slow and not network) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f0567d76659b6..6c30ec641f292 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,7 +10,6 @@ jobs: name: Linux vmImage: ubuntu-16.04 -# Windows Python 2.7 needs VC 9.0 installed, handled in the template - template: ci/azure/windows.yml parameters: name: Windows diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index b9e0cd0b9258c..79218d7fd2a9b 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -15,18 +15,6 @@ jobs: PATTERN: "not slow and not network" ${{ if eq(parameters.name, 'Linux') }}: - py27_np_120: - ENV_FILE: ci/deps/azure-27-compat.yaml - CONDA_PY: "27" - PATTERN: "not slow and not network" - - py27_locale_slow_old_np: - ENV_FILE: ci/deps/azure-27-locale.yaml - CONDA_PY: "27" - PATTERN: "slow" - LOCALE_OVERRIDE: "zh_CN.UTF-8" - EXTRA_APT: "language-pack-zh-hans" - py36_locale_slow: ENV_FILE: ci/deps/azure-36-locale_slow.yaml CONDA_PY: "36" diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index cece002024936..13f2442806422 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -12,23 +12,12 @@ jobs: ENV_FILE: ci/deps/azure-windows-36.yaml CONDA_PY: "36" - py27_np121: - ENV_FILE: ci/deps/azure-windows-27.yaml - CONDA_PY: "27" - steps: - task: CondaEnvironment@1 inputs: updateConda: no packageSpecs: '' - - powershell: | - $wc = New-Object net.webclient - $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi") - Start-Process "VCForPython27.msi" /qn -Wait - displayName: 'Install VC 9.0 only for Python 2.7' - condition: eq(variables.CONDA_PY, '27') - - script: | ci\\incremental\\setup_conda_environment.cmd displayName: 'Before Install' diff --git a/ci/deps/azure-27-compat.yaml b/ci/deps/azure-27-compat.yaml deleted file mode 100644 index 8899e22bdf6cf..0000000000000 --- a/ci/deps/azure-27-compat.yaml +++ /dev/null @@ -1,26 +0,0 @@ -name: pandas-dev -channels: - - defaults - - conda-forge -dependencies: - - bottleneck=1.2.0 - - cython=0.28.2 - - jinja2=2.8 - - numexpr=2.6.1 - - numpy=1.12.0 - - openpyxl=2.5.5 - - pytables=3.4.2 - - python-dateutil=2.5.0 - - python=2.7* - - pytz=2013b - - scipy=0.18.1 - - xlrd=1.0.0 - - xlsxwriter=0.5.2 - - xlwt=0.7.5 - # universal - - pytest - - pytest-xdist - - pip: - - html5lib==1.0b2 - - beautifulsoup4==4.2.1 - - hypothesis>=3.58.0 diff --git a/ci/deps/azure-27-locale.yaml b/ci/deps/azure-27-locale.yaml deleted file mode 100644 index 0846ef5e8264e..0000000000000 --- a/ci/deps/azure-27-locale.yaml +++ /dev/null @@ -1,28 +0,0 @@ -name: pandas-dev -channels: - - defaults - - conda-forge -dependencies: - - bottleneck=1.2.0 - - cython=0.28.2 - - lxml - - matplotlib=2.0.0 - - numpy=1.12.0 - - openpyxl=2.4.0 - - python-dateutil - - python-blosc - - python=2.7 - - pytz - - pytz=2013b - - scipy - - sqlalchemy=0.8.1 - - xlrd=1.0.0 - - xlsxwriter=0.5.2 - - xlwt=0.7.5 - # universal - - pytest - - pytest-xdist - - hypothesis>=3.58.0 - - pip: - - html5lib==1.0b2 - - beautifulsoup4==4.2.1 diff --git a/ci/deps/azure-windows-27.yaml b/ci/deps/azure-windows-27.yaml deleted file mode 100644 index b1533b071fa74..0000000000000 --- a/ci/deps/azure-windows-27.yaml +++ /dev/null @@ -1,31 +0,0 @@ -name: pandas-dev -channels: - - defaults - - conda-forge -dependencies: - - beautifulsoup4 - - bottleneck - - dateutil - - gcsfs - - html5lib - - jinja2=2.8 - - lxml - - matplotlib=2.0.1 - - numexpr - - numpy=1.12* - - openpyxl - - pytables - - python=2.7.* - - pytz - - s3fs - - scipy - - sqlalchemy - - xlrd - - xlsxwriter - - xlwt - # universal - - cython>=0.28.2 - - pytest - - pytest-xdist - - moto - - hypothesis>=3.58.0 diff --git a/ci/deps/travis-27.yaml b/ci/deps/travis-27.yaml deleted file mode 100644 index 2624797b24fa1..0000000000000 --- a/ci/deps/travis-27.yaml +++ /dev/null @@ -1,49 +0,0 @@ -name: pandas-dev -channels: - - defaults - - conda-forge -dependencies: - - beautifulsoup4 - - bottleneck - - cython=0.28.2 - - fastparquet>=0.2.1 - - gcsfs - - html5lib - - ipython - - jemalloc=4.5.0.post - - jinja2=2.8 - - lxml - - matplotlib=2.2.2 - - mock - - nomkl - - numexpr - - numpy=1.13* - - openpyxl=2.4.0 - - patsy - - psycopg2 - - py - - pyarrow=0.9.0 - - PyCrypto - - pymysql=0.6.3 - - pytables - - blosc=1.14.3 - - python-blosc - - python-dateutil=2.5.0 - - python=2.7* - - pytz=2013b - - s3fs - - scipy - - sqlalchemy=0.9.6 - - xarray=0.9.6 - - xlrd=1.0.0 - - xlsxwriter=0.5.2 - - xlwt=0.7.5 - # universal - - pytest - - pytest-xdist - - moto==1.3.4 - - hypothesis>=3.58.0 - - pip: - - backports.lzma - - pandas-gbq - - pathlib diff --git a/tox.ini b/tox.ini index f055251581a93..8f43b9b7dbec5 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py27, py35, py36 +envlist = py35, py36 [testenv] deps = @@ -43,13 +43,6 @@ commands = # tox should provide a preinstall-commands hook. pip uninstall pandas -qy -[testenv:py27] -deps = - numpy==1.8.1 - boto - bigquery - {[testenv]deps} - [testenv:py35] deps = numpy==1.10.0