Skip to content

Commit

Permalink
chore: Bump dep reqs
Browse files Browse the repository at this point in the history
  • Loading branch information
adinhodovic committed Mar 5, 2024
1 parent 4b07181 commit 7fc7897
Show file tree
Hide file tree
Showing 14 changed files with 1,068 additions and 905 deletions.
40 changes: 15 additions & 25 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
---
name: CI/CD

on: # yamllint disable-line rule:truthy
on: # yamllint disable-line rule:truthy
pull_request:
branches: [ "master", "main" ]
branches: ["master", "main"]
push:
branches: [ "master", "main" ]
branches: ["master", "main"]
release:
types: [published]

Expand All @@ -14,12 +13,12 @@ jobs:
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@v1
- uses: actions/checkout@v4

- name: Set up Python 3.9
uses: actions/setup-python@v1
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: "3.11"

- name: Install dependencies
run: |
Expand All @@ -40,14 +39,14 @@ jobs:
strategy:
max-parallel: 3
matrix:
python-version: [3.9]
dj-version: [django40]
python-version: ["3.11"]
dj-version: [django50]
steps:

- uses: actions/checkout@v1
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -61,15 +60,6 @@ jobs:
PY_VERSION=${{ matrix.python-version }} &&
tox -e py${PY_VERSION//.}-${{ matrix.dj-version }}
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml
flags: unittests
name: ${{ matrix.python-version }}-${{ matrix.dj-version }}
yml: ./codecov.yml

release:
name: Release
runs-on: ubuntu-latest
Expand All @@ -79,12 +69,12 @@ jobs:
- lint
- test
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4

- name: Set up Python 3.9
uses: actions/setup-python@v1
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: "3.11"

- name: Use Node.js 16
uses: actions/setup-node@v3
Expand Down
40 changes: 0 additions & 40 deletions .pylintrc

This file was deleted.

6 changes: 0 additions & 6 deletions MANIFEST.in

This file was deleted.

2 changes: 1 addition & 1 deletion manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import sys

if __name__ == "__main__":
os.environ["DJANGO_SETTINGS_MODULE"] = "tests.settings.local"
os.environ["DJANGO_SETTINGS_MODULE"] = "tests.settings"
from django.core.management import execute_from_command_line

execute_from_command_line(sys.argv)
10 changes: 0 additions & 10 deletions mypy.ini

This file was deleted.

1,688 changes: 935 additions & 753 deletions poetry.lock

Large diffs are not rendered by default.

111 changes: 80 additions & 31 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[build-system]
requires = ["poetry-core>=1.0.0"]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "wagtail-code-blog"
version = "0.5.3"
version = "0.5.4"
license = "MIT"
description = "A wagtail code blog"
authors = ["Dani Hodovic <[email protected]>"]
Expand All @@ -13,56 +13,61 @@ homepage = "https://github.com/honeylogic-io/wagtail-code-blog"
repository = "https://github.com/honeylogic-io/wagtail-code-blog"
documentation = "https://github.com/honeylogic-io/wagtail-code-blog"
include = ["wagtail_code_blog/static/wagtail_code_blog/output.css"]
keywords = [
"wagtail",
"django",
"blog",
"cms"
]
keywords = ["wagtail", "django", "blog", "cms"]

classifiers = [
"Development Status :: 5 - Production/Stable",
"Environment :: Web Environment",
"Framework :: Django",
"Framework :: Django :: 4.0",
"Framework :: Django :: 5.0",
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
]

[tool.poetry.dependencies]
python = ">=3.9,<4.0"
wagtail = "5.*"
wagtail-metadata = "5.*"
readtime = "^1.1.1"
beautifulsoup4 = "^4"
wagtail = "5.* || 6.* || 7.*"
wagtail-metadata = "5.* || 6.*"
readtime = "1.* || 2.* || 3.*"
beautifulsoup4 = "4.*"
django-json-ld = "^0.0.5 "
django-model-utils = "^4.2.0"
django = "4.*"
django-model-utils = "4.*"
django = "3.* || 4.* || 5.*"

[tool.poetry.group.dev.dependencies]
pudb = "2022.1.2"
pytest = "^7.3.1"
pytest-django = "^3.8.0"
pytest = "^8.0.2"
pytest-django = "^4.8.0"
pytest-gitignore = "^1.3"
pytest-cov = "^2.8.1"
coverage = "^5.0.2"
django-stubs = "^1.4.0"
black = "^23.3.0"
mypy = "^1.3.0"
beautifulsoup4 = "^4.6.0"
django-extensions = "^3.2.1"
wagtail-foliage = "^0.1.1"
isort = "^5.7.0"
pylint = "^2.17.4"
pylint-django = "^2.5.3"
werkzeug = "^1.0.0"
wagtail-markdown = "^0.9.0"
tox = "^3.14.5"
django-browser-reload = "^1.3.0"
pytest-cov = "^4.1.0"
coverage = "^7.4.3"
django-stubs = "^4.2.7"
black = "^24.2.0"
mypy = "^1.8.0"
beautifulsoup4 = "^4.12.3"
django-extensions = "^3.2.3"
isort = "^5.13.2"
pylint = "^3.1.0"
pylint-django = "^2.5.5"
werkzeug = "^3.0.1"
wagtail-markdown = "^0.10.0"
tox = "^4.13.0"
django-browser-reload = "^1.12.1"

[tool.pytest.ini_options]
addopts = "--ds=tests.settings --reuse-db --pdbcls=pudb.debugger:Debugger"
python_files = "tests.py test_*.py"
norecursedirs = ".git */migrations/* */static/* venv .venv .poetry .virtualenv node_modules"

[tool.black]
exclude = ".*(venv|virtualenv|.poetry|migrations|node_modules|.tox)"

[tool.isort]
skip_glob = "**/migrations/*.py,**/fixtures/*.py,infra/**/*.py"
Expand All @@ -73,3 +78,47 @@ force_grid_wrap = 0
use_parentheses = true
ensure_newline_before_comments = true
line_length = 88

[tool.mypy]
python_version = "3.11"
check_untyped_defs = true
ignore_missing_imports = true
warn_unused_ignores = true
warn_redundant_casts = true
warn_unused_configs = true
plugins = ["mypy_django_plugin.main"]
exclude = [".venv", "migrations.*"]

[tool.django-stubs]
django_settings_module = "tests.settings"

[tool.pylint.'MASTER']
load-plugins = "pylint_django"
ignore = "manage.py"

[tool.pylint.'FORMAT']
max-line-length = 150

[tool.pylint.'MESSAGES CONTROL']
disable = "missing-docstring,invalid-name,logging-fstring-interpolation,fixme,duplicate-code"

[tool.pylint.'DESIGN']
max-parents = 13

[tool.pylint.'SIMILARITIES']
# Minimum lines number of a similarity.
min-similarity-lines = 4
# Ignore comments when computing similarities.
ignore-comments = "yes"
# Ignore docstrings when computing similarities.
ignore-docstrings = "yes"
# Ignore imports when computing similarities.
ignore-imports = "yes"

[tool.djlint]
ignore = "H006,H030,H031"
profile = "django"
preserve_blank_lines = true
use_gitignore = true
format_css = true
format_js = true
5 changes: 5 additions & 0 deletions tests/settings/base.py → tests/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,8 @@
STATIC_URL = "/static/"
SITE_ID = 1
WAGTAIL_SITE_NAME = "My Example Site"
WAGTAILADMIN_BASE_URL = "https://test.com"

SECRET_KEY = "very-secret"

DATABASES = {"default": {"ENGINE": "django.db.backends.sqlite3", "NAME": ":memory:"}}
Empty file removed tests/settings/__init__.py
Empty file.
4 changes: 0 additions & 4 deletions tests/settings/local.py

This file was deleted.

6 changes: 0 additions & 6 deletions tests/settings/test.py

This file was deleted.

Loading

0 comments on commit 7fc7897

Please sign in to comment.