Skip to content

Commit 8d668eb

Browse files
committed
Bring branch up to date Merge master
2 parents 41a2e47 + 88aebed commit 8d668eb

File tree

216 files changed

+6582
-11220
lines changed

Some content is hidden

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

216 files changed

+6582
-11220
lines changed

.github/CONTRIBUTING.md

+13-14
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
1-
Contributing to pandas
2-
======================
1+
# Contributing to pandas
32

43
Whether you are a novice or experienced software developer, all contributions and suggestions are welcome!
54

6-
Our main contribution docs can be found [here](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst), but if you do not want to read it in its entirety, we will summarize the main ways in which you can contribute and point to relevant places in the docs for further information.
5+
Our main contributing guide can be found [in this repo](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst) or [on the website](https://pandas-docs.github.io/pandas-docs-travis/contributing.html). If you do not want to read it in its entirety, we will summarize the main ways in which you can contribute and point to relevant sections of that document for further information.
6+
7+
## Getting Started
78

8-
Getting Started
9-
---------------
109
If you are looking to contribute to the *pandas* codebase, the best place to start is the [GitHub "issues" tab](https://github.com/pandas-dev/pandas/issues). This is also a great place for filing bug reports and making suggestions for ways in which we can improve the code and documentation.
1110

12-
If you have additional questions, feel free to ask them on the [mailing list](https://groups.google.com/forum/?fromgroups#!forum/pydata) or on [Gitter](https://gitter.im/pydata/pandas). Further information can also be found in our [Getting Started](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#where-to-start) section of our main contribution doc.
11+
If you have additional questions, feel free to ask them on the [mailing list](https://groups.google.com/forum/?fromgroups#!forum/pydata) or on [Gitter](https://gitter.im/pydata/pandas). Further information can also be found in the "[Where to start?](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#where-to-start)" section.
12+
13+
## Filing Issues
14+
15+
If you notice a bug in the code or documentation, or have suggestions for how we can improve either, feel free to create an issue on the [GitHub "issues" tab](https://github.com/pandas-dev/pandas/issues) using [GitHub's "issue" form](https://github.com/pandas-dev/pandas/issues/new). The form contains some questions that will help us best address your issue. For more information regarding how to file issues against *pandas*, please refer to the "[Bug reports and enhancement requests](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#bug-reports-and-enhancement-requests)" section.
1316

14-
Filing Issues
15-
-------------
16-
If you notice a bug in the code or in docs or have suggestions for how we can improve either, feel free to create an issue on the [GitHub "issues" tab](https://github.com/pandas-dev/pandas/issues) using [GitHub's "issue" form](https://github.com/pandas-dev/pandas/issues/new). The form contains some questions that will help us best address your issue. For more information regarding how to file issues against *pandas*, please refer to the [Bug reports and enhancement requests](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#bug-reports-and-enhancement-requests) section of our main contribution doc.
17+
## Contributing to the Codebase
1718

18-
Contributing to the Codebase
19-
----------------------------
20-
The code is hosted on [GitHub](https://www.github.com/pandas-dev/pandas), so you will need to use [Git](http://git-scm.com/) to clone the project and make changes to the codebase. Once you have obtained a copy of the code, you should create a development environment that is separate from your existing Python environment so that you can make and test changes without compromising your own work environment. For more information, please refer to our [Working with the code](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#working-with-the-code) section of our main contribution docs.
19+
The code is hosted on [GitHub](https://www.github.com/pandas-dev/pandas), so you will need to use [Git](http://git-scm.com/) to clone the project and make changes to the codebase. Once you have obtained a copy of the code, you should create a development environment that is separate from your existing Python environment so that you can make and test changes without compromising your own work environment. For more information, please refer to the "[Working with the code](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#working-with-the-code)" section.
2120

22-
Before submitting your changes for review, make sure to check that your changes do not break any tests. You can find more information about our test suites can be found [here](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#test-driven-development-code-writing). We also have guidelines regarding coding style that will be enforced during testing. Details about coding style can be found [here](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#code-standards).
21+
Before submitting your changes for review, make sure to check that your changes do not break any tests. You can find more information about our test suites in the "[Test-driven development/code writing](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#test-driven-development-code-writing)" section. We also have guidelines regarding coding style that will be enforced during testing, which can be found in the "[Code standards](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#code-standards)" section.
2322

24-
Once your changes are ready to be submitted, make sure to push your changes to GitHub before creating a pull request. Details about how to do that can be found in the [Contributing your changes to pandas](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#contributing-your-changes-to-pandas) section of our main contribution docs. We will review your changes, and you will most likely be asked to make additional changes before it is finally ready to merge. However, once it's ready, we will merge it, and you will have successfully contributed to the codebase!
23+
Once your changes are ready to be submitted, make sure to push your changes to GitHub before creating a pull request. Details about how to do that can be found in the "[Contributing your changes to pandas](https://github.com/pandas-dev/pandas/blob/master/doc/source/contributing.rst#contributing-your-changes-to-pandas)" section. We will review your changes, and you will most likely be asked to make additional changes before it is finally ready to merge. However, once it's ready, we will merge it, and you will have successfully contributed to the codebase!

.travis.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,12 @@ before_install:
9090
- uname -a
9191
- git --version
9292
- git tag
93+
# Because travis runs on Google Cloud and has a /etc/boto.cfg,
94+
# it breaks moto import, see:
95+
# https://github.com/spulec/moto/issues/1771
96+
# https://github.com/boto/boto/issues/3741
97+
# This overrides travis and tells it to look nowhere.
98+
- export BOTO_CONFIG=/dev/null
9399

94100
install:
95101
- echo "install start"
@@ -106,7 +112,7 @@ before_script:
106112
script:
107113
- echo "script start"
108114
- source activate pandas-dev
109-
- ci/run_build_docs.sh
115+
- ci/build_docs.sh
110116
- ci/run_tests.sh
111117

112118
after_script:

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@ Most development discussion is taking place on github in this repo. Further, the
231231

232232
All contributions, bug reports, bug fixes, documentation improvements, enhancements and ideas are welcome.
233233

234-
A detailed overview on how to contribute can be found in the **[contributing guide.](https://pandas.pydata.org/pandas-docs/stable/contributing.html)**
234+
A detailed overview on how to contribute can be found in the **[contributing guide](https://pandas-docs.github.io/pandas-docs-travis/contributing.html)**. There is also an [overview](.github/CONTRIBUTING.md) on GitHub.
235235

236-
If you are simply looking to start working with the pandas codebase, navigate to the [GitHub issues tab](https://github.com/pandas-dev/pandas/issues) and start looking through interesting issues. There are a number of issues listed under [Docs](https://github.com/pandas-dev/pandas/issues?labels=Docs&sort=updated&state=open) and [good first issue](https://github.com/pandas-dev/pandas/issues?labels=good+first+issue&sort=updated&state=open) where you could start out.
236+
If you are simply looking to start working with the pandas codebase, navigate to the [GitHub "issues" tab](https://github.com/pandas-dev/pandas/issues) and start looking through interesting issues. There are a number of issues listed under [Docs](https://github.com/pandas-dev/pandas/issues?labels=Docs&sort=updated&state=open) and [good first issue](https://github.com/pandas-dev/pandas/issues?labels=good+first+issue&sort=updated&state=open) where you could start out.
237237

238238
You can also triage issues which may include reproducing bug reports, or asking for vital information such as version numbers or reproduction instructions. If you would like to start triaging issues, one easy way to get started is to [subscribe to pandas on CodeTriage](https://www.codetriage.com/pandas-dev/pandas).
239239

asv_bench/benchmarks/frame_ctor.py

+13
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,17 @@ def time_frame_from_ndarray(self):
9191
self.df = DataFrame(self.data)
9292

9393

94+
class FromLists(object):
95+
96+
goal_time = 0.2
97+
98+
def setup(self):
99+
N = 1000
100+
M = 100
101+
self.data = [[j for j in range(M)] for i in range(N)]
102+
103+
def time_frame_from_lists(self):
104+
self.df = DataFrame(self.data)
105+
106+
94107
from .pandas_vb_common import setup # noqa: F401

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="(.*?)"'

0 commit comments

Comments
 (0)