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

CI: Simplify GHA dependency files #45257

Merged
merged 18 commits into from
Jan 16, 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
8 changes: 4 additions & 4 deletions .github/workflows/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ jobs:
[actions-38-downstream_compat.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
[actions-38-minimum_versions.yaml, "slow", "", "", "", "", ""],
[actions-38-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
[actions-38-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
[actions-38.yaml, "not slow and not network", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
[actions-38.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""],
[actions-38.yaml, "not slow and not clipboard", "", "", "", "", ""],
[actions-38-slow.yaml, "slow", "", "", "", "", ""],
[actions-38-locale.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""],
[actions-39-slow.yaml, "slow", "", "", "", "", ""],
[actions-38.yaml, "slow", "", "", "", "", ""],
[actions-pypy-38.yaml, "not slow and not clipboard", "", "", "", "", "--max-worker-restart 0"],
[actions-39-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"],
[actions-39.yaml, "slow", "", "", "", "", ""],
[actions-39.yaml, "not slow and not clipboard", "", "", "", "", ""]
]
fail-fast: false
Expand Down
36 changes: 0 additions & 36 deletions ci/deps/actions-38-locale.yaml

This file was deleted.

30 changes: 0 additions & 30 deletions ci/deps/actions-38-locale_slow.yaml

This file was deleted.

37 changes: 0 additions & 37 deletions ci/deps/actions-38-slow.yaml

This file was deleted.

42 changes: 36 additions & 6 deletions ci/deps/actions-38.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,50 @@
name: pandas-dev
channels:
- defaults
- conda-forge
dependencies:
- python=3.8

# tools
- cython>=0.29.24
# test dependencies
- cython=0.29.24
- pytest>=6.0
- pytest-cov
- pytest-xdist>=1.31
- hypothesis>=5.5.3
- psutil

# pandas dependencies
- numpy
# required dependencies
- python-dateutil
- nomkl
- numpy
- pytz

# optional dependencies
- beautifulsoup4
- blosc
- bottleneck
- fastparquet
- fsspec
- html5lib
- gcsfs
- jinja2
- lxml
- matplotlib
- numba
- numexpr
- openpyxl
- odfpy
- pandas-gbq
- psycopg2
- pymysql
- pytables
- pyarrow
- pyreadstat
- pyxlsb
- s3fs
- scipy
- sqlalchemy
- tabulate
- xarray
- xlrd
- xlsxwriter
- xlwt
- zstandard
41 changes: 0 additions & 41 deletions ci/deps/actions-39-slow.yaml

This file was deleted.

36 changes: 23 additions & 13 deletions ci/deps/actions-39.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,47 @@ channels:
dependencies:
- python=3.9

# tools
- cython>=0.29.24
# test dependencies
- cython=0.29.24
- pytest>=6.0
- pytest-cov
- pytest-xdist>=1.31
- hypothesis>=5.5.3
- psutil

# pandas dependencies
# required dependencies
- python-dateutil
- numpy
- pytz

# optional dependencies
- beautifulsoup4
- blosc
- bottleneck
- boto3
- fsspec>=0.8.0
- gcsfs
- fastparquet
- fsspec
- html5lib
- gcsfs
- jinja2
- lxml
- matplotlib
- numpy # move up to solve before numba
- numba
- numexpr
- openpyxl
- pyarrow>2.0.1
- odfpy
- pandas-gbq
- psycopg2
- pymysql
- pytables
- python-dateutil
- pytz
- s3fs>=0.4.2
- pyarrow
- pyreadstat
- pyxlsb
- s3fs
- scipy
- sqlalchemy
- tabulate
- xarray
- xlrd
- xlsxwriter
- xlwt
- pyreadstat
- pyxlsb
- zstandard
18 changes: 6 additions & 12 deletions pandas/tests/arrays/floating/test_construction.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
import locale

import numpy as np
import pytest

from pandas.compat import (
is_platform_windows,
np_version_under1p20,
)
from pandas.compat import np_version_under1p20

import pandas as pd
import pandas._testing as tm
Expand Down Expand Up @@ -47,7 +42,7 @@ def test_floating_array_constructor():
FloatingArray(values)


def test_floating_array_disallows_float16(request):
def test_floating_array_disallows_float16():
# GH#44715
arr = np.array([1, 2], dtype=np.float16)
mask = np.array([False, False])
Expand All @@ -56,11 +51,10 @@ def test_floating_array_disallows_float16(request):
with pytest.raises(TypeError, match=msg):
FloatingArray(arr, mask)

if np_version_under1p20 or (
locale.getlocale()[0] != "en_US" and not is_platform_windows()
):
# the locale condition may need to be refined; this fails on
# the CI in the ZH_CN build

def test_floating_array_disallows_Float16_dtype(request):
# GH#44715
if np_version_under1p20:
# https://github.com/numpy/numpy/issues/20512
mark = pytest.mark.xfail(reason="numpy does not raise on np.dtype('Float16')")
request.node.add_marker(mark)
Expand Down
8 changes: 4 additions & 4 deletions pandas/tests/arrays/period/test_arrow_compat.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import pytest

from pandas.compat import pa_version_under2p0
from pandas.compat import pa_version_under3p0

from pandas.core.dtypes.dtypes import PeriodDtype

Expand Down Expand Up @@ -72,7 +72,7 @@ def test_arrow_array_missing():


@pytest.mark.xfail(
pa_version_under2p0, reason="pyarrow incorrectly uses pandas internals API"
pa_version_under3p0, reason="pyarrow incorrectly uses pandas internals API"
)
def test_arrow_table_roundtrip():
from pandas.core.arrays._arrow_utils import ArrowPeriodType
Expand All @@ -94,7 +94,7 @@ def test_arrow_table_roundtrip():


@pytest.mark.xfail(
pa_version_under2p0, reason="pyarrow incorrectly uses pandas internals API"
pa_version_under3p0, reason="pyarrow incorrectly uses pandas internals API"
)
def test_arrow_load_from_zero_chunks():
# GH-41040
Expand All @@ -115,7 +115,7 @@ def test_arrow_load_from_zero_chunks():


@pytest.mark.xfail(
pa_version_under2p0, reason="pyarrow incorrectly uses pandas internals API"
pa_version_under3p0, reason="pyarrow incorrectly uses pandas internals API"
)
def test_arrow_table_roundtrip_without_metadata():
arr = PeriodArray([1, 2, 3], freq="H")
Expand Down
7 changes: 3 additions & 4 deletions pandas/tests/io/excel/test_readers.py
Original file line number Diff line number Diff line change
Expand Up @@ -738,10 +738,9 @@ def test_bad_sheetname_raises(self, read_ext, sheet_name):

def test_missing_file_raises(self, read_ext):
bad_file = f"foo{read_ext}"
# CI tests with zh_CN.utf8, translates to "No such file or directory"
with pytest.raises(
FileNotFoundError, match=r"(No such file or directory|没有那个文件或目录)"
):
# CI tests with other languages, translates to "No such file or directory"
match = r"(No such file or directory|没有那个文件或目录|File o directory non esistente)"
with pytest.raises(FileNotFoundError, match=match):
pd.read_excel(bad_file)

def test_corrupt_bytes_raises(self, read_ext, engine):
Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/io/test_feather.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import numpy as np
import pytest

from pandas.compat.pyarrow import pa_version_under2p0
from pandas.compat.pyarrow import pa_version_under3p0

import pandas as pd
import pandas._testing as tm
Expand Down Expand Up @@ -87,7 +87,7 @@ def test_basic(self):
),
}
)
if not pa_version_under2p0:
if not pa_version_under3p0:
# older pyarrow incorrectly uses pandas internal API, so
# constructs invalid Block
df["periods"] = pd.period_range("2013", freq="M", periods=3)
Expand Down
Loading