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

Re-do our Python vendoring with vendoring #49034

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
274f7b8
Fix the docs build on Python 3.8
gsnedders Nov 3, 2024
7b8dc6b
Introduce a top-level tools/constraints.txt for all our Python deps
gsnedders Nov 3, 2024
16e197a
Remove unneeded virtualenv install from documentation workflow
gsnedders Nov 3, 2024
35fe978
Pin the version of tox we use when running tests
gsnedders Nov 3, 2024
022f884
fixup! Pin the version of tox we use when running tests
gsnedders Nov 3, 2024
bd64e54
DO NOT LAND
gsnedders Nov 3, 2024
4e4625c
Allow Windows Azure jobs to use the used Python
gsnedders Nov 3, 2024
032ea83
Start to redo vendoring
gsnedders Nov 3, 2024
663c576
re-vendor h2 and deps
gsnedders Nov 3, 2024
d8fd1ac
re-vendor html5lib
gsnedders Nov 3, 2024
14257b7
fixup! re-vendor html5lib
gsnedders Nov 3, 2024
c87fe5f
Re-vendor pytest
gsnedders Nov 3, 2024
e344cf6
re-vendor pywebsocket3
gsnedders Nov 3, 2024
73ddb76
fixup! re-vendor html5lib
gsnedders Nov 3, 2024
b195277
fixup! re-vendor pywebsocket3
gsnedders Nov 3, 2024
218ad6e
fixup! Re-vendor pytest
gsnedders Nov 3, 2024
a709953
fixup! re-vendor pywebsocket3
gsnedders Nov 3, 2024
4c8b9bf
re-vendor websockets
gsnedders Nov 3, 2024
ec64fd7
Re-vendor tooltool
gsnedders Nov 3, 2024
3ad78eb
Remove unused vendored packages
gsnedders Nov 3, 2024
89de66f
fixup! Remove unused vendored packages
gsnedders Nov 3, 2024
dc7f297
fixup! re-vendor html5lib
gsnedders Nov 3, 2024
f1f2e19
fixup! Re-vendor pytest
gsnedders Nov 3, 2024
ce8d58a
fixup! re-vendor html5lib
gsnedders Nov 3, 2024
58c78ba
fixup! re-vendor pywebsocket3
gsnedders Nov 3, 2024
68e1d7d
fixup! re-vendor websockets
gsnedders Nov 3, 2024
11db06f
fixup! Re-vendor tooltool
gsnedders Nov 3, 2024
3110675
fixup! re-vendor html5lib
gsnedders Nov 3, 2024
3402949
get things passing mypy
gsnedders Nov 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 0 additions & 4 deletions .azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@ jobs:
- task: UsePythonVersion@0
inputs:
versionSpec: '3.8'
addToPath: false
- template: tools/ci/azure/checkout.yml
- template: tools/ci/azure/tox_pytest.yml
parameters:
Expand All @@ -251,7 +250,6 @@ jobs:
- task: UsePythonVersion@0
inputs:
versionSpec: '3.12'
addToPath: false
- template: tools/ci/azure/checkout.yml
- template: tools/ci/azure/tox_pytest.yml
parameters:
Expand All @@ -268,7 +266,6 @@ jobs:
- task: UsePythonVersion@0
inputs:
versionSpec: '3.8'
addToPath: false
- template: tools/ci/azure/checkout.yml
- template: tools/ci/azure/tox_pytest.yml
parameters:
Expand All @@ -285,7 +282,6 @@ jobs:
- task: UsePythonVersion@0
inputs:
versionSpec: '3.12'
addToPath: false
- template: tools/ci/azure/checkout.yml
- template: tools/ci/azure/tox_pytest.yml
parameters:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: '14'
- name: Set up Virtualenv
run: pip install virtualenv
- name: Checkout
uses: actions/checkout@v4
with:
Expand Down
7 changes: 7 additions & 0 deletions docs/requirements.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
recommonmark==0.7.1
sphinx-argparse==0.4.0
sphinx-autobuild==2021.3.14
sphinx-js==3.2.2
sphinx==7.1.2 ; python_version < '3.9'
sphinx==7.2.6 ; python_version >= '3.9'
markupsafe==2.0.1
8 changes: 2 additions & 6 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
recommonmark==0.7.1
sphinx-argparse==0.4.0
sphinx-autobuild==2021.3.14
sphinx-js==3.2.2
sphinx==7.2.6
markupsafe==2.0.1
-r requirements.in
-c ../tools/constraints.txt
1 change: 1 addition & 0 deletions resources/test/requirements.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
html5lib==1.1
3 changes: 2 additions & 1 deletion resources/test/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
html5lib==1.1
-r requirements.in
-c ../../tools/constraints.txt
6 changes: 0 additions & 6 deletions tools/ci/azure/pip_install.yml

