From 1a8776f5f5ad64e9a1186d3bcd97ab42a5454edb Mon Sep 17 00:00:00 2001 From: Joe Flack Date: Tue, 21 Nov 2023 20:35:30 -0500 Subject: [PATCH] Temp --- .github/workflows/bugfix-temp.yml | 34 +++++++++++++++++++++++-------- requirements-unlocked.txt | 3 +++ requirements.txt | 2 +- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/.github/workflows/bugfix-temp.yml b/.github/workflows/bugfix-temp.yml index 1ab980434..0e4c97173 100644 --- a/.github/workflows/bugfix-temp.yml +++ b/.github/workflows/bugfix-temp.yml @@ -4,6 +4,7 @@ on: workflow_dispatch: jobs: refresh-db: +# TODO: Try # runs-on: ubuntu-18.04 # runs-on: ubuntu-latest # not sure which is more current when resolving merge conflicts runs-on: macos-latest @@ -13,23 +14,38 @@ jobs: - name: Set up Python version uses: actions/setup-python@v2 with: + # todo: macOS(fail) local-mac-3.10.4(pass!) +# python-version: '3.10' + # todo: macOS(fail) ubuntu(n/a) python-version: '3.9.7' # Not sure why 3.9.7 here and 3.9 elsewhere. the .7 works on mac, but not on ubuntu + # todo: macOS(?) ubuntu(fail) +# python-version: '3.9' # resolves to: 3.9.18 - name: Create and start virtual environment run: | python3 -m venv venv source venv/bin/activate -# - name: Install dependencies -# run: | -# python -m pip install --upgrade pip -# pip install --upgrade wheel -# pip install --upgrade setuptools -# pip install -r requirements.txt - - - name: Install + # TODO: Try this with PyCG==0.0.6 + - name: Install dependencies run: | python -m pip install --upgrade pip pip install --upgrade wheel pip install --upgrade setuptools - pip install PyCG==0.0.7 + pip install -r requirements.txt + + # TODO: try variations of below + # todo: fail on various os/python versions +# - name: Install +# run: | +# python -m pip install --upgrade pip +# pip install --upgrade wheel +# pip install --upgrade setuptools +# pip install PyCG==0.0.7 + # todo: pass! (ubuntu 3.9) +# - name: Install +# run: | +# python -m pip install --upgrade pip +# pip install --upgrade wheel +# pip install --upgrade setuptools +# pip install PyCG==0.0.6 diff --git a/requirements-unlocked.txt b/requirements-unlocked.txt index bbe84c98e..c4221cf23 100755 --- a/requirements-unlocked.txt +++ b/requirements-unlocked.txt @@ -20,6 +20,9 @@ uvicorn[standard] psycopg2-binary networkx +# Fixes a bug +PyCG==0.0.6 + # dev dependencies virtualenvwrapper diff --git a/requirements.txt b/requirements.txt index d6fb74532..319e2722b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -125,7 +125,7 @@ py==1.11.0 pyarrow==9.0.0 pyasn1==0.4.8 pyasn1-modules==0.2.8 -PyCG==0.0.7 +PyCG==0.0.6 pycparser==2.21 pydantic==1.10.8 Pygments==2.14.0