Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
cryvate committed Aug 26, 2019
2 parents dc3936b + 8ac2214 commit 37fb3cf
Show file tree
Hide file tree
Showing 322 changed files with 17,649 additions and 5,495 deletions.
11 changes: 4 additions & 7 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
environment:
matrix:
# Unit and integration tests.
- PYTHON: "C:\\Python27"
- PYTHON: "C:\\Python27-x64"
RUN_INTEGRATION_TESTS: "True"
- PYTHON: "C:\\Python35-x64"
RUN_INTEGRATION_TESTS: "True"
- PYTHON: "C:\\Python36-x64"
RUN_INTEGRATION_TESTS: "True"
# Unit tests only.
- PYTHON: "C:\\Python27-x64"
- PYTHON: "C:\\Python34"
- PYTHON: "C:\\Python34-x64"
- PYTHON: "C:\\Python35"
- PYTHON: "C:\\Python35-x64"
- PYTHON: "C:\\Python36"
# Nothing for the moment

matrix:
fast_finish: true
Expand Down
23 changes: 4 additions & 19 deletions .azure-pipelines/jobs/test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
vmImage: ${{ parameters.vmImage }}
strategy:
matrix:
Python27-x64:
Python27-x86:
python.version: '2.7'
python.architecture: x64
Python36-x64:
python.version: '3.6'
python.architecture: x86
Python37-x64:
python.version: '3.7'
python.architecture: x64
maxParallel: 2

Expand All @@ -32,22 +32,7 @@ jobs:
vmImage: ${{ parameters.vmImage }}
strategy:
matrix:
Python34-x64:
python.version: '3.4'
python.architecture: x64
Python35-x64:
python.version: '3.5'
python.architecture: x64
Python37-x64:
python.version: '3.7'
python.architecture: x64
# This is for Windows, so test x86 builds
Python27-x86:
python.version: '2.7'
python.architecture: x86
Python34-x86:
python.version: '3.4'
python.architecture: x86
Python35-x86:
python.version: '3.5'
python.architecture: x86
Expand Down
3 changes: 0 additions & 3 deletions .azure-pipelines/jobs/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ jobs:
vmImage: ${{ parameters.vmImage }}
strategy:
matrix:
Python34:
python.version: '3.4'
python.architecture: x64
Python35:
python.version: '3.5'
python.architecture: x64
Expand Down
3 changes: 3 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ As a reminder, all contributors are expected to follow our [Code of Conduct][coc

[coc]: https://www.pypa.io/en/latest/code-of-conduct/

## Development Documentation

Our [development documentation](https://pip.pypa.io/en/latest/development/) contains details on how to get started with contributing to pip, and details of our development processes.

## Bot Commands

Expand Down
8 changes: 8 additions & 0 deletions .github/lock.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Number of days of inactivity before a closed issue or pull request is locked
daysUntilLock: 30
# Issues and pull requests with these labels will not be locked.
exemptLabels: []
# Label to add before locking, such as `outdated`. Set to `false` to disable
lockLabel: "S: auto-locked"
# Comment to post before locking. Set to `false` to disable
lockComment: false
11 changes: 11 additions & 0 deletions .github/no-response.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Number of days of inactivity before issue is closed for lack of response
daysUntilClose: 30
# Label requiring a response
responseRequiredLabel: "S: awaiting response"
# Comment to post when closing an Issue for lack of response. Set to `false` to disable
closeComment: >
This issue has been automatically closed because there has been no response
to our request for more information from the original author. With only the
information that is currently in the issue, we don't have enough information
to take action. Please reach out if you have or find the answers we need so
that we can investigate further.
7 changes: 7 additions & 0 deletions .github/triage-new-issues.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This is based off of reading the actual source code of the bot. :/
# https://github.com/tunnckoCoreLabs/triage-new-issues/blob/2ff406030ecce4c25f7bdd454125ba54db1301bd/src/index.js#L7
#
# While this file is currently a no-op, it serves the purpose of
# documenting that this bot is indeed being used, since this is a
# non-standard probot bot.
label: "needs triage"
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,21 @@ nosetests.xml
coverage.xml
*.cover
tests/data/common_wheels/
pip-wheel-metadata

# Misc
*~
.*.sw?
.env/

# For IntelliJ IDEs (basically PyCharm)
.idea/

# For Visual Studio Code
.vscode/

# Scratch Pad for experiments
.scratch/

# Mac
.DS_Store
10 changes: 10 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2

sphinx:
builder: htmldir
configuration: docs/html/conf.py

python:
version: 3.7
install:
- requirements: tools/requirements/docs.txt
16 changes: 7 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
language: python
cache: pip
dist: xenial
python: 3.6
python: 3.7
addons:
apt:
packages:
- bzr

stages:
- primary
Expand All @@ -23,9 +27,7 @@ jobs:
- env: GROUP=2
python: 2.7
- env: GROUP=1
python: 3.6
- env: GROUP=2
python: 3.6

# Complete checking for ensuring compatibility
# PyPy
Expand All @@ -40,17 +42,13 @@ jobs:
python: pypy2.7-6.0
# Other Supported CPython
- env: GROUP=1
python: 3.7
python: 3.6
- env: GROUP=2
python: 3.7
python: 3.6
- env: GROUP=1
python: 3.5
- env: GROUP=2
python: 3.5
- env: GROUP=1
python: 3.4
- env: GROUP=2
python: 3.4

- env: GROUP=1
python: 3.8-dev
Expand Down
Loading

0 comments on commit 37fb3cf

Please sign in to comment.