Skip to content

Commit 4ea0878

Browse files
committed
Merge branch 'master' into run-command
2 parents 841db91 + 612970b commit 4ea0878

File tree

204 files changed

+7738
-2797
lines changed

Some content is hidden

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

204 files changed

+7738
-2797
lines changed

.azure-pipelines/jobs/test-windows.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,28 @@ parameters:
33

44
jobs:
55
- job: Test_Primary
6-
displayName: Test Primary
6+
displayName: Tests /
77

88
pool:
99
vmImage: ${{ parameters.vmImage }}
1010
strategy:
1111
matrix:
12-
Python27-x86:
12+
"2.7-x86":
1313
python.version: '2.7'
1414
python.architecture: x86
15-
Python27-x64:
15+
"2.7":
1616
python.version: '2.7'
1717
python.architecture: x64
18-
useVenv: true
19-
Python35-x64:
18+
"3.5":
2019
python.version: '3.5'
2120
python.architecture: x64
22-
Python36-x64:
21+
"3.6":
2322
python.version: '3.6'
2423
python.architecture: x64
25-
useVenv: true
26-
Python37-x64:
24+
"3.7":
2725
python.version: '3.7'
2826
python.architecture: x64
29-
Python38-x64:
27+
"3.8":
3028
python.version: '3.8'
3129
python.architecture: x64
3230
maxParallel: 6
@@ -35,10 +33,9 @@ jobs:
3533
- template: ../steps/run-tests-windows.yml
3634
parameters:
3735
runIntegrationTests: true
38-
useVenv: '$(useVenv)'
3936

4037
- job: Test_Secondary
41-
displayName: Test Secondary
38+
displayName: Tests /
4239
# Don't run integration tests for these runs
4340
# Run after Test_Primary so we don't devour time and jobs if tests are going to fail
4441
dependsOn: Test_Primary
@@ -48,16 +45,16 @@ jobs:
4845
strategy:
4946
matrix:
5047
# This is for Windows, so test x86 builds
51-
Python35-x86:
48+
"3.5-x86":
5249
python.version: '3.5'
5350
python.architecture: x86
54-
Python36-x86:
51+
"3.6-x86":
5552
python.version: '3.6'
5653
python.architecture: x86
57-
Python37-x86:
54+
"3.7-x86":
5855
python.version: '3.7'
5956
python.architecture: x86
60-
Python38-x86:
57+
"3.8-x86":
6158
python.version: '3.8'
6259
python.architecture: x86
6360
maxParallel: 6

.azure-pipelines/jobs/test.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ parameters:
33

44
jobs:
55
- job: Test_Primary
6-
displayName: Test Primary
6+
displayName: Tests /
77

88
pool:
99
vmImage: ${{ parameters.vmImage }}
1010
strategy:
1111
matrix:
12-
Python27:
12+
"2.7":
1313
python.version: '2.7'
1414
python.architecture: x64
15-
Python36:
15+
"3.6":
1616
python.version: '3.6'
1717
python.architecture: x64
1818
maxParallel: 2
@@ -21,21 +21,24 @@ jobs:
2121
- template: ../steps/run-tests.yml
2222

2323
- job: Test_Secondary
24-
displayName: Test Secondary
24+
displayName: Tests /
2525
# Run after Test_Primary so we don't devour time and jobs if tests are going to fail
2626
dependsOn: Test_Primary
2727

2828
pool:
2929
vmImage: ${{ parameters.vmImage }}
3030
strategy:
3131
matrix:
32-
Python35:
32+
"3.5":
3333
python.version: '3.5'
3434
python.architecture: x64
35-
Python37:
35+
"3.7":
3636
python.version: '3.7'
3737
python.architecture: x64
38-
maxParallel: 3
38+
"3.8":
39+
python.version: '3.8'
40+
python.architecture: x64
41+
maxParallel: 4
3942

4043
steps:
4144
- template: ../steps/run-tests.yml

