From 28124880eb38397e87d2eb4396248449e24aed0f Mon Sep 17 00:00:00 2001 From: "Douglas Cerna (Soy Douglas)" Date: Sat, 13 Jan 2024 18:48:54 +0100 Subject: [PATCH 1/4] Upgrade Python dependencies --- pyproject.toml | 1 + requirements-dev.txt | 32 +++++++++++++++++--------------- requirements.txt | 2 +- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index ebbd2ee..81899cd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,6 +54,7 @@ issues = "https://github.com/archivematica/Issues/issues" [project.optional-dependencies] dev = [ + "alabaster==0.7.13", "coverage", "pip-tools", "pytest-cov", diff --git a/requirements-dev.txt b/requirements-dev.txt index f75810a..b8ba771 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,38 +5,40 @@ # pip-compile --allow-unsafe --extra=dev --output-file=requirements-dev.txt pyproject.toml # alabaster==0.7.13 - # via sphinx -babel==2.13.1 + # via + # metsrw (pyproject.toml) + # sphinx +babel==2.14.0 # via sphinx build==1.0.3 # via pip-tools -certifi==2023.7.22 +certifi==2023.11.17 # via requests charset-normalizer==3.3.2 # via requests click==8.1.7 # via pip-tools -coverage[toml]==7.3.2 +coverage[toml]==7.4.0 # via # metsrw (pyproject.toml) # pytest-cov docutils==0.20.1 # via sphinx -exceptiongroup==1.1.3 +exceptiongroup==1.2.0 # via pytest -idna==3.4 +idna==3.6 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.8.0 +importlib-metadata==7.0.1 # via # build # sphinx iniconfig==2.0.0 # via pytest -jinja2==3.1.2 +jinja2==3.1.3 # via sphinx -lxml==4.9.3 +lxml==5.1.0 # via metsrw (pyproject.toml) markupsafe==2.1.3 # via jinja2 @@ -49,11 +51,11 @@ pip-tools==7.3.0 # via metsrw (pyproject.toml) pluggy==1.3.0 # via pytest -pygments==2.16.1 +pygments==2.17.2 # via sphinx pyproject-hooks==1.0.0 # via build -pytest==7.4.3 +pytest==7.4.4 # via # metsrw (pyproject.toml) # pytest-cov @@ -94,15 +96,15 @@ tomli==2.0.1 # pip-tools # pyproject-hooks # pytest -urllib3==2.0.7 +urllib3==2.1.0 # via requests -wheel==0.41.3 +wheel==0.42.0 # via pip-tools zipp==3.17.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: -pip==23.3.1 +pip==23.3.2 # via pip-tools -setuptools==68.2.2 +setuptools==69.0.3 # via pip-tools diff --git a/requirements.txt b/requirements.txt index ed84951..e9c661c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,5 +4,5 @@ # # pip-compile --allow-unsafe --output-file=requirements.txt pyproject.toml # -lxml==4.9.3 +lxml==5.1.0 # via metsrw (pyproject.toml) From debc5bbd79a7569be621bbebe0d5c3f22ffa657f Mon Sep 17 00:00:00 2001 From: "Douglas Cerna (Soy Douglas)" Date: Sat, 13 Jan 2024 18:51:15 +0100 Subject: [PATCH 2/4] Upgrade pre-commit dependencies --- .pre-commit-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0a96ae9..f2a0c47 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,18 +10,18 @@ repos: - id: reorder-python-imports args: [--py38-plus] - repo: https://github.com/psf/black - rev: "23.10.1" + rev: "23.12.1" hooks: - id: black args: [--safe, --quiet] - repo: https://github.com/pycqa/flake8 - rev: "6.1.0" + rev: "7.0.0" hooks: - id: flake8 additional_dependencies: - - flake8-bugbear==23.9.16 + - flake8-bugbear==23.12.2 - flake8-comprehensions==3.14.0 - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.37.0 + rev: v0.38.0 hooks: - id: markdownlint From 8dfa22c7a5add29a6fa848d690c5455fddc034a4 Mon Sep 17 00:00:00 2001 From: "Douglas Cerna (Soy Douglas)" Date: Sat, 13 Jan 2024 18:49:28 +0100 Subject: [PATCH 3/4] Upgrade GitHub workflow dependencies --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2df6422..a2da994 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: - name: "Check out repository" uses: "actions/checkout@v4" - name: "Set up Python ${{ matrix.python-version }}" - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "${{ matrix.python-version }}" cache: "pip" @@ -51,7 +51,7 @@ jobs: - name: "Check out repository" uses: "actions/checkout@v4" - name: "Set up Python" - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "3.12" cache: "pip" @@ -72,7 +72,7 @@ jobs: - name: "Check out repository" uses: "actions/checkout@v3" - name: "Set up Python" - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "3.12" cache-dependency-path: | From 41508b23a53c359129ece7479c76c4e83322bafc Mon Sep 17 00:00:00 2001 From: "Douglas Cerna (Soy Douglas)" Date: Sat, 13 Jan 2024 19:15:20 +0100 Subject: [PATCH 4/4] Use main package version in docs --- docs/conf.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 4bdc498..c592027 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,6 +18,8 @@ # documentation root, use os.path.abspath to make it absolute, like shown here. sys.path.insert(0, os.path.abspath("..")) +from metsrw import __version__ + # -- General configuration ------------------------------------------------ # If your documentation needs a minimal Sphinx version, state it here. @@ -49,9 +51,9 @@ # built documents. # # The short X.Y version. -version = "0.3.15" +version = __version__ # The full version, including alpha/beta/rc tags. -release = "0.3.15" +release = version # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.