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

FEAT-#5253: Upgrade pandas to 1.5.2 #5254

Merged
merged 2 commits into from
Nov 25, 2022
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 3 additions & 1 deletion .github/workflows/ci-notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ jobs:
environment-file: requirements/env_hdk.yml
python-version: 3.8
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
if: matrix.execution == 'hdk_on_native'
- name: Cache datasets
uses: actions/cache@v2
Expand Down
53 changes: 39 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,9 @@ jobs:
environment-file: environment-dev.yml
python-version: 3.8
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down Expand Up @@ -230,7 +232,9 @@ jobs:
environment-file: environment-dev.yml
python-version: 3.8
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down Expand Up @@ -308,7 +312,9 @@ jobs:
environment-file: environment-dev.yml
python-version: 3.8
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down Expand Up @@ -360,7 +366,9 @@ jobs:
environment-file: environment-dev.yml
python-version: 3.8
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down Expand Up @@ -417,7 +425,9 @@ jobs:
activate-environment: modin_on_hdk
environment-file: requirements/env_hdk.yml
python-version: 3.8
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down Expand Up @@ -549,7 +559,9 @@ jobs:
environment-file: environment-dev.yml
python-version: ${{matrix.python-version}}
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down Expand Up @@ -628,7 +640,9 @@ jobs:
environment-file: environment-dev.yml
python-version: 3.8
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down Expand Up @@ -675,7 +689,9 @@ jobs:
environment-file: requirements/environment-py36.yml
python-version: 3.6
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down Expand Up @@ -736,7 +752,9 @@ jobs:
environment-file: requirements/environment-py36.yml
python-version: 3.6
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down Expand Up @@ -805,7 +823,9 @@ jobs:
environment-file: environment-dev.yml
python-version: 3.8
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down Expand Up @@ -873,8 +893,9 @@ jobs:
environment-file: environment-dev.yml
python-version: ${{matrix.python-version}}
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
auto-update-conda: true # this enable `use-only-tar-bz2` feature on Windows
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down Expand Up @@ -920,7 +941,9 @@ jobs:
environment-file: environment-dev.yml
python-version: ${{matrix.python-version}}
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down Expand Up @@ -963,7 +986,9 @@ jobs:
environment-file: environment-dev.yml
python-version: ${{matrix.python-version}}
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/fuzzydata-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ jobs:
environment-file: environment-dev.yml
python-version: 3.8
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/push-to-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ jobs:
environment-file: requirements/requirements-no-engine.yml
python-version: 3.8
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: install Ray nightly build
run: pip install https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl
- name: Conda environment
Expand Down Expand Up @@ -76,7 +78,9 @@ jobs:
environment-file: environment-dev.yml
python-version: 3.8
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down Expand Up @@ -125,7 +129,9 @@ jobs:
activate-environment: modin
python-version: ${{matrix.python-version}}
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- run: pip install -r requirements-dev.txt
# Use a ray master commit that includes the fix here: https://github.com/ray-project/ray/pull/16278
# Can be changed after a Ray version > 1.4 is released.
Expand Down
29 changes: 21 additions & 8 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ jobs:
environment-file: environment-dev.yml
python-version: 3.8
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down Expand Up @@ -76,7 +78,9 @@ jobs:
environment-file: environment-dev.yml
python-version: 3.8
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down Expand Up @@ -122,7 +126,9 @@ jobs:
activate-environment: modin_on_hdk
environment-file: requirements/env_hdk.yml
python-version: 3.8
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down Expand Up @@ -177,7 +183,9 @@ jobs:
environment-file: environment-dev.yml
python-version: ${{matrix.python-version}}
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down Expand Up @@ -276,8 +284,9 @@ jobs:
environment-file: environment-dev.yml
python-version: ${{matrix.python-version}}
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
auto-update-conda: true # this enable `use-only-tar-bz2` feature on Windows
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down Expand Up @@ -322,7 +331,9 @@ jobs:
environment-file: environment-dev.yml
python-version: ${{matrix.python-version}}
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down Expand Up @@ -364,7 +375,9 @@ jobs:
environment-file: environment-dev.yml
python-version: ${{matrix.python-version}}
channel-priority: strict
use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
# we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed
# for more info see https://github.com/conda-incubator/setup-miniconda/issues/264
use-only-tar-bz2: false
- name: Conda environment
run: |
conda info
Expand Down
2 changes: 1 addition & 1 deletion environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: modin
channels:
- conda-forge
dependencies:
- pandas==1.5.1
- pandas==1.5.2
- numpy>=1.18.5
- pyarrow>=4.0.1
- dask>=2.22.0
Expand Down
2 changes: 1 addition & 1 deletion modin/pandas/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
f"Starting Modin in compatibility mode to support legacy pandas version {__pandas_version__}"
)
elif PandasCompatVersion.CURRENT == PandasCompatVersion.LATEST:
__pandas_version__ = "1.5.1"
__pandas_version__ = "1.5.2"

if pandas.__version__ != __pandas_version__:
warnings.warn(
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pandas==1.5.1
pandas==1.5.2
numpy>=1.18.5
pyarrow>=4.0.1
dask[complete]>=2.22.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/env_hdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: modin_on_hdk
channels:
- conda-forge
dependencies:
- pandas==1.5.1
- pandas==1.5.2
- pyarrow=6
- numpy>=1.18.5
- fsspec
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements-no-engine.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
channels:
- conda-forge
dependencies:
- pandas==1.5.1
- pandas==1.5.2
- numpy>=1.18.5
- pyarrow>=4.0.1
- fsspec
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import versioneer
import sys

PANDAS_VERSION = "1.5.1" if sys.version_info >= (3, 8) else "1.1.5"
PANDAS_VERSION = "1.5.2" if sys.version_info >= (3, 8) else "1.1.5"

with open("README.md", "r", encoding="utf-8") as fh:
long_description = fh.read()
Expand Down