Skip to content

Commit 62747db

Browse files
abhinavsinghabhinavsingh
authored
Merge branch 'develop' into pyup-update-twine-3.4.2-to-3.5.0
2 parents d226c1d + eeb11e2 commit 62747db

8 files changed

+117
-100
lines changed

‎.github/FUNDING.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
---
12
open_collective: proxypy
3+
...

‎.github/workflows/codeql-analysis.yml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1+
---
12
# For most projects, this workflow file will not need changing; you simply need
23
# to commit it to your repository.
34
#
45
# You may wish to alter this file to override the set of languages analyzed,
56
# or to provide custom queries or build logic.
67
name: "CodeQL"
78

8-
on:
9+
on: # yamllint disable-line rule:truthy
910
push:
1011
branches: [develop, master]
1112
pull_request:
1213
# The branches below must be a subset of the branches above
1314
branches: [develop]
1415
schedule:
15-
- cron: '0 14 * * 1'
16+
- cron: '0 14 * * 1'
1617

1718
jobs:
1819
analyze:
@@ -23,10 +24,13 @@ jobs:
2324
fail-fast: false
2425
matrix:
2526
# Override automatic language detection by changing the below list
26-
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
27+
# Supported options are
28+
# ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
2729
language: ['python', 'javascript']
2830
# Learn more...
29-
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
31+
# https://docs.github.com/en/github
32+
# /finding-security-vulnerabilities-and-errors-in-your-code
33+
# /configuring-code-scanning#overriding-automatic-language-detection
3034

3135
steps:
3236
- name: Checkout repository
@@ -46,26 +50,29 @@ jobs:
4650
uses: github/codeql-action/init@v1
4751
with:
4852
languages: ${{ matrix.language }}
49-
# If you wish to specify custom queries, you can do so here or in a config file.
50-
# By default, queries listed here will override any specified in a config file.
51-
# Prefix the list here with "+" to use these queries and those in the config file.
53+
# If you wish to specify custom queries, you can do so here or in a
54+
# config file. By default, queries listed here will override any
55+
# specified in a config file. Prefix the list here with "+" to use
56+
# these queries and those in the config file.
5257
# queries: ./path/to/local/query, your-org/your-repo/queries@main
5358

5459
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
55-
# If this step fails, then you should remove it and run the build manually (see below)
60+
# If this step fails, then you should remove it and run the build manually
61+
# (see below)
5662
# - name: Autobuild
5763
# uses: github/codeql-action/autobuild@v1
5864

5965
# ℹ️ Command-line programs to run using the OS shell.
6066
# 📚 https://git.io/JvXDl
6167

62-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
63-
# and modify them (or add more) to build your code if your project
64-
# uses a compiled language
68+
# ✏️ If the Autobuild fails above, remove it and uncomment the following
69+
# three lines and modify them (or add more) to build your code if your
70+
# project uses a compiled language
6571

66-
#- run: |
67-
# make bootstrap
68-
# make release
72+
# - run: |
73+
# make bootstrap
74+
# make release
6975

7076
- name: Perform CodeQL Analysis
7177
uses: github/codeql-action/analyze@v1
78+
...

‎.github/workflows/test-brew.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
---
12
name: Proxy.py Brew
23

3-
on: [push, pull_request]
4+
on: [push, pull_request] # yamllint disable-line rule:truthy
45

56
jobs:
67
build:
@@ -13,14 +14,15 @@ jobs:
1314
max-parallel: 1
1415
fail-fast: false
1516
steps:
16-
- uses: actions/checkout@v2
17-
- name: Setup Python
18-
uses: actions/setup-python@v2
19-
with:
20-
python-version: ${{ matrix.python }}
21-
- name: Brew
22-
run: |
23-
brew install ./helper/homebrew/develop/proxy.rb
24-
- name: Verify
25-
run: |
26-
proxy -h
17+
- uses: actions/checkout@v2
18+
- name: Setup Python
19+
uses: actions/setup-python@v2
20+
with:
21+
python-version: ${{ matrix.python }}
22+
- name: Brew
23+
run: |
24+
brew install ./helper/homebrew/develop/proxy.rb
25+
- name: Verify
26+
run: |
27+
proxy -h
28+
...

‎.github/workflows/test-dashboard.yml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
---
12
name: Proxy.py Dashboard
23

3-
on: [push, pull_request]
4+
on: [push, pull_request] # yamllint disable-line rule:truthy
45

56
jobs:
67
build:
@@ -13,18 +14,19 @@ jobs:
1314
max-parallel: 4
1415
fail-fast: false
1516
steps:
16-
- uses: actions/checkout@v2
17-
- name: Setup Node
18-
uses: actions/setup-node@v2
19-
with:
20-
node-version: ${{ matrix.node }}
21-
- name: Install Dependencies
22-
run: |
23-
cd dashboard
24-
npm install
25-
cd ..
26-
- name: Build Dashboard
27-
run: |
28-
cd dashboard
29-
npm run build
30-
cd ..
17+
- uses: actions/checkout@v2
18+
- name: Setup Node
19+
uses: actions/setup-node@v2
20+
with:
21+
node-version: ${{ matrix.node }}
22+
- name: Install Dependencies
23+
run: |
24+
cd dashboard
25+
npm install
26+
cd ..
27+
- name: Build Dashboard
28+
run: |
29+
cd dashboard
30+
npm run build
31+
cd ..
32+
...

