Skip to content

Commit

Permalink
Debug Regressions: Try reverting build system
Browse files Browse the repository at this point in the history
  • Loading branch information
corey committed Feb 18, 2024
1 parent f0c671c commit ad5e173
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 27 deletions.
50 changes: 26 additions & 24 deletions .github/workflows/regression_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@ jobs:
$env:Path = "${{ github.workspace }}/rust/origen/target/debug;$env:Path"
- name: Display Python Version
run: python -c "import sys; print(sys.version)"
run: |
python -c "import sys; print(sys.version)"
pip --version
- name: Display Origen CLI Version
run: origen -v
Expand All @@ -138,23 +140,23 @@ jobs:
working-directory: test_apps/python_app
run: poetry --version

- name: Install importlib_metadata (Python 3.12)
run: pip install importlib_metadata

- name: Cache Poetry Version (Linux)
if: matrix.os == 'ubuntu-latest'
working-directory: test_apps/python_app
run: |
POETRY_VER=$(python -c "import importlib_metadata; print(importlib_metadata.version('poetry'))")
echo $POETRY_VER
echo "poetry_version=$POETRY_VER" >> $GITHUB_ENV
- name: Cache Poetry Version (Windows)
if: matrix.os == 'windows-latest'
working-directory: test_apps/python_app
run: |
$POETRY_VER = python -c "import importlib_metadata; print(importlib_metadata.version('poetry'))"
echo $POETRY_VER
echo "poetry_version=$POETRY_VER" >> $GITHUB_ENV
# - name: Install importlib_metadata (Python 3.12)
# run: pip install importlib_metadata

# - name: Cache Poetry Version (Linux)
# if: matrix.os == 'ubuntu-latest'
# working-directory: test_apps/python_app
# run: |
# POETRY_VER=$(python -c "import importlib_metadata; print(importlib_metadata.version('poetry'))")
# echo $POETRY_VER
# echo "poetry_version=$POETRY_VER" >> $GITHUB_ENV
# - name: Cache Poetry Version (Windows)
# if: matrix.os == 'windows-latest'
# working-directory: test_apps/python_app
# run: |
# $POETRY_VER = python -c "import importlib_metadata; print(importlib_metadata.version('poetry'))"
# echo $POETRY_VER
# echo "poetry_version=$POETRY_VER" >> $GITHUB_ENV

- name: Show Origen Binary Location (Linux)
if: matrix.os == 'ubuntu-latest'
Expand Down Expand Up @@ -323,12 +325,12 @@ jobs:
if: matrix.os == 'windows-latest'
run: where.exe origen

- name: Reinstall Poetry Version
run: |
echo ${{ env.poetry_version }}
poetry --version
pip install poetry==${{ env.poetry_version }}
poetry --version
# - name: Reinstall Poetry Version
# run: |
# echo ${{ env.poetry_version }}
# poetry --version
# pip install poetry==${{ env.poetry_version }}
# poetry --version

- name: Run User-Global Invocation Tests
working-directory: test_apps/no_workspace
Expand Down
6 changes: 3 additions & 3 deletions python/origen_metal/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ markers = [
script = "poetry_build.py"
generate-setup-file = false

[build-system]
requires = ["setuptools", "poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"
# [build-system]
# requires = ["setuptools", "poetry-core>=1.0.0"]
# build-backend = "poetry.core.masonry.api"

0 comments on commit ad5e173

Please sign in to comment.