From bc219fafe6dc32bad498234ab8c3c21641e98828 Mon Sep 17 00:00:00 2001 From: Jay Qi <2721979+jayqi@users.noreply.github.com> Date: Mon, 29 Apr 2024 14:49:37 -0400 Subject: [PATCH] Use uv; update Python versions --- .github/workflows/examples.yml | 10 +++++++--- .github/workflows/release.yml | 9 ++++----- .github/workflows/tests.yml | 28 ++++++++++++---------------- Makefile | 2 +- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 5c0b1f4..077aa61 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -12,10 +12,14 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.8 - uses: actions/setup-python@v2 + - name: Set up Python 3.11 with uv + uses: drivendataorg/setup-python-uv-action@v1 with: - python-version: 3.8 + python-version: 3.11 + + - name: Install dependencies + run: | + uv pip install -r dev-requirements.txt - name: Build examples and docs run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b8f5507..fdb89a6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,15 +16,14 @@ jobs: - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + - name: Set up Python 3.11 with uv + uses: drivendataorg/setup-python-uv-action@v1 with: - python-version: 3.7 + python-version: 3.11 - name: Install dependencies run: | - python -m pip install --upgrade pip - pip install -r dev-requirements.txt + uv pip install -r dev-requirements.txt - name: Build package id: build_package diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dc37c77..f8dcc95 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,15 +19,14 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.8 - uses: actions/setup-python@v2 + - name: Set up Python 3.11 with uv + uses: drivendataorg/setup-python-uv-action@v1 with: - python-version: 3.8 + python-version: 3.11 - name: Install dependencies run: | - python -m pip install --upgrade pip - pip install -r dev-requirements.txt + uv pip install -r dev-requirements.txt - name: Lint package run: | @@ -40,21 +39,20 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: [3.7, 3.8, 3.9, "3.10"] + python-version: [3.8, 3.9, "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + - name: Set up Python ${{ matrix.python-version }} with uv + uses: drivendataorg/setup-python-uv-action@v1 with: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - python -m pip install --upgrade pip - pip install -r dev-requirements.txt + uv pip install -r dev-requirements.txt - name: Test Package run: | @@ -78,14 +76,12 @@ jobs: PYTHON_BIN=bin/python fi echo "=== Testing wheel installation ===" - python -m venv .venv-whl - .venv-whl/$PYTHON_BIN -m pip install --upgrade pip - .venv-whl/$PYTHON_BIN -m pip install dist/deon-*.whl + uv virtualenv .venv-whl + uv pip install dist/deon-*.whl --python=.venv-whl/$PYTHON_BIN .venv-whl/$PYTHON_BIN -m deon --help echo "=== Testing source installation ===" - python -m venv .venv-sdist - .venv-sdist/$PYTHON_BIN -m pip install --upgrade pip - .venv-sdist/$PYTHON_BIN -m pip install dist/deon-*.tar.gz --force-reinstall + uv virtualenv .venv-sdist + uv pip install dist/deon-*.tar.gz --python=.venv-sdist/$PYTHON_BIN .venv-sdist/$PYTHON_BIN -m deon --help - name: Test Building Docs diff --git a/Makefile b/Makefile index 02b42c3..e093745 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ reqs: pip install -r dev-requirements.txt -examples: reqs +examples: deon --output examples/ethics.md --overwrite deon --output examples/ethics.ipynb --overwrite deon --output examples/ethics.html --overwrite