‎.github/workflows/test-docker.yml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
---
12
name: Proxy.py Docker
23

3-
on: [push, pull_request]
4+
on: [push, pull_request] # yamllint disable-line rule:truthy
45

56
jobs:
67
build:
@@ -13,17 +14,18 @@ jobs:
1314
max-parallel: 1
1415
fail-fast: false
1516
steps:
16-
- uses: actions/checkout@v2
17-
- name: Setup Python
18-
uses: actions/setup-python@v2
19-
with:
20-
python-version: ${{ matrix.python }}
21-
- name: Install dependencies
22-
run: |
23-
python -m pip install --upgrade pip
24-
pip install -r requirements.txt
25-
pip install -r requirements-testing.txt
26-
pip install -r requirements-tunnel.txt
27-
- name: Build
28-
run: |
29-
make container
17+
- uses: actions/checkout@v2
18+
- name: Setup Python
19+
uses: actions/setup-python@v2
20+
with:
21+
python-version: ${{ matrix.python }}
22+
- name: Install dependencies
23+
run: |
24+
python -m pip install --upgrade pip
25+
pip install -r requirements.txt
26+
pip install -r requirements-testing.txt
27+
pip install -r requirements-tunnel.txt
28+
- name: Build
29+
run: |
30+
make container
31+
...

‎.github/workflows/test-library.yml

Lines changed: 40 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
1+
---
12
name: Proxy.py Library
23

3-
on: [push, pull_request]
4+
on: [push, pull_request] # yamllint disable-line rule:truthy
5+
6+
concurrency:
7+
group: >-
8+
${{
9+
github.workflow
10+
}}-${{
11+
github.event.pull_request.number || github.sha
12+
}}
13+
cancel-in-progress: true
414

515
jobs:
616
build:
@@ -13,29 +23,34 @@ jobs:
1323
max-parallel: 4
1424
fail-fast: false
1525
steps:
16-
- uses: actions/checkout@v2
17-
- name: Setup Python
18-
uses: actions/setup-python@v2
19-
with:
20-
python-version: ${{ matrix.python }}
21-
- name: Install dependencies
22-
run: |
23-
python -m pip install --upgrade pip
24-
pip install -r requirements.txt
25-
pip install -r requirements-testing.txt
26-
pip install -r requirements-tunnel.txt
27-
- name: Run Tests
28-
run: pytest --cov=proxy tests/
29-
- name: Upload coverage to Codecov
30-
env:
31-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
32-
run: codecov
33-
- name: Integration testing
34-
if: matrix.os != 'windows'
35-
run: |
36-
pip install .
37-
proxy --hostname 127.0.0.1 --enable-web-server --pid-file proxy.pid --log-file proxy.log &
38-
./tests/integration/main.sh
26+
- uses: actions/checkout@v2
27+
- name: Setup Python
28+
uses: actions/setup-python@v2
29+
with:
30+
python-version: ${{ matrix.python }}
31+
- name: Install dependencies
32+
run: |
33+
python -m pip install --upgrade pip
34+
pip install -r requirements.txt
35+
pip install -r requirements-testing.txt
36+
pip install -r requirements-tunnel.txt
37+
- name: Run Tests
38+
run: pytest --cov=proxy tests/
39+
- name: Upload coverage to Codecov
40+
env:
41+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
42+
run: codecov
43+
- name: Integration testing
44+
if: matrix.os != 'windows'
45+
run: |
46+
pip install .
47+
proxy \
48+
--hostname 127.0.0.1 \
49+
--enable-web-server \
50+
--pid-file proxy.pid \
51+
--log-file proxy.log \
52+
&
53+
./tests/integration/main.sh
3954
4055
tox:
4156
name: ${{ matrix.toxenv }}
@@ -126,3 +141,4 @@ jobs:
126141
run: >-
127142
print("All's good")
128143
shell: python
144+
...

‎.pre-commit-config.yaml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,10 @@ repos:
8585
- id: check-byte-order-marker
8686
- id: check-case-conflict
8787
# disabled due to pre-commit/pre-commit-hooks#159
88-
#- id: check-docstring-first
88+
# - id: check-docstring-first
8989
- id: check-json
9090
- id: check-symlinks
9191
- id: check-yaml
92-
# args:
93-
# - --unsafe
9492
- id: detect-private-key
9593

9694
# Heavy checks:
@@ -141,20 +139,6 @@ repos:
141139
rev: v1.26.2
142140
hooks:
143141
- id: yamllint
144-
exclude: |
145-
(?x)
146-
^
147-
\.pre-commit-config\.yaml|
148-
(
149-
\.github/(
150-
workflows/(
151-
codeql-analysis|test-(brew|dashboard|docker|library)
152-
)|
153-
FUNDING
154-
)|
155-
codecov
156-
)\.yml
157-
$
158142
args:
159143
- --strict
160144
types: [file, yaml]

‎codecov.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
---
12
codecov:
2-
require_ci_to_pass: yes
3+
require_ci_to_pass: yes # yamllint disable-line rule:truthy
34
notify:
4-
wait_for_ci: yes
5+
wait_for_ci: yes # yamllint disable-line rule:truthy
56
coverage:
67
status:
78
project:
@@ -10,3 +11,4 @@ coverage:
1011
patch:
1112
default:
1213
threshold: 1%
14+
...

0 commit comments

Comments
 (0)