Skip to content

Commit

Permalink
Upgrade minor dependencies (#3684)
Browse files Browse the repository at this point in the history
- Use `.python-version` and `.nvmrc` in CI script, single source of
truth
- Update version of python and node. 
- Update version of alpinejs, htmx and other build js
- Update minor versions of python dependencies
  • Loading branch information
theskumar authored Dec 10, 2023
1 parent d0f57dd commit 1015df8
Show file tree
Hide file tree
Showing 12 changed files with 661 additions and 625 deletions.
29 changes: 12 additions & 17 deletions .github/workflows/hypha-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,14 @@ concurrency:
group: ${{ github.head_ref || github.run_id }}
cancel-in-progress: true

env:
NODE_VERSION: 18
PYTHON_VERSION: "3.11"

jobs:
build-fe:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
node-version-file: ".nvmrc"
cache: "npm"
- name: install node dependencies
run: npm install --quiet
Expand All @@ -39,7 +35,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: ${{ env.PYTHON_VERSION }}
python-version-file: ".python-version"
cache: "pip"
cache-dependency-path: "**/requirements*.txt"
- name: install python dependencies
Expand All @@ -53,10 +49,10 @@ jobs:
lint-fe:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
node-version-file: ".nvmrc"
cache: "npm"
- name: install node dependencies
run: npm install --quiet
Expand All @@ -66,10 +62,10 @@ jobs:
lint-be:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: ${{ env.PYTHON_VERSION }}
python-version-file: ".python-version"
- name: Install python dependencies
run: pip install `grep -E "ruff|djhtml|black" requirements-dev.txt`
- name: Run ruff
Expand Down Expand Up @@ -99,10 +95,10 @@ jobs:
matrix:
group: [1, 2, 3]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: ${{ env.PYTHON_VERSION }}
python-version-file: ".python-version"
cache: "pip"
cache-dependency-path: "**/requirements*.txt"
- uses: codecov/codecov-action@v3
Expand All @@ -111,8 +107,7 @@ jobs:
python3 -m venv venv
source venv/bin/activate
mkdir hypha/static_compiled
pip install --upgrade pip
pip install wheel
pip install --upgrade pip wheel
pip install -r requirements-dev.txt
- name: Run django checks
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.14.2
v20.10.0
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.1
rev: v0.1.7
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
- repo: https://github.com/psf/black
rev: 23.10.0
rev: 23.11.0
hooks:
- id: black
# It is recommended to specify the latest version of Python
Expand All @@ -19,6 +19,6 @@ repos:
- id: djhtml
files: .*/templates/.*\.html$
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.3 # Use the sha or tag you want to point at
rev: v3.1.0
hooks:
- id: prettier
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.11.1
3.11.7
22 changes: 14 additions & 8 deletions hypha/static_src/src/javascript/apply/vendor/alpine-focus.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions hypha/static_src/src/javascript/apply/vendor/alpine.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion hypha/static_src/src/javascript/apply/vendor/htmx.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 1015df8

Please sign in to comment.