Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop Python 3.6 support #35214

Merged
merged 68 commits into from
Aug 11, 2020
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
ebd254d
DEPS: drop 3.6 (#34472)
fangchenli Jul 10, 2020
b415ac9
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Jul 10, 2020
71d950d
DEPS: drop 3.6 (#34472)
fangchenli Jul 10, 2020
15cd795
DEPS: fix file name (#34472)
fangchenli Jul 10, 2020
45ff57f
DEPS: fix import (#34472)
fangchenli Jul 10, 2020
d6ccbaf
DEPS: fix job name (#34472)
fangchenli Jul 10, 2020
ef13449
DEPS: resolve min version conflicts (#34472)
fangchenli Jul 10, 2020
d46c764
DEPS: fix env name (#34472)
fangchenli Jul 10, 2020
07dea22
DEPS: remove py36 check in test, bump matplotlib (#34472)
fangchenli Jul 10, 2020
2f9299f
DEPS: fix travis 37 locale (#34472)
fangchenli Jul 10, 2020
f493979
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Jul 10, 2020
34d3e69
DEPS: remove PY37 check from tests (#34472)
fangchenli Jul 10, 2020
8ec1d0b
DEPS: remove import (#34472)
fangchenli Jul 11, 2020
11c8654
DEPS: remove PY37 in benchmark (#34472)
fangchenli Jul 11, 2020
3522442
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Jul 11, 2020
dd42178
try to fix timeout
fangchenli Jul 11, 2020
e3c34bd
pytable version
fangchenli Jul 11, 2020
9e676dd
update minimum version
fangchenli Jul 11, 2020
2acad80
remove xfail for test apply
fangchenli Jul 11, 2020
5d6b5df
remove import
fangchenli Jul 11, 2020
6408afa
try to fix timeout
fangchenli Jul 12, 2020
cd6d49e
try to fix timeout
fangchenli Jul 12, 2020
64ad8d2
try to fix timeout
fangchenli Jul 12, 2020
0841147
bump to 3.7.1 to fix timeout
fangchenli Jul 12, 2020
74b80de
resolve conflict
fangchenli Jul 16, 2020
7532c06
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Jul 22, 2020
65d8bbe
migrate ci
fangchenli Jul 22, 2020
d1a7d7f
fix env name
fangchenli Jul 22, 2020
b8e7040
remove py37-locale from azure
fangchenli Jul 23, 2020
2fb8e62
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Jul 27, 2020
f90ac2e
resolve conflicts
fangchenli Jul 27, 2020
cb811ca
update ci
fangchenli Jul 27, 2020
ef5641b
update ci
fangchenli Jul 27, 2020
7f67365
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Jul 29, 2020
5a6fa8d
sync with master
fangchenli Jul 29, 2020
6fe2c08
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Jul 29, 2020
0910c82
whatsnew and install doc
fangchenli Jul 29, 2020
e3f7fd3
whatsnew and install doc
fangchenli Jul 29, 2020
34a77fe
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Aug 1, 2020
22d2c30
update environment.yml
fangchenli Aug 1, 2020
5405b57
update environment.yml
fangchenli Aug 1, 2020
90bedcf
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Aug 4, 2020
2337e22
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Aug 5, 2020
f1d831a
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Aug 7, 2020
0a10c9d
uncomment azure p37 locale
fangchenli Aug 7, 2020
d42139e
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Aug 7, 2020
a1991ec
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Aug 7, 2020
a204500
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Aug 7, 2020
8685719
move min pyarrow test
fangchenli Aug 7, 2020
efdb11a
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Aug 7, 2020
968098a
bumpy numpy to 1.16.5
fangchenli Aug 7, 2020
ead2fb2
bumpy numpy to 1.16.5
fangchenli Aug 7, 2020
c3f7166
fix 32bit
fangchenli Aug 7, 2020
f1ef0d8
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Aug 7, 2020
566e635
comment out 32bit CI
fangchenli Aug 7, 2020
106a5d7
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Aug 8, 2020
43d2256
update numpy version in numpy/__init__.py
fangchenli Aug 8, 2020
5edb053
remove import from numpy/__init__.py
fangchenli Aug 8, 2020
f8020cf
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Aug 8, 2020
54d2079
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Aug 9, 2020
b71f199
Merge remote-tracking branch 'upstream/master' into drop-3.6
fangchenli Aug 10, 2020
3d56e00
filter DeprecationWarning
fangchenli Aug 10, 2020
13d4cb2
filter DeprecationWarning
fangchenli Aug 10, 2020
8ca6918
skip unreliable test for windows
fangchenli Aug 10, 2020
0fa361c
skip unreliable test for windows
fangchenli Aug 10, 2020
081f478
fix parameter order in docstring
fangchenli Aug 10, 2020
5bcbff3
skip test
fangchenli Aug 10, 2020
a69ecfe
skip test
fangchenli Aug 10, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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"
fangchenli marked this conversation as resolved.
Show resolved Hide resolved
- 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))" 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
35 changes: 6 additions & 29 deletions ci/azure/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,40 +9,17 @@ 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:
fangchenli marked this conversation as resolved.
Show resolved Hide resolved
ENV_FILE: ci/deps/azure-36-locale_slow.yaml
CONDA_PY: "36"
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"
PATTERN: "slow"

py36_locale:
ENV_FILE: ci/deps/azure-36-locale.yaml
CONDA_PY: "36"
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"
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: pandas-dev
channels:
- conda-forge
dependencies:
- python=3.6.1
- python=3.7.0

# tools
- cython=0.29.16
- pytest=5.0.1
- pytest=5.1.1
- pytest-xdist>=1.21
- hypothesis>=3.58.0
- pytest-azurepipelines
Expand All @@ -15,16 +15,16 @@ 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.0
fangchenli marked this conversation as resolved.
Show resolved Hide resolved
- openpyxl=2.5.7
- pytables=3.4.3
- python-dateutil=2.7.3
- pytz=2017.2
- pytables=3.5.1
- python-dateutil=2.7.4
- pytz=2018.3
- 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
fangchenli marked this conversation as resolved.
Show resolved Hide resolved
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 Down
2 changes: 1 addition & 1 deletion ci/deps/azure-windows-37.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies:
- matplotlib=2.2.*
- moto
- numexpr
- numpy=1.18.*
- numpy=1.16.*
- openpyxl
- pyarrow=0.14
- pytables
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,10 +16,10 @@ 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
Expand Down
4 changes: 2 additions & 2 deletions ci/deps/travis-36-cov.yaml → ci/deps/travis-37-cov.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 All @@ -26,7 +26,7 @@ dependencies:
- moto
- nomkl
- numexpr
- numpy=1.15.*
- numpy=1.16.*
- odfpy
- openpyxl
- pandas-gbq
Expand Down
10 changes: 5 additions & 5 deletions ci/deps/travis-36-locale.yaml → ci/deps/travis-37-locale.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 All @@ -19,22 +19,22 @@ dependencies:
- html5lib
- ipython
- jinja2
- lxml=3.8.0
- lxml=4.3.0
- matplotlib=3.0.*
- moto
- nomkl
- numexpr
- numpy
- openpyxl
- pandas-gbq=0.12.0
- psycopg2=2.6.2
- psycopg2=2.7
- pymysql=0.7.11
- pytables
- python-dateutil
- pytz
- scipy
- sqlalchemy=1.1.4
- xarray=0.10
- sqlalchemy=1.3.0
- xarray=0.12.0
- xlrd
- xlsxwriter
- xlwt
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- conda-forge
dependencies:
# required
- numpy>=1.15
- numpy>=1.16
- python=3
- python-dateutil>=2.7.3
- pytz
Expand Down
Loading