Merge pull request #119 from DrDaveD/release-2.1

prepare for 2.1 release

Author: DrDaveD

.github/workflows/build.yml

@@ -60,7 +60,7 @@ jobs:
               -bs \
               htgettoken.spec
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: srpm-${{ matrix.distro }}-${{ matrix.version }}
           path: "*.src.rpm"
@@ -84,7 +84,7 @@ jobs:
     container: ${{ matrix.distro }}:${{ matrix.version }}
     steps:
       - name: Download SRPM
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: srpm-${{ matrix.distro }}-${{ matrix.version }}
 
@@ -135,7 +135,7 @@ jobs:
               rpm --query --package "${rpmf}" --requires
           done
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: rpm-${{ matrix.distro }}-${{ matrix.version }}
           path: "*.rpm"
@@ -159,7 +159,7 @@ jobs:
     container: ${{ matrix.distro }}:${{ matrix.version }}
     steps:
       - name: Download RPMs
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: rpm-${{ matrix.distro }}-${{ matrix.version }}
 

.github/workflows/test.yml

@@ -49,7 +49,7 @@ jobs:
         uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: test
-          miniforge-variant: Mambaforge
+          miniforge-variant: Miniforge3
           python-version: ${{ matrix.python-version }}
           use-mamba: true
 

htgettoken.spec

@@ -1,7 +1,7 @@
 Summary: Get OIDC bearer tokens by interacting with Hashicorp vault
 Name: htgettoken
-Version: 2.0
-Release: 2%{?dist}
+Version: 2.1
+Release: 1%{?dist}
 
 License: BSD-3-Clause
 URL: https://github.com/fermitools/htgettoken
@@ -80,8 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-# - Fix htdecodetoken to work with token files that do not end in a newline.
-# - Support args in htgettoken.main() Python entry point.
+* Tue Feb 25 2025 Dave Dykstra <dwd@fnal.gov> 2.1-1
+- Fix htdecodetoken to work with token files that do not end in a newline.
+- Support args in htgettoken.main() Python entry point.
 
 * Thu Jul 25 2024 Dave Dykstra <dwd@fnal.gov> 2.0-2
 - Fix broken httokendecode symlink.

htgettoken/__init__.py

@@ -15,7 +15,7 @@
 from __future__ import print_function
 
 prog = "htgettoken"
-version = "2.0"
+version = "2.1"
 
 import os
 import sys

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = htgettoken
-version = 2.0
+version = 2.1
 author = Dave Dykstra
 author_email = dwd@fnal.gov
 license = BSD-3-Clause