Skip to content

Commit

Permalink
Unpin pip version and bump actions versions (#3598)
Browse files Browse the repository at this point in the history
* Unpin pip version

Signed-off-by: Ankita Katiyar <ankitakatiyar2401@gmail.com>

* Bump versions of actions

Signed-off-by: Ankita Katiyar <ankitakatiyar2401@gmail.com>

* Upgrade pip

Signed-off-by: Ankita Katiyar <ankitakatiyar2401@gmail.com>

* Update command

Signed-off-by: Ankita Katiyar <ankitakatiyar2401@gmail.com>

* Update pip version in e2e tests

Signed-off-by: Ankita Katiyar <ankitakatiyar2401@gmail.com>

* Add lower bound and remove comments

Signed-off-by: Ankita Katiyar <ankitakatiyar2401@gmail.com>

* Bump actions versions on release

Signed-off-by: Ankita Katiyar <ankitakatiyar2401@gmail.com>

---------

Signed-off-by: Ankita Katiyar <ankitakatiyar2401@gmail.com>
Co-authored-by: Nok Lam Chan <nok.lam.chan@quantumblack.com>
  • Loading branch information
ankatiyar and noklam authored Feb 6, 2024
1 parent 0ad58a4 commit 9b11c59
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GH_TAGGING_TOKEN }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/check-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
check-version:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Install dependencies
Expand Down Expand Up @@ -43,9 +43,9 @@ jobs:
needs.check-version.outputs.new_release == 'true'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-language-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: runner / vale
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: errata-ai/vale-action@reviewdog
with:
reporter: github-pr-check
10 changes: 5 additions & 5 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,28 @@ jobs:
runs-on: ${{ inputs.os }}
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.branch }}
- name: Set up Python ${{inputs.python-version}}
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: ${{inputs.python-version}}
- name: Cache python packages for Linux
if: inputs.os == 'ubuntu-latest'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{inputs.os}}-python-${{inputs.python-version}}
- name: Cache python packages for Windows
if: inputs.os == 'windows-latest'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~\AppData\Local\pip\Cache
key: ${{inputs.os}}-python-${{inputs.python-version}}
- name: Add MSBuild to PATH
if: inputs.os == 'windows-latest'
uses: microsoft/setup-msbuild@v1
uses: microsoft/setup-msbuild@v2
- name: Install Microsoft Visual C++ Redistributable
if: inputs.os == 'windows-latest'
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ jobs:
runs-on: ${{ inputs.os }}
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.branch }}
- name: Set up Python ${{ inputs.python-version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: ${{ inputs.python-version }}
- name: Cache python packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{inputs.os}}-python-${{inputs.python-version}}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pip-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,28 @@ jobs:
runs-on: ${{ inputs.os }}
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.branch }}
- name: Set up Python ${{inputs.python-version}}
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: ${{inputs.python-version}}
- name: Cache python packages for Linux
if: inputs.os == 'ubuntu-latest'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{inputs.os}}-python-${{inputs.python-version}}
- name: Cache python packages for Windows
if: inputs.os == 'windows-latest'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~\AppData\Local\pip\Cache
key: ${{inputs.os}}-python-${{inputs.python-version}}
- name: Add MSBuild to PATH
if: inputs.os == 'windows-latest'
uses: microsoft/setup-msbuild@v1
uses: microsoft/setup-msbuild@v2
- name: Install dependencies
run: |
make install-test-requirements
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GH_TAGGING_TOKEN }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,28 @@ jobs:
runs-on: ${{ inputs.os }}
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.branch }}
- name: Set up Python ${{inputs.python-version}}
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: ${{inputs.python-version}}
- name: Cache python packages for Linux
if: inputs.os == 'ubuntu-latest'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{inputs.os}}-python-${{inputs.python-version}}
- name: Cache python packages for Windows
if: inputs.os == 'windows-latest'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~\AppData\Local\pip\Cache
key: ${{inputs.os}}-python-${{inputs.python-version}}
- name: Add MSBuild to PATH
if: inputs.os == 'windows-latest'
uses: microsoft/setup-msbuild@v1
uses: microsoft/setup-msbuild@v2
- name: Install dependencies
run: |
make install-test-requirements
Expand Down
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ package: clean install
python -m pip install build && python -m build

install-test-requirements:
# pip==23.2 breaks pip-tools<7.0, and pip-tools>=7.0 does not support Python 3.7
# pip==23.3 breaks dependency resolution
python -m pip install -U "pip>=21.2,<23.2"
python -m pip install -U "pip>=21.2"
pip install .[test]

install-pre-commit:
Expand Down
4 changes: 1 addition & 3 deletions features/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,7 @@ def _setup_minimal_env(context):
"pip",
"install",
"-U",
# pip==23.2 breaks pip-tools<7.0, and pip-tools>=7.0 does not support Python 3.7
# pip==23.3 breaks dependency resolution
"pip>=21.2,<23.2",
"pip>=21.2",
],
env=context.env,
)
Expand Down

0 comments on commit 9b11c59

Please sign in to comment.