Skip to content

Commit

Permalink
Renovations, 2025 (#50)
Browse files Browse the repository at this point in the history
* Correct license

* Upgrade some frontend dependencies

* CI: upgrade & uvify
  • Loading branch information
akx authored Jan 14, 2025
1 parent 549f239 commit 7e38bb6
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 37 deletions.
39 changes: 15 additions & 24 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,21 @@ name: CI
jobs:
Test-Python:
runs-on: ubuntu-latest
strategy:
matrix:
include:
- python-version: '3.11'
steps:
- uses: actions/checkout@v3
- name: 'Set up Python ${{ matrix.python-version }}'
uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: astral-sh/setup-uv@v5
with:
python-version: '${{ matrix.python-version }}'
cache: pip
- run: pip install -U pip
- run: pip install tox-gh-actions tox
python-version: 3.13
- run: uv pip install tox-gh-actions tox tox-uv
- run: tox
- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v5
Lint-Frontend:
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: 16
node-version: 22
cache: npm
cache-dependency-path: package.json
- run: npm i --ignore-scripts
Expand All @@ -43,24 +36,22 @@ jobs:
- Lint-Frontend
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: astral-sh/setup-uv@v5
with:
python-version: '3.11'
cache: pip
- uses: actions/setup-node@v3
python-version: 3.13
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 22
cache: npm
cache-dependency-path: package.json
- run: pip install build
- run: npm i --ignore-scripts
- run: npm start
env:
NODE_ENV: production
- run: python -m build .
- run: uv build .
- run: zipinfo dist/*.whl | grep static/infokala/infokala.js || exit 42
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: dist
path: dist
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,22 @@
"printWidth": 120
},
"devDependencies": {
"@babel/core": "^7.22.5",
"@babel/preset-env": "^7.22.5",
"babel-loader": "^9.1.2",
"copy-webpack-plugin": "^10.2.4",
"css-loader": "^6.8.1",
"@babel/core": "^7.26.0",
"@babel/preset-env": "^7.26.0",
"babel-loader": "^9.2.1",
"copy-webpack-plugin": "^12.0.2",
"css-loader": "^7.1.2",
"eslint": "^8.43.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-import": "^2.31.0",
"file-loader": "^6.2.0",
"prettier": "^2.8.8",
"style-loader": "^3.3.3",
"style-loader": "^4.0.0",
"stylus-loader": "^7.1.3",
"url-loader": "^4.1.1",
"webpack": "5.87.0",
"webpack-cli": "^5.1.4"
"webpack": "5.97.1",
"webpack-cli": "^6.0.1"
},
"dependencies": {
"bootstrap": "^3.3.7",
Expand All @@ -55,7 +55,7 @@
"knockout": "^3.4.2",
"linkifyjs": "^2.1.4",
"lodash": "^4.17.4",
"pug": "^3.0.2",
"pug": "^3.0.3",
"stylus": "^0.59.0"
}
}
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dynamic = ["version"]
requires-python = ">=3.9"
description = "Info log management system for Desucon and Tracon"
readme = "README.md"
license = ""
license = "MIT"
authors = [
{ name = "Santtu Pajukanta", email = "japsu@desucon.fi" },
]
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[tox]
isolated_build = True
envlist =
py311-django{41,42}
py313-django{41,42,50}

[gh-actions]
python =
3.11: py311
3.13: py313

[testenv]
commands = py.test -ra -vvv --cov
Expand All @@ -15,3 +15,4 @@ deps =
pytest-django
django41: Django~=4.1.0
django42: Django~=4.2.0
django50: Django~=5.0.0

0 comments on commit 7e38bb6

Please sign in to comment.