From 5989a813a7c2b33572a5360e3730f4e6fbad4279 Mon Sep 17 00:00:00 2001 From: Himanshu Ranka Date: Mon, 22 May 2023 11:23:31 -0400 Subject: [PATCH 01/16] changed python version from 3.8 to 3.9 --- .github/workflows/push-csv-to-repo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-csv-to-repo.yml b/.github/workflows/push-csv-to-repo.yml index a937ed93..d88f2dd1 100644 --- a/.github/workflows/push-csv-to-repo.yml +++ b/.github/workflows/push-csv-to-repo.yml @@ -17,7 +17,7 @@ jobs: - name: Setup python uses: actions/setup-python@v4 with: - python-version: '3.8.3' # Version range or exact version of a Python version to use, using SemVer's version range syntax + python-version: '3.9' # Version range or exact version of a Python version to use, using SemVer's version range syntax architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified - name: Install packages From 02a34424b0a8a222f4599e33181f2c01675e8150 Mon Sep 17 00:00:00 2001 From: Himanshu Ranka Date: Mon, 22 May 2023 11:33:54 -0400 Subject: [PATCH 02/16] Update push-csv-to-repo.yml --- .github/workflows/push-csv-to-repo.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/push-csv-to-repo.yml b/.github/workflows/push-csv-to-repo.yml index d88f2dd1..c453e7a8 100644 --- a/.github/workflows/push-csv-to-repo.yml +++ b/.github/workflows/push-csv-to-repo.yml @@ -16,14 +16,19 @@ jobs: - name: Setup python uses: actions/setup-python@v4 - with: - python-version: '3.9' # Version range or exact version of a Python version to use, using SemVer's version range syntax + with: + python-version: '3.9' #install the python needed architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified - - - name: Install packages - uses: BSFishy/pip-action@v1 - with: - requirements: iit-backend/requirements.txt + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + +# - name: Install packages +# uses: BSFishy/pip-action@v1 +# with: +# requirements: iit-backend/requirements.txt - name: Create CSV locally # run estimate_csv_creator.py to get CSV run: python3 $GITHUB_WORKSPACE/iit-backend/app/github_public_repo/estimate_csv_creator.py From 29932e95fbce635da8dfbde7dfab734090ffa983 Mon Sep 17 00:00:00 2001 From: Himanshu Ranka Date: Mon, 22 May 2023 11:35:56 -0400 Subject: [PATCH 03/16] Update push-csv-to-repo.yml --- .github/workflows/push-csv-to-repo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-csv-to-repo.yml b/.github/workflows/push-csv-to-repo.yml index c453e7a8..0627bc2d 100644 --- a/.github/workflows/push-csv-to-repo.yml +++ b/.github/workflows/push-csv-to-repo.yml @@ -23,7 +23,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + pip install -r iit-backend/requirements.txt # - name: Install packages # uses: BSFishy/pip-action@v1 From 0f07d79b020e9dc4cd6d9c733bb566b32e5ed5ec Mon Sep 17 00:00:00 2001 From: Himanshu Ranka Date: Mon, 22 May 2023 11:41:16 -0400 Subject: [PATCH 04/16] Update push-csv-to-repo.yml --- .github/workflows/push-csv-to-repo.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/push-csv-to-repo.yml b/.github/workflows/push-csv-to-repo.yml index 0627bc2d..d70bcde6 100644 --- a/.github/workflows/push-csv-to-repo.yml +++ b/.github/workflows/push-csv-to-repo.yml @@ -23,7 +23,9 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip + pip install git+https://github.com/stan-dev/pystan2.git@master pip install -r iit-backend/requirements.txt + # - name: Install packages # uses: BSFishy/pip-action@v1 From e9644e9097a7b37beba09627ab023b0406739ca3 Mon Sep 17 00:00:00 2001 From: Himanshu Ranka Date: Mon, 22 May 2023 11:47:49 -0400 Subject: [PATCH 05/16] Update push-csv-to-repo.yml --- .github/workflows/push-csv-to-repo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-csv-to-repo.yml b/.github/workflows/push-csv-to-repo.yml index d70bcde6..ff335db8 100644 --- a/.github/workflows/push-csv-to-repo.yml +++ b/.github/workflows/push-csv-to-repo.yml @@ -23,8 +23,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install git+https://github.com/stan-dev/pystan2.git@master pip install -r iit-backend/requirements.txt + pip install git+https://github.com/stan-dev/pystan2.git@master # - name: Install packages From 42331e9eb882df70b39ebc9aa0b19b0c2e5e3baf Mon Sep 17 00:00:00 2001 From: Himanshu Ranka Date: Mon, 22 May 2023 11:48:21 -0400 Subject: [PATCH 06/16] Update requirements.txt --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2fdfbbb6..42548bc7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -135,7 +135,6 @@ pyparsing==3.0.9 pyproj==3.4.1 pyrsistent==0.19.3 pyshp==2.3.1 -pystan==2.19.1.1 pytest==7.2.1 python-certifi-win32==1.6.1 python-dateutil==2.8.2 From 12bfda513b5d4a88ae8a2a761ce0c70841a5b847 Mon Sep 17 00:00:00 2001 From: Himanshu Ranka Date: Mon, 22 May 2023 12:03:35 -0400 Subject: [PATCH 07/16] Update push-csv-to-repo.yml --- .github/workflows/push-csv-to-repo.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/push-csv-to-repo.yml b/.github/workflows/push-csv-to-repo.yml index ff335db8..fa7a55fa 100644 --- a/.github/workflows/push-csv-to-repo.yml +++ b/.github/workflows/push-csv-to-repo.yml @@ -23,6 +23,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip + pip install arcgis==1.3.0 pip install -r iit-backend/requirements.txt pip install git+https://github.com/stan-dev/pystan2.git@master From 24c21775604178f9bc053bc997b379bb9b552c3b Mon Sep 17 00:00:00 2001 From: Himanshu Ranka Date: Mon, 22 May 2023 12:03:58 -0400 Subject: [PATCH 08/16] Update requirements.txt --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 42548bc7..b646b8d8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,6 @@ alembic==1.9.2 aniso8601==9.0.1 anyio==3.6.2 appnope==0.1.3 -arcgis==1.3.0 argon2-cffi==21.3.0 argon2-cffi-bindings==21.2.0 arrow==1.2.3 From c2c5926dafce3ab276604c23020e2de2bbed5002 Mon Sep 17 00:00:00 2001 From: Himanshu Ranka Date: Mon, 22 May 2023 12:27:12 -0400 Subject: [PATCH 09/16] Update push-csv-to-repo.yml --- .github/workflows/push-csv-to-repo.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push-csv-to-repo.yml b/.github/workflows/push-csv-to-repo.yml index fa7a55fa..af63e6ea 100644 --- a/.github/workflows/push-csv-to-repo.yml +++ b/.github/workflows/push-csv-to-repo.yml @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout iit-backend uses: actions/checkout@v2 @@ -17,8 +17,7 @@ jobs: - name: Setup python uses: actions/setup-python@v4 with: - python-version: '3.9' #install the python needed - architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified + python-version: '3.8.3' #install the python needed - name: Install dependencies run: | From 6c777943b58677a1d1bb40819b7ef15bdbca8e2a Mon Sep 17 00:00:00 2001 From: Himanshu Ranka Date: Mon, 22 May 2023 12:30:17 -0400 Subject: [PATCH 10/16] Update push-csv-to-repo.yml --- .github/workflows/push-csv-to-repo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-csv-to-repo.yml b/.github/workflows/push-csv-to-repo.yml index af63e6ea..8bd07328 100644 --- a/.github/workflows/push-csv-to-repo.yml +++ b/.github/workflows/push-csv-to-repo.yml @@ -17,7 +17,7 @@ jobs: - name: Setup python uses: actions/setup-python@v4 with: - python-version: '3.8.3' #install the python needed + python-version: '3.8' #install the python needed - name: Install dependencies run: | From aff4277e5137672ec925fc2da7ae9a9d26ef0a00 Mon Sep 17 00:00:00 2001 From: Himanshu Ranka Date: Tue, 23 May 2023 13:50:05 -0400 Subject: [PATCH 11/16] Update push-csv-to-repo.yml --- .github/workflows/push-csv-to-repo.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/push-csv-to-repo.yml b/.github/workflows/push-csv-to-repo.yml index 8bd07328..feb764e3 100644 --- a/.github/workflows/push-csv-to-repo.yml +++ b/.github/workflows/push-csv-to-repo.yml @@ -19,6 +19,32 @@ jobs: with: python-version: '3.8' #install the python needed + - name: Python Pre-VENV Check + shell: bash + run: | + pwd + echo $PATH + which $PYTHON + $PYTHON --version + $PYTHON -m pip --version + + - name: Create VEnv + shell: bash + if: inputs.with-venv == 'true' + run: | + $PYTHON -m pip install virtualenv + virtualenv $HOME/.pcsv + echo "$HOME/.pcsv/bin" >> $GITHUB_PATH + + - name: Python Post-VENV Check + shell: bash + run: | + pwd + echo $PATH + which $PYTHON + $PYTHON --version + $PYTHON -m pip --version + - name: Install dependencies run: | python -m pip install --upgrade pip From 37afd2ea53e937f317df739a8063c81c77f0fcc4 Mon Sep 17 00:00:00 2001 From: Himanshu Ranka Date: Tue, 23 May 2023 13:52:13 -0400 Subject: [PATCH 12/16] Update push-csv-to-repo.yml --- .github/workflows/push-csv-to-repo.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/push-csv-to-repo.yml b/.github/workflows/push-csv-to-repo.yml index feb764e3..04b17818 100644 --- a/.github/workflows/push-csv-to-repo.yml +++ b/.github/workflows/push-csv-to-repo.yml @@ -24,9 +24,6 @@ jobs: run: | pwd echo $PATH - which $PYTHON - $PYTHON --version - $PYTHON -m pip --version - name: Create VEnv shell: bash @@ -41,9 +38,6 @@ jobs: run: | pwd echo $PATH - which $PYTHON - $PYTHON --version - $PYTHON -m pip --version - name: Install dependencies run: | From 9468786986cec57387f7951cbe3e21e0a463e0e2 Mon Sep 17 00:00:00 2001 From: Himanshu Ranka Date: Tue, 23 May 2023 13:54:16 -0400 Subject: [PATCH 13/16] Update push-csv-to-repo.yml --- .github/workflows/push-csv-to-repo.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/push-csv-to-repo.yml b/.github/workflows/push-csv-to-repo.yml index 04b17818..32aa3a1e 100644 --- a/.github/workflows/push-csv-to-repo.yml +++ b/.github/workflows/push-csv-to-repo.yml @@ -27,7 +27,6 @@ jobs: - name: Create VEnv shell: bash - if: inputs.with-venv == 'true' run: | $PYTHON -m pip install virtualenv virtualenv $HOME/.pcsv From b853b86e057d3c2f5a229b66b49fb294101ca6c3 Mon Sep 17 00:00:00 2001 From: Himanshu Ranka Date: Tue, 23 May 2023 13:58:03 -0400 Subject: [PATCH 14/16] Update push-csv-to-repo.yml --- .github/workflows/push-csv-to-repo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-csv-to-repo.yml b/.github/workflows/push-csv-to-repo.yml index 32aa3a1e..f6d1ff01 100644 --- a/.github/workflows/push-csv-to-repo.yml +++ b/.github/workflows/push-csv-to-repo.yml @@ -28,7 +28,7 @@ jobs: - name: Create VEnv shell: bash run: | - $PYTHON -m pip install virtualenv + python -m pip install virtualenv virtualenv $HOME/.pcsv echo "$HOME/.pcsv/bin" >> $GITHUB_PATH From 027350c8e586d6a68171e52184fe831ebfad757d Mon Sep 17 00:00:00 2001 From: Himanshu Ranka Date: Tue, 23 May 2023 14:03:00 -0400 Subject: [PATCH 15/16] Update push-csv-to-repo.yml --- .github/workflows/push-csv-to-repo.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/push-csv-to-repo.yml b/.github/workflows/push-csv-to-repo.yml index f6d1ff01..516bd575 100644 --- a/.github/workflows/push-csv-to-repo.yml +++ b/.github/workflows/push-csv-to-repo.yml @@ -37,10 +37,13 @@ jobs: run: | pwd echo $PATH + echo $PYTHONPATH - name: Install dependencies run: | python -m pip install --upgrade pip + export PYTHONPATH="build/bdist.linux-x86_64/wheel/:$PYTHONPATH" + echo $PYTHONPATH pip install arcgis==1.3.0 pip install -r iit-backend/requirements.txt pip install git+https://github.com/stan-dev/pystan2.git@master From 94dbd751414ae3389a43db07d37010204499ac45 Mon Sep 17 00:00:00 2001 From: Himanshu Ranka Date: Tue, 23 May 2023 14:48:05 -0400 Subject: [PATCH 16/16] Update push-csv-to-repo.yml --- .github/workflows/push-csv-to-repo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-csv-to-repo.yml b/.github/workflows/push-csv-to-repo.yml index 516bd575..206fa47a 100644 --- a/.github/workflows/push-csv-to-repo.yml +++ b/.github/workflows/push-csv-to-repo.yml @@ -44,7 +44,7 @@ jobs: python -m pip install --upgrade pip export PYTHONPATH="build/bdist.linux-x86_64/wheel/:$PYTHONPATH" echo $PYTHONPATH - pip install arcgis==1.3.0 + pip install arcgis pip install -r iit-backend/requirements.txt pip install git+https://github.com/stan-dev/pystan2.git@master