This file was deleted.

10 changes: 6 additions & 4 deletions tools/ci/azure/tox_pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ parameters:
toxenv: 'ALL'

steps:
- template: pip_install.yml
parameters:
packages: tox
- script: |
python --version
python -m pip --version
python -m pip --debug --verbose --verbose --disable-pip-version-check install --upgrade -r tools/ci/requirements_tox.txt
displayName: 'Install Python packages'

- script: |
set -eux -o pipefail
tox -c ${{ parameters.directory }} -e ${{ parameters.toxenv }} -- --junitxml=results.xml
python -m tox -c ${{ parameters.directory }} -e ${{ parameters.toxenv }} -- --junitxml=results.xml
displayName: 'Run tests'

- task: PublishTestResults@2
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/ci_resources_unittest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cd $WPT_ROOT

main() {
cd $WPT_ROOT
pip install --user -U tox
pip install --user -r "$SCRIPT_DIR/requirements_tox.txt"
./wpt install firefox browser --destination $HOME
./wpt install firefox webdriver --destination $HOME/firefox
export PATH=$HOME/firefox:$PATH
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/ci_tools_integration_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cd $WPT_ROOT

main() {
git fetch --quiet --unshallow https://github.com/web-platform-tests/wpt.git +refs/heads/*:refs/remotes/origin/*
pip install --user -U tox
pip install --user -r "$SCRIPT_DIR/requirements_tox.txt"

# wpt commands integration tests
cd tools/wpt
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/ci_tools_unittest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ run_applicable_tox () {
}

if ./wpt test-jobs --includes tools_unittest; then
pip install --user -U tox
pip install --user -r "$SCRIPT_DIR/requirements_tox.txt"
cd tools
run_applicable_tox
cd $WPT_ROOT
Expand Down
5 changes: 5 additions & 0 deletions tools/ci/requirements_build.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cairocffi==1.7.0
fonttools==4.51.0
genshi==0.7.7
jinja2==3.1.4
pyyaml==6.0.1
7 changes: 2 additions & 5 deletions tools/ci/requirements_build.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
cairocffi==1.7.0
fonttools==4.51.0
genshi==0.7.7
jinja2==3.1.4
pyyaml==6.0.1
-r requirements_build.in
-c ../constraints.txt
4 changes: 4 additions & 0 deletions tools/ci/requirements_macos_color_profile.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
pyobjc-core==10.3.1
pyobjc-framework-Cocoa==9.2
pyobjc-framework-ColorSync==9.2
pyobjc-framework-Quartz==9.2
6 changes: 2 additions & 4 deletions tools/ci/requirements_macos_color_profile.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
pyobjc-core==10.3.1
pyobjc-framework-Cocoa==9.2
pyobjc-framework-ColorSync==9.2
pyobjc-framework-Quartz==9.2
-r requirements_macos_color_profile.in
-c ../constraints.txt
4 changes: 4 additions & 0 deletions tools/ci/requirements_tc.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
pygithub==2.3.0
pyyaml==6.0.1
requests==2.32.3
taskcluster==68.0.4
6 changes: 2 additions & 4 deletions tools/ci/requirements_tc.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
pygithub==2.3.0
pyyaml==6.0.1
requests==2.32.3
taskcluster==68.0.4
-r requirements_tc.in
-c ../constraints.txt
1 change: 1 addition & 0 deletions tools/ci/requirements_tox.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tox==4.15.1
2 changes: 2 additions & 0 deletions tools/ci/requirements_tox.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-r requirements_tox.in
-c ../constraints.txt
25 changes: 25 additions & 0 deletions tools/constraints.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
-r ../docs/requirements.in
-r ../resources/test/requirements.in
-r ci/requirements_build.in
-r ci/requirements_macos_color_profile.in
-r ci/requirements_tc.in
-r ci/requirements_tox.in
-r docker/requirements.in
-r manifest/requirements.in
-r metadata/yaml/requirements.in
-r requirements_flake8.in
-r requirements_mypy.in
-r requirements_pytest.in
-r requirements_tests.in
-r requirements_vendor.in
-r wave/requirements.in
-r webtransport/requirements.in
-r wpt/requirements.in
-r wpt/requirements_android.in
-r wpt/requirements_install.in
-r wptrunner/requirements.in
-r wptrunner/requirements_chromium.in
-r wptrunner/requirements_firefox.in
-r wptrunner/requirements_opera.in
-r wptrunner/requirements_safari.in
-r wptrunner/requirements_sauce.in
Loading