From 3103226dc4c70358bc20a9b7425905df7528fd55 Mon Sep 17 00:00:00 2001 From: Dominic Kempf Date: Mon, 8 Jan 2024 11:59:36 +0100 Subject: [PATCH 1/2] Bump to git-lfs v3.4.1 --- doc/conf.py | 5 ++--- setup.py | 2 +- sphinx_lfs_content/__init__.py | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index a73737e..e67a00c 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -5,7 +5,6 @@ # https://www.sphinx-doc.org/en/master/usage/configuration.html import os -import subprocess import sys # -- Path setup -------------------------------------------------------------- @@ -18,11 +17,11 @@ # -- Project information ----------------------------------------------------- project = "sphinx_lfs_content" -copyright = "2021-2022, Scientific Software Center, Heidelberg University" +copyright = "2021-2023, Scientific Software Center, Heidelberg University" author = "Dominic Kempf" # The full version, including alpha/beta/rc tags -release = "1.1.3" +release = "1.1.4" # -- General configuration --------------------------------------------------- diff --git a/setup.py b/setup.py index 3fc9e1b..3b30144 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( name="sphinx_lfs_content", - version="1.1.4", + version="1.1.5", author="Dominic Kempf", author_email="dominic.kempf@iwr.uni-heidelberg.de", description="Ensure existence of LFS content in your LFS builds", diff --git a/sphinx_lfs_content/__init__.py b/sphinx_lfs_content/__init__.py index e322d82..6ad9024 100644 --- a/sphinx_lfs_content/__init__.py +++ b/sphinx_lfs_content/__init__.py @@ -8,8 +8,8 @@ import tempfile -GIT_LFS_FILE = "https://github.com/git-lfs/git-lfs/releases/download/v3.4.0/git-lfs-linux-amd64-v3.4.0.tar.gz" -GIT_LFS_CHECKSUM = "60b7e9b9b4bca04405af58a2cd5dff3e68a5607c5bc39ee88a5256dd7a07f58c" +GIT_LFS_FILE = "https://github.com/git-lfs/git-lfs/releases/download/v3.4.1/git-lfs-linux-amd64-v3.4.1.tar.gz" +GIT_LFS_CHECKSUM = "1772dc260961db27958088740b7e9ecebf945abad8c2d504d412448f53faf147" def lfs_setup(_, config): @@ -51,4 +51,4 @@ def setup(app): app.add_config_value("lfs_content_post_commands", [], rebuild="") app.connect("config-inited", lfs_setup) - return {"version": "1.1.4", "parallel_read_safe": True} + return {"version": "1.1.5", "parallel_read_safe": True} From 12025d244cb93dda67606af7c39f70e31843ee69 Mon Sep 17 00:00:00 2001 From: Dominic Kempf Date: Mon, 8 Jan 2024 12:02:43 +0100 Subject: [PATCH 2/2] Modernize publishing --- .github/workflows/pypi.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index b1c5d2e..1268126 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -10,18 +10,17 @@ jobs: pypi-deploy: name: Deploying Python Package runs-on: ubuntu-20.04 + permissions: + id-token: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 name: Install Python - name: Build source distribution run: | python setup.py sdist - - uses: pypa/gh-action-pypi-publish@master - with: - user: __token__ - password: ${{ secrets.PYPI_API_TOKEN }} + - uses: pypa/gh-action-pypi-publish@v1.8.11