Skip to content

Commit ed51fe9

Browse files
v2.4.1 (#1092)
* GHA Yaml lint (#1082) Yaml lint * Register for signals only when running in main thread (#1087) * npm: bump follow-redirects from 1.11.0 to 1.14.8 in /dashboard (#1090) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.11.0 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.11.0...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent ebbeee2 commit ed51fe9

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

.github/workflows/test-library.yml

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,15 @@ on: # yamllint disable-line rule:truthy
2424
The commit to be released to PyPI and tagged
2525
in Git as `release-version`. Normally, you
2626
should keep this empty.
27+
required: false
2728
YOLO:
28-
default: false
29+
default: "false"
2930
description: >-
3031
Flag whether test results should block the
3132
release (true/false). Only use this under
3233
extraordinary circumstances to ignore the
3334
test failures and cut the release regardless.
35+
required: false
3436

3537
concurrency:
3638
group: >-
@@ -214,7 +216,7 @@ jobs:
214216
needs:
215217
- pre-setup # transitive, for accessing settings
216218

217-
runs-on: Ubuntu-latest
219+
runs-on: ubuntu-latest
218220

219221
env:
220222
PY_COLORS: 1
@@ -329,7 +331,7 @@ jobs:
329331
- build
330332
- pre-setup # transitive, for accessing settings
331333

332-
runs-on: Ubuntu-latest
334+
runs-on: ubuntu-latest
333335
strategy:
334336
matrix:
335337
toxenv:
@@ -541,16 +543,14 @@ jobs:
541543
verbose: true
542544

543545
test-container:
544-
runs-on: Ubuntu-latest
546+
runs-on: ubuntu-latest
545547
permissions:
546548
packages: write
547549
if: success()
548550
needs:
549551
- pre-setup # transitive, for accessing settings
550552
- build
551553
name: 🐳 Build & Test
552-
strategy:
553-
fail-fast: false
554554
steps:
555555
- name: Checkout
556556
uses: actions/checkout@v2
@@ -740,16 +740,14 @@ jobs:
740740
python3 -m proxy --version
741741
742742
ghcr-latest:
743-
runs-on: Ubuntu-latest
743+
runs-on: ubuntu-latest
744744
permissions:
745745
packages: write
746746
if: success()
747747
needs:
748748
- test-container
749749
- pre-setup # transitive, for accessing settings
750750
name: 🐳 ghcr:latest
751-
strategy:
752-
fail-fast: false
753751
steps:
754752
- name: Checkout
755753
uses: actions/checkout@v2
@@ -824,16 +822,14 @@ jobs:
824822
-t $LATEST_TAG .
825823
826824
ghcr-openssl:
827-
runs-on: Ubuntu-latest
825+
runs-on: ubuntu-latest
828826
permissions:
829827
packages: write
830828
if: success()
831829
needs:
832830
- test-container
833831
- pre-setup # transitive, for accessing settings
834832
name: 🐳 ghcr:openssl
835-
strategy:
836-
fail-fast: false
837833
steps:
838834
- name: Checkout
839835
uses: actions/checkout@v2
@@ -906,16 +902,14 @@ jobs:
906902
-t $LATEST_TAG .
907903
908904
docker-latest:
909-
runs-on: Ubuntu-latest
905+
runs-on: ubuntu-latest
910906
permissions:
911907
packages: write
912908
if: success()
913909
needs:
914910
- test-container
915911
- pre-setup # transitive, for accessing settings
916912
name: 🐳 docker:latest
917-
strategy:
918-
fail-fast: false
919913
steps:
920914
- name: Checkout
921915
uses: actions/checkout@v2
@@ -981,7 +975,7 @@ jobs:
981975
- ghcr-openssl
982976
- docker-latest
983977

984-
runs-on: Ubuntu-latest
978+
runs-on: ubuntu-latest
985979

986980
steps:
987981
- name: Decide whether the needed jobs succeeded or failed
@@ -996,7 +990,7 @@ jobs:
996990
- pre-setup # transitive, for accessing settings
997991
if: >-
998992
fromJSON(needs.pre-setup.outputs.release-requested)
999-
runs-on: Ubuntu-latest
993+
runs-on: ubuntu-latest
1000994

1001995
environment:
1002996
name: release
@@ -1025,7 +1019,7 @@ jobs:
10251019
if: >-
10261020
fromJSON(needs.pre-setup.outputs.is-untagged-devel)
10271021
|| fromJSON(needs.pre-setup.outputs.release-requested)
1028-
runs-on: Ubuntu-latest
1022+
runs-on: ubuntu-latest
10291023

10301024
environment:
10311025
name: release-testpypi
@@ -1054,7 +1048,7 @@ jobs:
10541048
needs:
10551049
- publish-pypi
10561050
- pre-setup # transitive, for accessing settings
1057-
runs-on: Ubuntu-latest
1051+
runs-on: ubuntu-latest
10581052

10591053
steps:
10601054
- name: Fetch the src snapshot
@@ -1087,7 +1081,7 @@ jobs:
10871081
needs:
10881082
- post-release-repo-update
10891083
- pre-setup # transitive, for accessing settings
1090-
runs-on: Ubuntu-latest
1084+
runs-on: ubuntu-latest
10911085

10921086
permissions:
10931087
contents: write

dashboard/package-lock.json

Lines changed: 18 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

proxy/plugin/program_name.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ def before_upstream_connection(
3535
raise NotImplementedError()
3636
assert self.client.addr
3737
if self.client.addr[0] in ('::1', '127.0.0.1'):
38-
assert self.client.addr
3938
port = self.client.addr[1]
4039
ls = subprocess.Popen(
4140
('lsof', '-i', '-P', '-n'),

proxy/proxy.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import pprint
1515
import signal
1616
import logging
17+
import threading
1718
from typing import TYPE_CHECKING, Any, List, Optional, cast
1819

1920
from .core.ssh import SshTunnelListener, SshHttpProtocolHandler
@@ -255,7 +256,8 @@ def setup(self) -> None:
255256
('', self.flags.tunnel_remote_port),
256257
)
257258
# TODO: May be close listener fd as we don't need it now
258-
self._register_signals()
259+
if threading.current_thread() == threading.main_thread():
260+
self._register_signals()
259261

260262
def shutdown(self) -> None:
261263
if self.flags.enable_ssh_tunnel:

0 commit comments

Comments
 (0)