From ca5e57afb55a1f8d7e24e67f89dfad7a9110e252 Mon Sep 17 00:00:00 2001 From: Trevor Austin Date: Fri, 6 Dec 2024 19:35:56 -0600 Subject: [PATCH 1/4] Uncomment our CI config --- .github/workflows/python-app.yml | 68 ++++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index fac1c0c..63f4da4 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -1,34 +1,34 @@ -# This workflow will install Python dependencies, run tests and lint with a single version of Python -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python -# name: Python application -# on: -# push: -# branches: [ "main" ] -# pull_request: -# branches: [ "main" ] -# permissions: -# contents: read -# jobs: -# build: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v3 -# - name: Set up Python 3.10 -# uses: actions/setup-python@v3 -# with: -# python-version: "3.10" -# - name: Install dependencies -# run: | -# python -m pip install --upgrade pip -# cd examples/week_9/passwords_with_tests -# pip install flake8 pytest -# if [ -f requirements.txt ]; then pip install -r requirements.txt; fi -# - name: Lint with flake8 -# run: | -# # stop the build if there are Python syntax errors or undefined names -# flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics -# # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide -# flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics -# - name: Test with pytest -# run: | -# pytest +This workflow will install Python dependencies, run tests and lint with a single version of Python +For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python +name: Python application +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] +permissions: + contents: read +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up Python 3.10 + uses: actions/setup-python@v3 + with: + python-version: "3.10" + - name: Install dependencies + run: | + python -m pip install --upgrade pip + cd examples/week_9/passwords_with_tests + pip install flake8 pytest + if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + - name: Lint with flake8 + run: | + # stop the build if there are Python syntax errors or undefined names + flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics + # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide + flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics + - name: Test with pytest + run: | + pytest From 24b3110b1f0aa7eb7d14d50f14d27b652ebea7ab Mon Sep 17 00:00:00 2001 From: Trevor Austin Date: Fri, 6 Dec 2024 19:38:16 -0600 Subject: [PATCH 2/4] Fix comments --- .github/workflows/python-app.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 63f4da4..ee78a89 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -1,5 +1,5 @@ -This workflow will install Python dependencies, run tests and lint with a single version of Python -For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python +# This workflow will install Python dependencies, run tests and lint with a single version of Python +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python name: Python application on: push: From c1fea648e10a35bdca35b5c1b11c0d3246339913 Mon Sep 17 00:00:00 2001 From: Trevor Austin Date: Fri, 6 Dec 2024 19:41:19 -0600 Subject: [PATCH 3/4] Stop linting in CI --- .github/workflows/python-app.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index ee78a89..caf450b 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -26,9 +26,9 @@ jobs: - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names - flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics + # flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide - flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics + # flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - name: Test with pytest run: | pytest From e7a6a77835a88173fbfce9a9bf7a6c4f5fbd5d55 Mon Sep 17 00:00:00 2001 From: Trevor Austin Date: Fri, 6 Dec 2024 19:43:39 -0600 Subject: [PATCH 4/4] no bugs fr --- examples/week_9/passwords_with_tests/passwords/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/week_9/passwords_with_tests/passwords/__init__.py b/examples/week_9/passwords_with_tests/passwords/__init__.py index aed0166..a6a689e 100644 --- a/examples/week_9/passwords_with_tests/passwords/__init__.py +++ b/examples/week_9/passwords_with_tests/passwords/__init__.py @@ -40,7 +40,7 @@ def signup(): body = request.get_json() username = body['username'] password = body['password'] + \ - app.config['PEPPER'] # + "Deliberately Broken" + app.config['PEPPER'] + "Deliberately Broken" salt = bcrypt.gensalt() hashed = bcrypt.hashpw(password.encode('utf-8'), salt) connection = db.get_db()