Skip to content

Commit

Permalink
Merge pull request #889 from djlint/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
monosans authored Aug 29, 2024
2 parents da6d9fe + 036f241 commit dd0790f
Show file tree
Hide file tree
Showing 207 changed files with 5,623 additions and 15,254 deletions.
12 changes: 4 additions & 8 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
[run]
source = src/djlint
branch = True

[report]
show_missing = True
skip_covered = True
omit =
*/test*
exclude_lines = ^\s*@(?:abc\.)?abstractmethod$

[run]
plugins = covdefaults
21 changes: 0 additions & 21 deletions .editorconfig

This file was deleted.

8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
blank_issues_enabled: false
contact_links:
- name: 💬 Discord Server
url: https://discord.gg/taghAqebzU
about: |
Chat with the community, ask questions and learn about best practices.
- name: 💬 Discord Server
url: https://discord.gg/taghAqebzU
about: |
Chat with the community, ask questions and learn about best practices.
15 changes: 9 additions & 6 deletions .github/ISSUE_TEMPLATE/formatter_but_report.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
name: "\U0001F9A0 Formatter Bug Report"
about: You've found a bug?
title: "[BUG] [Formatter]"
labels: [":microbe: bug", ":sponge: formatter"]
title: '[BUG] [Formatter]'
labels: [':microbe: bug', ':sponge: formatter']
---

<!--
Expand All @@ -16,15 +16,18 @@ labels: [":microbe: bug", ":sponge: formatter"]
- [ ] I've read the [docs](https://djlint.com)

## System Info
- OS: e.g. ubuntu 20.04
- Python Version (``python --version``)
- djLint Version (``djlint --version``)
- template language: e.g. mustache

- OS: e.g. ubuntu 20.04
- Python Version (`python --version`)
- djLint Version (`djlint --version`)
- template language: e.g. mustache

## Issue

<!-- A clear and concise description of what the bug is. -->

## How To Reproduce

<!-- Steps to reproduce the behavior -->

<!-- Thanks! 🤠 -->
15 changes: 9 additions & 6 deletions .github/ISSUE_TEMPLATE/linter_bug_report.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
name: "\U0001F9A0 Linter Bug Report"
about: You've found a bug?
title: "[BUG] [Linter]"
labels: [":microbe: bug", ":mag: linter"]
title: '[BUG] [Linter]'
labels: [':microbe: bug', ':mag: linter']
---

<!--
Expand All @@ -16,19 +16,22 @@ labels: [":microbe: bug", ":mag: linter"]
- [ ] I've read the [docs](https://djlint.com)

## System Info
- OS: e.g. ubuntu 20.04
- Python Version (``python --version``)
- djLint Version (``djlint --version``)
- template language: e.g. mustache

- OS: e.g. ubuntu 20.04
- Python Version (`python --version`)
- djLint Version (`djlint --version`)
- template language: e.g. mustache

## Issue

<!-- A clear and concise description of what the bug is. -->

## How To Reproduce

<!-- Steps to reproduce the behavior -->

## Contents of .djlintrc/pyproject.toml [tool.djlint]

<!-- please include your config -->

<!-- Thanks! 🤠 -->
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/translation.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
name: "\U0001F310 Translation Issue"
about: You've found a translation issue?
title: "[Translation]"
labels: ":globe_with_meridians: translation"
title: '[Translation]'
labels: ':globe_with_meridians: translation'
---

<!--
Expand Down
4 changes: 0 additions & 4 deletions .github/config.yml

This file was deleted.

31 changes: 22 additions & 9 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,31 @@ updates:
directory: /
schedule:
interval: daily
time: "00:30"
time: '00:30'
target-branch: dev
- package-ecosystem: pip
directory: /
schedule:
interval: daily
time: "00:30"
time: '00:30'
target-branch: dev
# groups:
# pip-semver-minor:
# patterns:
# - "*"
# update-types:
# - minor
# - patch
groups:
pip-semver-minor:
patterns:
- '*'
update-types:
- minor
- patch
- package-ecosystem: npm
directory: /
schedule:
interval: daily
time: '00:30'
target-branch: dev
groups:
npm-semver-minor:
patterns:
- '*'
update-types:
- minor
- patch
2 changes: 0 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


# Pull Request Check List

Resolves: #issue-number-here
Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Auto-merge updates
on: pull_request
permissions:
contents: write
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}
cancel-in-progress: true
jobs:
auto-merge-dependabot:
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'djlint' && github.actor == 'dependabot[bot]' }}
steps:
- id: dependabot-metadata
uses: dependabot/fetch-metadata@v2
- if: ${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' }}
run: gh pr merge --auto --delete-branch --squash "${PR_URL}"
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
auto-merge-updates:
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'djlint' && github.actor_id == '158576507' }}
steps:
- run: gh pr merge --auto --delete-branch --squash "${PR_URL}"
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17 changes: 0 additions & 17 deletions .github/workflows/cancel.yml

This file was deleted.

45 changes: 45 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: CI
on:
push:
branches:
- master
pull_request:
workflow_dispatch:
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs:
linkcheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: npm install
working-directory: docs
- run: npm run build
working-directory: docs
- uses: untitaker/[email protected]
with:
args: docs/_site/
run-pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: pipx run pre-commit run --all-files
run-pytest:
runs-on: ubuntu-latest
strategy:
matrix:
python-version:
- '3.8'
- 3.x
fail-fast: false
steps:
- uses: actions/checkout@v4
- run: pipx install poetry
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: poetry
check-latest: true
- run: poetry install --sync --no-interaction
- run: poetry run --no-interaction pytest
Loading

0 comments on commit dd0790f

Please sign in to comment.