Bump all of the dev dependencies

- remove upper version caps
- updated the minimum version of most of Pelican's runtime deps
- replaced black with ruff as a formatter for pelican
- added a cache step to the docs CI task so that the docs can be
  downloaded and inspected.
This commit is contained in:
Chris Rose 2023-10-29 09:50:01 -07:00 committed by Justin Mayer
commit 8ea27b82f6
3 changed files with 42 additions and 44 deletions

View file

@ -80,6 +80,11 @@ jobs:
run: python -m pip install -U pip tox run: python -m pip install -U pip tox
- name: Check - name: Check
run: tox -e docs run: tox -e docs
- name: cache the docs for inspection
uses: actions/upload-artifact@v3
with:
name: docs
path: docs/_build/html/
deploy: deploy:
name: Deploy name: Deploy

View file

@ -29,15 +29,15 @@ classifiers = [
] ]
requires-python = ">=3.8.1,<4.0" requires-python = ">=3.8.1,<4.0"
dependencies = [ dependencies = [
"blinker>=1.4", "blinker>=1.6.3",
"docutils>=0.16", "docutils>=0.20.1",
"feedgenerator>=1.9", "feedgenerator>=2.1.0",
"jinja2>=2.7", "jinja2>=3.1.2",
"pygments>=2.6", "pygments>=2.16.1",
"python-dateutil>=2.8", "python-dateutil>=2.8.2",
"rich>=10.1", "rich>=13.6.0",
"unidecode>=1.1", "unidecode>=1.3.7",
"backports-zoneinfo<1.0.0,>=0.2.1;python_version<'3.9'", "backports-zoneinfo>=0.2.1; python_version < \"3.9\"",
"watchfiles>=0.21.0", "watchfiles>=0.21.0",
] ]
@ -76,28 +76,28 @@ test = "invoke tests"
[tool.pdm.dev-dependencies] [tool.pdm.dev-dependencies]
dev = [ dev = [
"BeautifulSoup4<5.0,>=4.9", "BeautifulSoup4>=4.12.2",
"jinja2~=3.1.2", "jinja2>=3.1.2",
"lxml<5.0,>=4.3", "lxml>=4.9.3",
"markdown~=3.4.3", "markdown>=3.5",
"typogrify<3.0,>=2.0", "typogrify>=2.0.7",
"sphinx<6.0,>=5.1", "sphinx>=7.1.2",
"furo==2023.03.27", "furo>=2023.9.10",
"livereload<3.0,>=2.6", "livereload>=2.6.3",
"psutil<6.0,>=5.7", "psutil>=5.9.6",
"pygments~=2.15", "pygments>=2.16.1",
"pytest<8.0,>=7.1", "pytest>=7.4.3",
"pytest-cov<5.0,>=4.0", "pytest-cov>=4.1.0",
"pytest-sugar<1.0.0,>=0.9.5", "pytest-sugar>=0.9.7",
"pytest-xdist<3.0,>=2.0", "pytest-xdist>=3.3.1",
"tox<4.0,>=3.13", "tox>=4.11.3",
"flake8<4.0,>=3.8", "flake8>=6.1.0",
"flake8-import-order<1.0.0,>=0.18.1", "flake8-import-order>=0.18.2",
"invoke<3.0,>=2.0", "invoke>=2.2.0",
"isort<6.0,>=5.2", "isort>=5.12.0",
"black<20.0,>=19.10b0", "black>=23.10.1",
"ruff>=0.1.3,<1.0.0", "ruff>=0.1.3",
"tomli;python_version<'3.11'", "tomli>=2.0.1; python_version < \"3.11\"",
] ]
[tool.pdm.build] [tool.pdm.build]

View file

@ -52,24 +52,16 @@ def coverage(c):
@task @task
def black(c, check=False, diff=False): def format(c, check=False, diff=False):
"""Run Black auto-formatter, optionally with --check or --diff""" """Run Ruff's auto-formatter, optionally with --check or --diff"""
check_flag, diff_flag = "", "" check_flag, diff_flag = "", ""
if check: if check:
check_flag = "--check" check_flag = "--check"
if diff: if diff:
diff_flag = "--diff" diff_flag = "--diff"
c.run(f"{VENV_BIN}/black {check_flag} {diff_flag} {PKG_PATH} tasks.py", pty=PTY) c.run(
f"{VENV_BIN}/ruff format {check_flag} {diff_flag} {PKG_PATH} tasks.py", pty=PTY
)
@task
def isort(c, check=False, diff=False):
check_flag, diff_flag = "", ""
if check:
check_flag = "-c"
if diff:
diff_flag = "--diff"
c.run(f"{VENV_BIN}/isort {check_flag} {diff_flag} .", pty=PTY)
@task @task
@ -87,6 +79,7 @@ def ruff(c, fix=False, diff=False):
def lint(c, fix=False, diff=False): def lint(c, fix=False, diff=False):
"""Check code style via linting tools.""" """Check code style via linting tools."""
ruff(c, fix=fix, diff=diff) ruff(c, fix=fix, diff=diff)
format(c, check=not fix, diff=diff)
@task @task