Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/code-static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Set up Python 3.8
- name: Set up Python 3.12
if: ${{ matrix.language == 'python' }}
uses: actions/setup-python@v5
with:
python-version: '3.8'
python-version: '3.12'
- name: Install dependencies
if: ${{ matrix.language == 'python' }}
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/predeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: '20'
- name: Set up Python 3.8
- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: '3.8'
python-version: '3.12'
- name: Run the website
run: ./tools/scripts/run_and_test_website.sh
- name: Update timestamps
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: '20'
- name: Set up Python 3.8
- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: '3.8'
python-version: '3.12'
- name: Run the website
run: ./tools/scripts/run_and_test_website.sh
- name: Remove node modules to avoid linting errors
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ sudo pip install virtualenv
2. Create an isolated Python environment, and install dependencies:

```
virtualenv --python python3.8 .venv
virtualenv --python python3.12 .venv
source .venv/bin/activate
pip install -r requirements.txt
```
Expand Down
2 changes: 1 addition & 1 deletion app.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
runtime: python38
runtime: python312
entrypoint: gunicorn -b :$PORT main:app
default_expiration: 3h

Expand Down
4 changes: 2 additions & 2 deletions tools/scripts/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ git pull

if [ "$(pgrep -if 'python main.py')" ]; then
echo "Killing existing server to run a fresh version"
pkill -9 python main.py
pkill -9 -if "python main.py"
fi

echo "Run and test website"
Expand All @@ -109,7 +109,7 @@ echo "Y" | gcloud app deploy --project httparchive

if [ "$(pgrep -if 'python main.py')" ]; then
echo "Killing server so backgrounded version isn't left there"
pkill -9 -f "python main.py"
pkill -9 -if "python main.py"
fi

echo
Expand Down
2 changes: 1 addition & 1 deletion tools/scripts/run_and_test_website.bat
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ rem # This script installs all the required dependencies needed to run the
rem # HTTP Archive website providing you have python and node installed.
rem #
rem # It 's a simplified version of run_and_test_website.sh for windows users
rem # It depends on Python 3.8, pip and nodejs 12 being installed already
rem # It depends on Python 3.12, pip and nodejs 20 being installed already
rem #

echo "Kill any existing instances of the webserver"
Expand Down
4 changes: 2 additions & 2 deletions tools/scripts/run_and_test_website.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ fi

if [ "$(pgrep -if 'python main.py')" ]; then
echo "Killing existing server to run a fresh version"
pkill -9 -f "python main.py"
pkill -9 -if "python main.py"
fi

echo "Installing and testing python environment"
Expand Down Expand Up @@ -87,7 +87,7 @@ if [ "${debug}" == "1" ]; then

if [ "$(pgrep -if 'python main.py')" ]; then
echo "Killing server to run a fresh version in debug mode"
pkill -9 -f "python main.py"
pkill -9 -if "python main.py"
fi

echo "Starting website in foreground mode so it reloads on file changes"
Expand Down