.azure-pipelines/steps/run-tests-windows.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
parameters:
22
runIntegrationTests:
3-
useVenv: false
43

54
steps:
65
- task: UsePythonVersion@0
@@ -44,11 +43,8 @@ steps:
4443
# https://bugs.python.org/issue18199
4544
$env:TEMP = "R:\Temp"
4645
47-
tox -e py -- $env:USE_VENV_ARG -m integration -n auto --duration=5 --junit-xml=junit/integration-test.xml
46+
tox -e py -- -m integration -n auto --duration=5 --junit-xml=junit/integration-test.xml
4847
displayName: Tox run integration tests
49-
env:
50-
${{ if eq(parameters.useVenv, 'true') }}:
51-
USE_VENV_ARG: "--use-venv"
5248
5349
- task: PublishTestResults@2
5450
displayName: Publish Test Results

.github/FUNDING.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
2+
patreon: # Replace with a single Patreon username
3+
open_collective: # Replace with a single Open Collective username
4+
ko_fi: # Replace with a single Ko-fi username
5+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
6+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
7+
liberapay: # Replace with a single Liberapay username
8+
issuehunt: # Replace with a single IssueHunt username
9+
otechie: # Replace with a single Otechie username
10+
custom: "https://pypi.org/sponsor/" # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/linting.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Linting
2+
3+
on:
4+
push:
5+
pull_request:
6+
schedule:
7+
# Run every Friday at 18:02 UTC
8+
- cron: 2 18 * * 5
9+
10+
jobs:
11+
lint:
12+
name: ${{ matrix.os }}
13+
runs-on: ${{ matrix.os }}-latest
14+
env:
15+
TOXENV: lint,docs,vendoring
16+
17+
strategy:
18+
matrix:
19+
os:
20+
- Ubuntu
21+
- Windows
22+
- MacOS
23+
24+
steps:
25+
- uses: actions/checkout@v2
26+
- name: Set up Python 3.8
27+
uses: actions/setup-python@v1
28+
with:
29+
python-version: 3.8
30+
31+
# Setup Caching
32+
- name: pip cache
33+
uses: actions/cache@v1
34+
with:
35+
path: ~/.cache/pip
36+
key: ${{ runner.os }}-pip-${{ hashFiles('tools/requirements/tests.txt') }}-${{ hashFiles('tools/requirements/docs.txt') }}-${{ hashFiles('tox.ini') }}
37+
restore-keys: |
38+
${{ runner.os }}-pip-
39+
${{ runner.os }}-
40+
41+
- name: Set PY (for pre-commit cache)
42+
run: echo "::set-env name=PY::$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')"
43+
- name: pre-commit cache
44+
uses: actions/cache@v1
45+
with:
46+
path: ~/.cache/pre-commit
47+
key: pre-commit|2020-02-14|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
48+
49+
# Get the latest tox
50+
- name: Install tox
51+
run: python -m pip install tox
52+
53+
# Main check
54+
- run: python -m tox

.github/workflows/python-linters.yml

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

.travis.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ addons:
1010
stages:
1111
- primary
1212
- secondary
13+
- experimental
1314

1415
jobs:
1516
include:
@@ -51,7 +52,19 @@ jobs:
5152
- env: GROUP=2
5253
python: 3.5
5354

55+
# Test experimental stuff that are not part of the standard pip usage.
56+
# Helpful for developers working on them to see how they're doing.
57+
- stage: experimental
58+
env:
59+
- GROUP=1
60+
- PIP_UNSTABLE_FEATURE=resolver
61+
- env:
62+
- GROUP=2
63+
- PIP_UNSTABLE_FEATURE=resolver
64+
5465
fast_finish: true
66+
allow_failures:
67+
- stage: experimental
5568

5669
before_install: tools/travis/setup.sh
5770
install: travis_retry tools/travis/install.sh

0 commit comments

Comments
 (0)