Skip to content

Commit 3186ded

Browse files
committed
Merge remote-tracking branch 'upstream/master' into pd.array
2 parents faf114d + 9bc42f9 commit 3186ded

27 files changed

+296
-406
lines changed

azure-pipelines.yml

+4-12
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
11
# Adapted from https://github.com/numba/numba/blob/master/azure-pipelines.yml
22
jobs:
3-
# Mac and Linux could potentially use the same template
4-
# except it isn't clear how to use a different build matrix
5-
# for each, so for now they are separate
6-
- template: ci/azure/macos.yml
3+
# Mac and Linux use the same template
4+
- template: ci/azure/posix.yml
75
parameters:
86
name: macOS
97
vmImage: xcode9-macos10.13
10-
- template: ci/azure/linux.yml
8+
- template: ci/azure/posix.yml
119
parameters:
1210
name: Linux
1311
vmImage: ubuntu-16.04
1412

15-
# Windows Python 2.7 needs VC 9.0 installed, and not sure
16-
# how to make that a conditional task, so for now these are
17-
# separate templates as well
13+
# Windows Python 2.7 needs VC 9.0 installed, handled in the template
1814
- template: ci/azure/windows.yml
1915
parameters:
2016
name: Windows
2117
vmImage: vs2017-win2016
22-
- template: ci/azure/windows-py27.yml
23-
parameters:
24-
name: WindowsPy27
25-
vmImage: vs2017-win2016
2618

2719
- job: 'Checks_and_doc'
2820
pool:

ci/azure/linux.yml

-79
This file was deleted.

ci/azure/macos.yml renamed to ci/azure/posix.yml

+24-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,30 @@ jobs:
77
pool:
88
vmImage: ${{ parameters.vmImage }}
99
strategy:
10-
maxParallel: 11
1110
matrix:
12-
py35_np_120:
13-
ENV_FILE: ci/deps/azure-macos-35.yaml
14-
CONDA_PY: "35"
15-
PATTERN: "not slow and not network"
11+
${{ if eq(parameters.name, 'macOS') }}:
12+
py35_np_120:
13+
ENV_FILE: ci/deps/azure-macos-35.yaml
14+
CONDA_PY: "35"
15+
PATTERN: "not slow and not network"
16+
17+
${{ if eq(parameters.name, 'Linux') }}:
18+
py27_np_120:
19+
ENV_FILE: ci/deps/azure-27-compat.yaml
20+
CONDA_PY: "27"
21+
PATTERN: "not slow and not network"
22+
23+
py37_locale:
24+
ENV_FILE: ci/deps/azure-37-locale.yaml
25+
CONDA_PY: "37"
26+
PATTERN: "not slow and not network"
27+
LOCALE_OVERRIDE: "zh_CN.UTF-8"
28+
29+
py36_locale_slow:
30+
ENV_FILE: ci/deps/azure-36-locale_slow.yaml
31+
CONDA_PY: "36"
32+
PATTERN: "not slow and not network"
33+
LOCALE_OVERRIDE: "it_IT.UTF-8"
1634

1735
steps:
1836
- script: |
@@ -39,7 +57,7 @@ jobs:
3957
- task: PublishTestResults@2
4058
inputs:
4159
testResultsFiles: 'test-data-*.xml'
42-
testRunTitle: 'MacOS-35'
60+
testRunTitle: ${{ format('{0}-$(CONDA_PY)', parameters.name) }}
4361
- powershell: |
4462
$junitXml = "test-data-single.xml"
4563
$(Get-Content $junitXml | Out-String) -match 'failures="(.*?)"'

ci/azure/windows-py27.yml

-58
This file was deleted.

ci/azure/windows.yml

+12-2
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,28 @@ jobs:
77
pool:
88
vmImage: ${{ parameters.vmImage }}
99
strategy:
10-
maxParallel: 11
1110
matrix:
1211
py36_np14:
1312
ENV_FILE: ci/deps/azure-windows-36.yaml
1413
CONDA_PY: "36"
1514

15+
py27_np121:
16+
ENV_FILE: ci/deps/azure-windows-27.yaml
17+
CONDA_PY: "27"
18+
1619
steps:
1720
- task: CondaEnvironment@1
1821
inputs:
1922
updateConda: no
2023
packageSpecs: ''
2124

25+
- powershell: |
26+
$wc = New-Object net.webclient
27+
$wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi")
28+
Start-Process "VCForPython27.msi" /qn -Wait
29+
displayName: 'Install VC 9.0 only for Python 2.7'
30+
condition: eq(variables.CONDA_PY, '27')
31+
2232
- script: |
2333
ci\\incremental\\setup_conda_environment.cmd
2434
displayName: 'Before Install'
@@ -33,7 +43,7 @@ jobs:
3343
- task: PublishTestResults@2
3444
inputs:
3545
testResultsFiles: 'test-data.xml'
36-
testRunTitle: 'Windows 36'
46+
testRunTitle: 'Windows-$(CONDA_PY)'
3747
- powershell: |
3848
$junitXml = "test-data.xml"
3949
$(Get-Content $junitXml | Out-String) -match 'failures="(.*?)"'

doc/source/api.rst

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
.. The currentmodule is needed here because the autosummary generation of files
2+
.. happens before reading the files / substituting the header.
3+
.. See https://github.com/pandas-dev/pandas/pull/24232
4+
5+
.. currentmodule:: pandas
6+
17
.. _api:
28

39
{{ header }}

0 commit comments

Comments
 (0)