Skip to content

Commit

Permalink
Ditch uv until actions/setup-python gets support
Browse files Browse the repository at this point in the history
  • Loading branch information
Twixes committed Apr 10, 2024
1 parent a365eee commit ff22560
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 40 deletions.
9 changes: 2 additions & 7 deletions .github/actions/run-backend-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@ runs:
cache-dependency-path: '**/requirements*.txt'
token: ${{ inputs.token }}

# uv is a fast pip alternative: https://github.com/astral-sh/uv/
- name: Install uv
shell: bash
run: pip install uv

- name: Determine if hogql-parser has changed compared to master
shell: bash
id: hogql-parser-diff
Expand Down Expand Up @@ -90,7 +85,7 @@ runs:
- name: Install Python dependencies
shell: bash
run: |
uv pip install --system -r requirements.txt -r requirements-dev.txt
pip install --system -r requirements.txt -r requirements-dev.txt
- name: Install the working version of hogql-parser
if: steps.hogql-parser-diff.outputs.changed == 'true'
Expand All @@ -116,7 +111,7 @@ runs:
sudo cp out/usr/local/lib/libantlr4-runtime.so* /usr/lib/
sudo ldconfig
cd ..
uv pip install --system ./hogql_parser
pip install --system ./hogql_parser
- name: Set up needed files
shell: bash
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ jobs:
cache-dependency-path: '**/requirements*.txt'
token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}

# uv is a fast pip alternative: https://github.com/astral-sh/uv/
- run: pip install uv

- name: Install SAML (python3-saml) dependencies
shell: bash
run: |
Expand All @@ -70,11 +67,11 @@ jobs:
- name: Install python dependencies
run: |
uv pip install --system -r requirements-dev.txt
uv pip install --system -r requirements.txt
pip install --system -r requirements-dev.txt
pip install --system -r requirements.txt
- name: Install asv
run: uv pip install --system asv==0.5.1 virtualenv
run: pip install --system asv==0.5.1 virtualenv

- name: Set up PostHog
run: |
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/build-hogql-parser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,8 @@ jobs:
if: matrix.os == 'ubuntu-22.04' # Only build the sdist once
run: cd hogql_parser && python setup.py sdist

# uv is a fast pip alternative: https://github.com/astral-sh/uv/
- run: pip install uv

- name: Install cibuildwheel
run: uv pip install --system cibuildwheel==2.16.*
run: pip install --system cibuildwheel==2.16.*

- name: Build wheels
run: cd hogql_parser && python -m cibuildwheel --output-dir dist
Expand Down
17 changes: 4 additions & 13 deletions .github/workflows/ci-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,17 +112,14 @@ jobs:
cache-dependency-path: '**/requirements*.txt'
token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}

# uv is a fast pip alternative: https://github.com/astral-sh/uv/
- run: pip install uv

- name: Install SAML (python3-saml) dependencies
run: |
sudo apt-get update
sudo apt-get install libxml2-dev libxmlsec1 libxmlsec1-dev libxmlsec1-openssl
- name: Install Python dependencies
run: |
uv pip install --system -r requirements.txt -r requirements-dev.txt
pip install --system -r requirements.txt -r requirements-dev.txt
- name: Check for syntax errors, import sort, and code style violations
run: |
Expand Down Expand Up @@ -189,17 +186,14 @@ jobs:
cache-dependency-path: '**/requirements*.txt'
token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}

# uv is a fast pip alternative: https://github.com/astral-sh/uv/
- run: pip install uv

- name: Install SAML (python3-saml) dependencies
run: |
sudo apt-get update
sudo apt-get install libxml2-dev libxmlsec1-dev libxmlsec1-openssl
- name: Install python dependencies
run: |
uv pip install --system -r requirements.txt -r requirements-dev.txt
pip install --system -r requirements.txt -r requirements-dev.txt
- uses: actions/checkout@v3
with:
Expand All @@ -209,7 +203,7 @@ jobs:
run: |
# We need to ensure we have requirements for the master branch
# now also, so we can run migrations up to master.
uv pip install --system -r requirements.txt -r requirements-dev.txt
pip install --system -r requirements.txt -r requirements-dev.txt
python manage.py migrate
- uses: actions/checkout@v3
Expand Down Expand Up @@ -340,9 +334,6 @@ jobs:
cache-dependency-path: '**/requirements*.txt'
token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}

# uv is a fast pip alternative: https://github.com/astral-sh/uv/
- run: pip install uv

- name: Install SAML (python3-saml) dependencies
run: |
sudo apt-get update
Expand All @@ -351,7 +342,7 @@ jobs:
- name: Install python dependencies
shell: bash
run: |
uv pip install --system -r requirements.txt -r requirements-dev.txt
pip install --system -r requirements.txt -r requirements-dev.txt
- name: Add kafka host to /etc/hosts for kafka connectivity
run: sudo echo "127.0.0.1 kafka" | sudo tee -a /etc/hosts
Expand Down
14 changes: 4 additions & 10 deletions .github/workflows/ci-plugin-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,6 @@ jobs:
cache-dependency-path: '**/requirements*.txt'
token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}

# uv is a fast pip alternative: https://github.com/astral-sh/uv/
- run: pip install uv

- name: Install SAML (python3-saml) dependencies
if: needs.changes.outputs.plugin-server == 'true'
run: |
Expand All @@ -134,8 +131,8 @@ jobs:
- name: Install python dependencies
if: needs.changes.outputs.plugin-server == 'true'
run: |
uv pip install --system -r requirements-dev.txt
uv pip install --system -r requirements.txt
pip install --system -r requirements-dev.txt
pip install --system -r requirements.txt
- name: Install pnpm
if: needs.changes.outputs.plugin-server == 'true'
Expand Down Expand Up @@ -216,18 +213,15 @@ jobs:
cache-dependency-path: '**/requirements*.txt'
token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}

# uv is a fast pip alternative: https://github.com/astral-sh/uv/
- run: pip install uv

- name: Install SAML (python3-saml) dependencies
run: |
sudo apt-get update
sudo apt-get install libxml2-dev libxmlsec1-dev libxmlsec1-openssl
- name: Install python dependencies
run: |
uv pip install --system -r requirements-dev.txt
uv pip install --system -r requirements.txt
pip install --system -r requirements-dev.txt
pip install --system -r requirements.txt
- name: Install pnpm
uses: pnpm/action-setup@v2
Expand Down

0 comments on commit ff22560

Please sign in to comment.