Skip to content

BLD/CI: fix py39 ci #36296 #36393

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

Merged
merged 7 commits into from
Sep 16, 2020
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,6 @@ matrix:
- arch: arm64
env:
- JOB="3.7, arm64" PYTEST_WORKERS=8 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard)"
- dist: bionic
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How come we have removed this @VirosaLi did we move 3.9 build to Azure?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How come we have removed this @VirosaLi did we move 3.9 build to Azure?

It was removed from allow_failures.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh thanks misread the diff

env:
- JOB="3.9-dev" PATTERN="(not slow and not network and not clipboard)"


before_install:
Expand Down
2 changes: 1 addition & 1 deletion asv_bench/asv.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
// followed by the pip installed packages).
"matrix": {
"numpy": [],
"Cython": ["0.29.16"],
"Cython": ["0.29.21"],
"matplotlib": [],
"sqlalchemy": [],
"scipy": [],
Expand Down
3 changes: 1 addition & 2 deletions ci/build39.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@

sudo apt-get install build-essential gcc xvfb
pip install --no-deps -U pip wheel setuptools
pip install numpy python-dateutil pytz pytest pytest-xdist hypothesis
pip install cython --pre # https://github.com/cython/cython/issues/3395
pip install cython numpy python-dateutil pytz pytest pytest-xdist hypothesis

python setup.py build_ext -inplace
python -m pip install --no-build-isolation -e .
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-37-32bit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ dependencies:
# see comment above
- pip
- pip:
- cython>=0.29.16
- cython>=0.29.21
- numpy>=1.16.5
- pytest>=5.0.1
2 changes: 1 addition & 1 deletion ci/deps/azure-37-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- python=3.7.*

# tools
- cython>=0.29.16
- cython>=0.29.21
- pytest>=5.0.1
- pytest-xdist>=1.21
- pytest-asyncio
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-37-locale_slow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- python=3.7.*

# tools
- cython>=0.29.16
- cython>=0.29.21
- pytest>=5.0.1
- pytest-xdist>=1.21
- hypothesis>=3.58.0
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-37-minimum_versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
- python=3.7.1

# tools
- cython=0.29.16
- cython=0.29.21
- pytest=5.0.1
- pytest-xdist>=1.21
- hypothesis>=3.58.0
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-37-slow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- python=3.7.*

# tools
- cython>=0.29.16
- cython>=0.29.21
- pytest>=5.0.1
- pytest-xdist>=1.21
- hypothesis>=3.58.0
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-38-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
- python=3.8.*

# tools
- cython>=0.29.16
- cython>=0.29.21
- pytest>=5.0.1
- pytest-xdist>=1.21
- pytest-asyncio>=0.12.0
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-38-numpydev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
- pytz
- pip
- pip:
- cython==0.29.16 # GH#34014
- cython==0.29.21 # GH#34014
- "git+git://github.com/dateutil/dateutil.git"
- "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple"
- "--pre"
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-macos-37.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ dependencies:
- xlwt
- pip
- pip:
- cython>=0.29.16
- cython>=0.29.21
- pyreadstat
- pyxlsb
2 changes: 1 addition & 1 deletion ci/deps/azure-windows-37.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- python=3.7.*

# tools
- cython>=0.29.16
- cython>=0.29.21
- pytest>=5.0.1
- pytest-xdist>=1.21
- hypothesis>=3.58.0
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-windows-38.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- python=3.8.*

# tools
- cython>=0.29.16
- cython>=0.29.21
- pytest>=5.0.1
- pytest-xdist>=1.21
- hypothesis>=3.58.0
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-37-arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- python=3.7.*

# tools
- cython>=0.29.13
- cython>=0.29.21
- pytest>=5.0.1
- pytest-xdist>=1.21
- hypothesis>=3.58.0
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-37-cov.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- python=3.7.*

# tools
- cython>=0.29.16
- cython>=0.29.21
- pytest>=5.0.1
- pytest-xdist>=1.21
- hypothesis>=3.58.0
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-37-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- python=3.7.*

# tools
- cython>=0.29.16
- cython>=0.29.21
- pytest>=5.0.1
- pytest-xdist>=1.21
- hypothesis>=3.58.0
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-37.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- python=3.7.*

# tools
- cython>=0.29.16
- cython>=0.29.21
- pytest>=5.0.1
- pytest-xdist>=1.21
- hypothesis>=3.58.0
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-38.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- python=3.8.*

# tools
- cython>=0.29.16
- cython>=0.29.21
- pytest>=5.0.1
- pytest-xdist>=1.21
- hypothesis>=3.58.0
Expand Down
15 changes: 15 additions & 0 deletions doc/source/whatsnew/v1.1.3.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,21 @@ including other versions of pandas.

.. ---------------------------------------------------------------------------

Enhancements
~~~~~~~~~~~~

Added support for new Python version
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Pandas 1.1.3 now supports Python 3.9 (:issue:`36296`).

Development Changes
^^^^^^^^^^^^^^^^^^^

- The minimum version of Cython is now the most recent bug-fix version (0.29.21) (:issue:`36296`).

.. ---------------------------------------------------------------------------

.. _whatsnew_113.regressions:

Fixed regressions
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- asv

# building
- cython>=0.29.16
- cython>=0.29.21

# code checks
- black=19.10b0
Expand Down
8 changes: 2 additions & 6 deletions pandas/_libs/writers.pyx
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import cython
from cython import Py_ssize_t

from cpython.bytes cimport PyBytes_GET_SIZE
from cpython.unicode cimport PyUnicode_GET_SIZE

import numpy as np

from cpython cimport PyBytes_GET_SIZE, PyUnicode_GET_LENGTH
from numpy cimport ndarray, uint8_t

ctypedef fused pandas_string:
Expand Down Expand Up @@ -144,7 +140,7 @@ cpdef inline Py_ssize_t word_len(object val):
Py_ssize_t l = 0

if isinstance(val, str):
l = PyUnicode_GET_SIZE(val)
l = PyUnicode_GET_LENGTH(val)
elif isinstance(val, bytes):
l = PyBytes_GET_SIZE(val)

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
requires = [
"setuptools",
"wheel",
"Cython>=0.29.16,<3", # Note: sync with setup.py
"Cython>=0.29.21,<3", # Note: sync with setup.py
"numpy==1.16.5; python_version=='3.7' and platform_system!='AIX'",
"numpy==1.17.3; python_version>='3.8' and platform_system!='AIX'",
"numpy==1.16.5; python_version=='3.7' and platform_system=='AIX'",
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ numpy>=1.16.5
python-dateutil>=2.7.3
pytz
asv
cython>=0.29.16
cython>=0.29.21
black==19.10b0
cpplint
flake8<3.8.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def is_platform_mac():


min_numpy_ver = "1.16.5"
min_cython_ver = "0.29.16" # note: sync with pyproject.toml
min_cython_ver = "0.29.21" # note: sync with pyproject.toml

try:
import Cython
Expand Down