Skip to content

Commit f4df0e9

Browse files
authored
Merge branch 'main' into python-db-dtypes-pandas-issue28
2 parents c716826 + 3d2033b commit f4df0e9

File tree

723 files changed

+27946
-9149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

723 files changed

+27946
-9149
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
test-arm:
55
machine:
66
image: ubuntu-2004:202101-01
7-
resource_class: arm.medium
7+
resource_class: arm.large
88
environment:
99
ENV_FILE: ci/deps/circle-38-arm64.yaml
1010
PYTEST_WORKERS: auto

.github/CODE_OF_CONDUCT.md

Lines changed: 0 additions & 62 deletions
This file was deleted.

.github/CONTRIBUTING.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/FUNDING.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 0 additions & 33 deletions
This file was deleted.
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
name: Feature Request
2+
description: Suggest an idea for pandas
3+
title: "ENH: "
4+
labels: [Enhancement, Needs Triage]
5+
6+
body:
7+
- type: checkboxes
8+
id: checks
9+
attributes:
10+
label: Feature Type
11+
description: Please check what type of feature request you would like to propose.
12+
options:
13+
- label: >
14+
Adding new functionality to pandas
15+
- label: >
16+
Changing existing functionality in pandas
17+
- label: >
18+
Removing existing functionality in pandas
19+
- type: textarea
20+
id: description
21+
attributes:
22+
label: Problem Description
23+
description: >
24+
Please describe what problem the feature would solve, e.g. "I wish I could use pandas to ..."
25+
placeholder: >
26+
I wish I could use pandas to return a Series from a DataFrame when possible.
27+
validations:
28+
required: true
29+
- type: textarea
30+
id: feature
31+
attributes:
32+
label: Feature Description
33+
description: >
34+
Please describe how the new feature would be implemented, using psudocode if relevant.
35+
placeholder: >
36+
Add a new parameter to DataFrame, to_series, to return a Series if possible.
37+
38+
def __init__(self, ..., to_series: bool=False):
39+
"""
40+
Parameters
41+
----------
42+
...
43+
44+
to_series : bool, default False
45+
Return a Series if possible
46+
"""
47+
if to_series:
48+
return Series(data)
49+
validations:
50+
required: true
51+
- type: textarea
52+
id: alternative
53+
attributes:
54+
label: Alternative Solutions
55+
description: >
56+
Please describe any alternative solution (existing functionality, 3rd party package, etc.)
57+
that would satisfy the feature request.
58+
placeholder: >
59+
Write a custom function to return a Series when possible.
60+
61+
def to_series(...)
62+
result = pd.DataFrame(...)
63+
...
64+
validations:
65+
required: true
66+
- type: textarea
67+
id: context
68+
attributes:
69+
label: Additional Context
70+
description: >
71+
Please provide any relevant Github issues, code examples or references that help describe and support
72+
the feature request.

.github/SECURITY.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/actions/build_pandas/action.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ runs:
66

77
- name: Environment Detail
88
run: |
9-
conda info
10-
conda list
9+
micromamba info
10+
micromamba list
1111
shell: bash -el {0}
1212

1313
- name: Build Pandas
@@ -17,4 +17,6 @@ runs:
1717
shell: bash -el {0}
1818
env:
1919
# Cannot use parallel compilation on Windows, see https://github.com/pandas-dev/pandas/issues/30873
20-
N_JOBS: ${{ runner.os == 'Windows' && 1 || 2 }}
20+
# GH 47305: Parallel build causes flaky ImportError: /home/runner/work/pandas/pandas/pandas/_libs/tslibs/timestamps.cpython-38-x86_64-linux-gnu.so: undefined symbol: pandas_datetime_to_datetimestruct
21+
N_JOBS: 1
22+
#N_JOBS: ${{ runner.os == 'Windows' && 1 || 2 }}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Run tests and report results
2+
runs:
3+
using: composite
4+
steps:
5+
- name: Test
6+
run: ci/run_tests.sh
7+
shell: bash -el {0}
8+
9+
- name: Publish test results
10+
uses: actions/upload-artifact@v2
11+
with:
12+
name: Test results
13+
path: test-data.xml
14+
if: failure()
15+
16+
- name: Report Coverage
17+
run: coverage report -m
18+
shell: bash -el {0}
19+
if: failure()
20+
21+
- name: Upload coverage to Codecov
22+
uses: codecov/codecov-action@v2
23+
with:
24+
flags: unittests
25+
name: codecov-pandas
26+
fail_ci_if_error: false
27+
if: failure()

.github/actions/setup-conda/action.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ inputs:
33
environment-file:
44
description: Conda environment file to use.
55
default: environment.yml
6+
environment-name:
7+
description: Name to use for the Conda environment
8+
default: test
9+
extra-specs:
10+
description: Extra packages to install
11+
required: false
612
pyarrow-version:
713
description: If set, overrides the PyArrow version in the Conda environment to the given string.
814
required: false
@@ -18,10 +24,13 @@ runs:
1824
if: ${{ inputs.pyarrow-version }}
1925

2026
- name: Install ${{ inputs.environment-file }}
21-
uses: conda-incubator/setup-miniconda@v2
27+
uses: mamba-org/provision-with-micromamba@v12
2228
with:
2329
environment-file: ${{ inputs.environment-file }}
24-
channel-priority: ${{ runner.os == 'macOS' && 'flexible' || 'strict' }}
30+
environment-name: ${{ inputs.environment-name }}
31+
extra-specs: ${{ inputs.extra-specs }}
2532
channels: conda-forge
26-
mamba-version: "0.23"
27-
use-mamba: true
33+
channel-priority: ${{ runner.os == 'macOS' && 'flexible' || 'strict' }}
34+
condarc-file: ci/condarc.yml
35+
cache-env: true
36+
cache-downloads: true

0 commit comments

Comments
 (0)