Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the github-actions group with 4 updates #6577

Merged
merged 2 commits into from Jan 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/autofix.yml
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: install-pinned/ruff@0e35bc58bd73769469284df9e1f8898daeea8768
- uses: install-pinned/ruff@4ec70113ad8b512f13948b8d9855ac59675535d2
- run: ruff --fix-only .
- run: ruff format .

Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/main.yml
Expand Up @@ -59,7 +59,7 @@ jobs:
with:
persist-credentials: false
fetch-depth: 0
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.py }}
- run: pip install tox
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
with:
persist-credentials: false
fetch-depth: 0
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version-file: .github/python-version.txt
- if: matrix.platform == 'windows'
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
(github.ref == 'refs/heads/citest' || startsWith(github.ref, 'refs/tags/'))
run: python -u release/build.py --dirty installbuilder-installer msix-installer

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
# artifacts must have different names, see https://github.com/actions/upload-artifact/issues/24
name: binaries.${{ matrix.platform }}
Expand Down Expand Up @@ -173,7 +173,7 @@ jobs:
- uses: actions/checkout@v4
with:
persist-credentials: false
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version-file: .github/python-version.txt
- run: |
Expand All @@ -182,7 +182,7 @@ jobs:
sudo dpkg -i hugo*.deb
- run: pip install -e .[dev]
- run: ./docs/build.py
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: docs
path: docs/public
Expand All @@ -192,7 +192,7 @@ jobs:
env:
DOCS_ARCHIVE: true
- if: startsWith(github.ref, 'refs/tags/')
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docs-archive
path: docs/public
Expand Down Expand Up @@ -229,10 +229,10 @@ jobs:
- uses: actions/checkout@v4
with:
persist-credentials: false
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version-file: .github/python-version.txt
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: binaries.linux
path: release/dist
Expand Down Expand Up @@ -266,32 +266,32 @@ jobs:
- uses: actions/checkout@v4
with:
persist-credentials: false
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version-file: .github/python-version.txt
- run: sudo apt-get update
- run: sudo apt-get install -y awscli
- if: startsWith(github.ref, 'refs/tags/')
run: sudo apt-get install -y twine

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: docs
path: docs/public
- if: startsWith(github.ref, 'refs/tags/')
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: docs-archive
path: docs/archive
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: binaries.windows
path: release/dist
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: binaries.linux
path: release/dist
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: binaries.macos
path: release/dist
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Expand Up @@ -28,7 +28,7 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version-file: .github/node-version.txt
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version-file: .github/python-version.txt
- run: ./release/release.py ${{ inputs.version }} ${{ inputs.skip-branch-status-check }}
Expand Down
2 changes: 1 addition & 1 deletion mitmproxy/io/har.py
Expand Up @@ -13,7 +13,7 @@


def fix_headers(
request_headers: list[dict[str, str]] | list[tuple[str, str]]
request_headers: list[dict[str, str]] | list[tuple[str, str]],
) -> http.Headers:
"""Converts provided headers into (b"header-name", b"header-value") tuples"""
flow_headers: list[tuple[bytes, bytes]] = []
Expand Down
6 changes: 3 additions & 3 deletions mitmproxy/proxy/layers/http/_http2.py
Expand Up @@ -604,7 +604,7 @@ def handle_h2_event(self, event: h2.events.Event) -> CommandGenerator[bool]:


def split_pseudo_headers(
h2_headers: Sequence[tuple[bytes, bytes]]
h2_headers: Sequence[tuple[bytes, bytes]],
) -> tuple[dict[bytes, bytes], http.Headers]:
pseudo_headers: dict[bytes, bytes] = {}
i = 0
Expand All @@ -624,7 +624,7 @@ def split_pseudo_headers(


def parse_h2_request_headers(
h2_headers: Sequence[tuple[bytes, bytes]]
h2_headers: Sequence[tuple[bytes, bytes]],
) -> tuple[str, int, bytes, bytes, bytes, bytes, http.Headers]:
"""Split HTTP/2 pseudo-headers from the actual headers and parse them."""
pseudo_headers, headers = split_pseudo_headers(h2_headers)
Expand Down Expand Up @@ -654,7 +654,7 @@ def parse_h2_request_headers(


def parse_h2_response_headers(
h2_headers: Sequence[tuple[bytes, bytes]]
h2_headers: Sequence[tuple[bytes, bytes]],
) -> tuple[int, http.Headers]:
"""Split HTTP/2 pseudo-headers from the actual headers and parse them."""
pseudo_headers, headers = split_pseudo_headers(h2_headers)
Expand Down