Skip to content

Commit

Permalink
Merge pull request #794 from djlint/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherpickering committed Dec 20, 2023
2 parents 2761307 + 96842ed commit fc446ff
Show file tree
Hide file tree
Showing 17 changed files with 1,984 additions and 2,596 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cancel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.11.0
uses: styfle/cancel-workflow-action@0.12.0
with:
access_token: ${{ github.token }}
workflow_id: test.yml
2 changes: 1 addition & 1 deletion .github/workflows/demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
uses: actions/checkout@v4

- name: setup python 3.11
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linkcheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.x

Expand All @@ -16,6 +16,6 @@ jobs:
npm install
npm run build
- uses: untitaker/hyperlink@0.1.31
- uses: untitaker/hyperlink@0.1.32
with:
args: docs/_site/
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
uses: actions/checkout@v4

- name: setup python 3.11
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: snok/install-poetry@v1

- name: ⎔ Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18

Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
persist-credentials: false

- name: ⎔ Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18

Expand All @@ -38,14 +38,14 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
fail-fast: true

steps:
- name: checkout
uses: actions/checkout@v4
- name: setup python ${{ matrix.python-version }} on ${{ matrix.os }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: setup poetry
Expand All @@ -69,14 +69,14 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
fail-fast: true
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: jirutka/setup-alpine@v1
- name: setup python ${{ matrix.python-version }} on ${{ matrix.os }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: setup poetry
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
# remove windows-latest, half tests seem to randomly pass
matrix:
os: [ubuntu-latest, windows-latest]
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
node: [18, 19]
fail-fast: true

Expand All @@ -120,11 +120,11 @@ jobs:
- name: checkout
uses: actions/checkout@v4
- name: setup python ${{ matrix.python-version }} on ${{ matrix.os }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: setup node ${{ matrix.node }} on ${{ matrix.os }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}

Expand Down
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exclude: >
)
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -22,22 +22,22 @@ repos:
- --remove-duplicate-keys
- --remove-unused-variables
- repo: https://github.com/asottile/pyupgrade
rev: v3.11.0
rev: v3.15.0
hooks:
- id: pyupgrade
args: [--py36-plus]
- repo: https://github.com/PyCQA/isort
rev: 5.12.0
rev: 5.13.2
hooks:
- id: isort
exclude: docs*
additional_dependencies: [toml]
- repo: https://github.com/psf/black
rev: 23.9.1
rev: 23.12.0
hooks:
- id: black
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
rev: v2.10.0
rev: v2.11.0
hooks:
- id: pretty-format-ini
args: [--autofix]
Expand Down
22 changes: 11 additions & 11 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "djlint_docs",
"version": "1.0.82",
"version": "1.0.84",
"description": "",
"main": "index.js",
"scripts": {
Expand All @@ -24,18 +24,18 @@
"animate-sass": "^0.8.2",
"animate.css": "github:animate-css/animate.css",
"codemirror": "^6.0.1",
"eleventy-critical-css": "^1.1.0",
"eleventy-critical-css": "^2.0.2",
"eleventy-plugin-i18n": "^0.1.3",
"eleventy-plugin-rev": "^1.1.1",
"eleventy-plugin-rev": "^2.0.0",
"eleventy-sass": "^2.2.1",
"md5": "^2.3.0",
"rollup": "^3.20.2"
"rollup": "^4.8.0"
},
"devDependencies": {
"@11ty/eleventy": "2.0.1",
"@11ty/eleventy-img": "3.1.0",
"@11ty/eleventy-img": "^3.1.8",
"@11ty/eleventy-plugin-syntaxhighlight": "5.0.0",
"@fontsource/inter": "5.0.8",
"@fontsource/inter": "^5.0.16",
"@fortawesome/fontawesome-free": "^6.4.0",
"@fullhuman/postcss-purgecss": "5.0.0",
"@toycode/markdown-it-class": "1.2.4",
Expand All @@ -46,21 +46,21 @@
"cssnano": "^6.0.0",
"cz-conventional-changelog": "3.3.0",
"eleventy-plugin-edit-on-github": "1.1.0",
"eleventy-plugin-metagen": "1.7.11",
"eleventy-plugin-metagen": "^1.8.3",
"esbuild": "^0.19.0",
"eslint": "^8.36.0",
"eslint-config-airbnb-base": "15.0.0",
"eslint-plugin-import": "2.28.1",
"eslint-plugin-import": "^2.29.0",
"fontawesome-subset": "4.4.0",
"html-minifier": "4.0.0",
"markdown-it": "13.0.1",
"markdown-it": "^14.0.0",
"markdown-it-anchor": "8.6.7",
"markdown-it-div": "1.1.0",
"markdown-it-imsize": "2.0.1",
"outdent": "0.8.0",
"postcss-cli": "10.1.0",
"postcss-cli": "^11.0.0",
"postcss-nested": "6.0.1",
"prettier": "^3.0.0",
"prettier": "^3.1.1",
"prismjs": "1.29.0",
"sass": "^1.60.0",
"slugify": "^1.6.6"
Expand Down
Loading

0 comments on commit fc446ff

Please sign in to comment.