Skip to content

Commit

Permalink
Drop Python 3.6 support (pandas-dev#35214)
Browse files Browse the repository at this point in the history
* DEPS: drop 3.6 (pandas-dev#34472)

* DEPS: drop 3.6 (pandas-dev#34472)

* DEPS: fix file name (pandas-dev#34472)

* DEPS: fix import (pandas-dev#34472)

* DEPS: fix job name (pandas-dev#34472)

* DEPS: resolve min version conflicts (pandas-dev#34472)

* DEPS: fix env name (pandas-dev#34472)

* DEPS: remove py36 check in test, bump matplotlib (pandas-dev#34472)

* DEPS: fix travis 37 locale (pandas-dev#34472)

* DEPS: remove PY37 check from tests (pandas-dev#34472)

* DEPS: remove import (pandas-dev#34472)

* DEPS: remove PY37 in benchmark (pandas-dev#34472)

* try to fix timeout

* pytable version

* update minimum version

* remove xfail for test apply

* remove import

* try to fix timeout

* try to fix timeout

* try to fix timeout

* bump to 3.7.1 to fix timeout

* migrate ci

* fix env name

* remove py37-locale from azure

* resolve conflicts

* update ci

* update ci

* sync with master

* whatsnew and install doc

* whatsnew and install doc

* update environment.yml

* update environment.yml

* uncomment azure p37 locale

* move min pyarrow test

* bumpy numpy to 1.16.5

* bumpy numpy to 1.16.5

* fix 32bit

* comment out 32bit CI

* update numpy version in numpy/__init__.py

* remove import from numpy/__init__.py

* filter DeprecationWarning

* filter DeprecationWarning

* skip unreliable test for windows

* skip unreliable test for windows

* fix parameter order in docstring

* skip test

* skip test
  • Loading branch information
fangchenli authored Aug 11, 2020
1 parent c87e40c commit 8380708
Show file tree
Hide file tree
Showing 39 changed files with 283 additions and 401 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ matrix:
- JOB="3.7, arm64" PYTEST_WORKERS=8 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard)"

- env:
- JOB="3.6, locale" ENV_FILE="ci/deps/travis-36-locale.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" SQL="1"
- JOB="3.7, locale" ENV_FILE="ci/deps/travis-37-locale.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" SQL="1"
services:
- mysql
- postgresql
Expand All @@ -54,7 +54,7 @@ matrix:
# Enabling Deprecations when running tests
# PANDAS_TESTING_MODE="deprecate" causes DeprecationWarning messages to be displayed in the logs
# See pandas/_testing.py for more details.
- JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36-cov.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" PANDAS_TESTING_MODE="deprecate" COVERAGE=true SQL="1"
- JOB="3.7, coverage" ENV_FILE="ci/deps/travis-37-cov.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" PANDAS_TESTING_MODE="deprecate" COVERAGE=true SQL="1"
services:
- mysql
- postgresql
Expand Down
24 changes: 9 additions & 15 deletions asv_bench/benchmarks/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,16 @@
import subprocess
import sys

from pandas.compat import PY37


class TimeImport:
def time_import(self):
if PY37:
# on py37+ we the "-X importtime" usage gives us a more precise
# measurement of the import time we actually care about,
# without the subprocess or interpreter overhead
cmd = [sys.executable, "-X", "importtime", "-c", "import pandas as pd"]
p = subprocess.run(cmd, stderr=subprocess.PIPE)

line = p.stderr.splitlines()[-1]
field = line.split(b"|")[-2].strip()
total = int(field) # microseconds
return total
# on py37+ we the "-X importtime" usage gives us a more precise
# measurement of the import time we actually care about,
# without the subprocess or interpreter overhead
cmd = [sys.executable, "-X", "importtime", "-c", "import pandas as pd"]
p = subprocess.run(cmd, stderr=subprocess.PIPE)

cmd = [sys.executable, "-c", "import pandas as pd"]
subprocess.run(cmd, stderr=subprocess.PIPE)
line = p.stderr.splitlines()[-1]
field = line.split(b"|")[-2].strip()
total = int(field) # microseconds
return total
52 changes: 26 additions & 26 deletions ci/azure/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,57 +9,57 @@ jobs:
strategy:
matrix:
${{ if eq(parameters.name, 'macOS') }}:
py36_macos:
ENV_FILE: ci/deps/azure-macos-36.yaml
CONDA_PY: "36"
py37_macos:
ENV_FILE: ci/deps/azure-macos-37.yaml
CONDA_PY: "37"
PATTERN: "not slow and not network"

${{ if eq(parameters.name, 'Linux') }}:
py36_minimum_versions:
ENV_FILE: ci/deps/azure-36-minimum_versions.yaml
CONDA_PY: "36"
py37_minimum_versions:
ENV_FILE: ci/deps/azure-37-minimum_versions.yaml
CONDA_PY: "37"
PATTERN: "not slow and not network and not clipboard"

py36_locale_slow_old_np:
ENV_FILE: ci/deps/azure-36-locale_slow.yaml
CONDA_PY: "36"
py37_locale_slow:
ENV_FILE: ci/deps/azure-37-locale_slow.yaml
CONDA_PY: "37"
PATTERN: "slow"
# pandas does not use the language (zh_CN), but should support different encodings (utf8)
# we should test with encodings different than utf8, but doesn't seem like Ubuntu supports any
LANG: "zh_CN.utf8"
LC_ALL: "zh_CN.utf8"
EXTRA_APT: "language-pack-zh-hans"

py36_slow:
ENV_FILE: ci/deps/azure-36-slow.yaml
CONDA_PY: "36"
py37_slow:
ENV_FILE: ci/deps/azure-37-slow.yaml
CONDA_PY: "37"
PATTERN: "slow"

py36_locale:
ENV_FILE: ci/deps/azure-36-locale.yaml
CONDA_PY: "36"
py37_locale:
ENV_FILE: ci/deps/azure-37-locale.yaml
CONDA_PY: "37"
PATTERN: "not slow and not network"
LANG: "it_IT.utf8"
LC_ALL: "it_IT.utf8"
EXTRA_APT: "language-pack-it xsel"

#py36_32bit:
# ENV_FILE: ci/deps/azure-36-32bit.yaml
# CONDA_PY: "36"
# PATTERN: "not slow and not network and not clipboard"
# BITS32: "yes"
# py37_32bit:
# ENV_FILE: ci/deps/azure-37-32bit.yaml
# CONDA_PY: "37"
# PATTERN: "not slow and not network and not clipboard"
# BITS32: "yes"

py37_locale:
ENV_FILE: ci/deps/azure-37-locale.yaml
CONDA_PY: "37"
py38_locale:
ENV_FILE: ci/deps/azure-38-locale.yaml
CONDA_PY: "38"
PATTERN: "not slow and not network"
LANG: "zh_CN.utf8"
LC_ALL: "zh_CN.utf8"
EXTRA_APT: "language-pack-zh-hans xsel"

py37_np_dev:
ENV_FILE: ci/deps/azure-37-numpydev.yaml
CONDA_PY: "37"
py38_np_dev:
ENV_FILE: ci/deps/azure-38-numpydev.yaml
CONDA_PY: "38"
PATTERN: "not slow and not network"
TEST_ARGS: "-W error"
PANDAS_TESTING_MODE: "deprecate"
Expand Down
12 changes: 6 additions & 6 deletions ci/azure/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ jobs:
vmImage: ${{ parameters.vmImage }}
strategy:
matrix:
py36_np15:
ENV_FILE: ci/deps/azure-windows-36.yaml
CONDA_PY: "36"
PATTERN: "not slow and not network"

py37_np18:
py37_np16:
ENV_FILE: ci/deps/azure-windows-37.yaml
CONDA_PY: "37"
PATTERN: "not slow and not network"

py38_np18:
ENV_FILE: ci/deps/azure-windows-38.yaml
CONDA_PY: "38"
PATTERN: "not slow and not network"

steps:
- powershell: |
Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
Expand Down
8 changes: 4 additions & 4 deletions ci/deps/azure-36-32bit.yaml → ci/deps/azure-37-32bit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ channels:
- defaults
- conda-forge
dependencies:
- python=3.6.*
- python=3.7.*

# tools
### Cython 0.29.13 and pytest 5.0.1 for 32 bits are not available with conda, installing below with pip instead
### Cython 0.29.16 and pytest 5.0.1 for 32 bits are not available with conda, installing below with pip instead
- pytest-xdist>=1.21
- hypothesis>=3.58.0
- pytest-azurepipelines
Expand All @@ -15,12 +15,12 @@ dependencies:
- attrs=19.1.0
- gcc_linux-32
- gxx_linux-32
- numpy=1.14.*
- python-dateutil
- pytz=2017.2
- pytz=2017.3

# see comment above
- pip
- pip:
- cython>=0.29.16
- numpy>=1.16.5
- pytest>=5.0.1
8 changes: 3 additions & 5 deletions ci/deps/azure-37-locale.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: pandas-dev
channels:
- defaults
- conda-forge
dependencies:
- python=3.7.*
Expand All @@ -22,7 +23,7 @@ dependencies:
- moto
- nomkl
- numexpr
- numpy
- numpy=1.16.*
- openpyxl
- pytables
- python-dateutil
Expand All @@ -32,7 +33,4 @@ dependencies:
- xlrd
- xlsxwriter
- xlwt
- pyarrow>=0.15
- pip
- pip:
- pyxlsb
- moto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- defaults
- conda-forge
dependencies:
- python=3.6.*
- python=3.7.*

# tools
- cython>=0.29.16
Expand All @@ -16,17 +16,15 @@ dependencies:
- beautifulsoup4=4.6.0
- bottleneck=1.2.*
- lxml
- matplotlib=2.2.2
- numpy=1.14.*
- matplotlib=3.0.0
- numpy=1.16.*
- openpyxl=2.5.7
- python-dateutil
- python-blosc
- pytz=2017.2
- pytz=2017.3
- scipy
- sqlalchemy=1.1.4
- sqlalchemy=1.2.8
- xlrd=1.1.0
- xlsxwriter=0.9.8
- xlwt=1.2.0
- pip
- pip:
- html5lib==1.0b2
- xlsxwriter=1.0.2
- xlwt=1.3.0
- html5lib=1.0.1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: pandas-dev
channels:
- conda-forge
dependencies:
- python=3.6.1
- python=3.7.1

# tools
- cython=0.29.16
Expand All @@ -15,16 +15,17 @@ dependencies:
# pandas dependencies
- beautifulsoup4=4.6.0
- bottleneck=1.2.1
- jinja2=2.8
- jinja2=2.10
- numba=0.46.0
- numexpr=2.6.2
- numpy=1.15.4
- numexpr=2.6.8
- numpy=1.16.5
- openpyxl=2.5.7
- pytables=3.4.3
- pytables=3.4.4
- python-dateutil=2.7.3
- pytz=2017.2
- pytz=2017.3
- pyarrow=0.15
- scipy=1.2
- xlrd=1.1.0
- xlsxwriter=0.9.8
- xlwt=1.2.0
- xlsxwriter=1.0.2
- xlwt=1.3.0
- html5lib=1.0.1
2 changes: 1 addition & 1 deletion ci/deps/azure-36-slow.yaml → ci/deps/azure-37-slow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- defaults
- conda-forge
dependencies:
- python=3.6.*
- python=3.7.*

# tools
- cython>=0.29.16
Expand Down
16 changes: 8 additions & 8 deletions ci/deps/azure-36-locale.yaml → ci/deps/azure-38-locale.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name: pandas-dev
channels:
- defaults
- conda-forge
dependencies:
- python=3.6.*
- python=3.8.*

# tools
- cython>=0.29.16
Expand All @@ -19,14 +18,12 @@ dependencies:
- ipython
- jinja2
- lxml
- matplotlib=3.0.*
- matplotlib <3.3.0
- moto
- nomkl
- numexpr
- numpy=1.15.*
- numpy
- openpyxl
# lowest supported version of pyarrow (putting it here instead of in
# azure-36-minimum_versions because it needs numpy >= 1.14)
- pyarrow=0.13
- pytables
- python-dateutil
- pytz
Expand All @@ -35,4 +32,7 @@ dependencies:
- xlrd
- xlsxwriter
- xlwt
- moto
- pyarrow>=0.15
- pip
- pip:
- pyxlsb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: pandas-dev
channels:
- defaults
dependencies:
- python=3.7.*
- python=3.8.*

# tools
- pytest>=5.0.1
Expand Down
6 changes: 3 additions & 3 deletions ci/deps/azure-macos-36.yaml → ci/deps/azure-macos-37.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: pandas-dev
channels:
- defaults
dependencies:
- python=3.6.*
- python=3.7.*

# tools
- pytest>=5.0.1
Expand All @@ -19,9 +19,9 @@ dependencies:
- matplotlib=2.2.3
- nomkl
- numexpr
- numpy=1.15.4
- numpy=1.16.5
- openpyxl
- pyarrow>=0.13.0
- pyarrow>=0.15.0
- pytables
- python-dateutil==2.7.3
- pytz
Expand Down
4 changes: 2 additions & 2 deletions ci/deps/azure-windows-37.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ dependencies:
- matplotlib=2.2.*
- moto
- numexpr
- numpy=1.18.*
- numpy=1.16.*
- openpyxl
- pyarrow=0.14
- pyarrow=0.15
- pytables
- python-dateutil
- pytz
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- conda-forge
- defaults
dependencies:
- python=3.6.*
- python=3.8.*

# tools
- cython>=0.29.16
Expand All @@ -16,13 +16,13 @@ dependencies:
- blosc
- bottleneck
- fastparquet>=0.3.2
- matplotlib=3.0.2
- matplotlib=3.1.3
- numba
- numexpr
- numpy=1.15.*
- numpy=1.18.*
- openpyxl
- jinja2
- pyarrow>=0.13.0
- pyarrow>=0.15.0
- pytables
- python-dateutil
- pytz
Expand Down
Loading

0 comments on commit 8380708

Please sign in to comment.