Skip to content

Commit 21948e1

Browse files
committed
ci: update package naming and drop Python 3.8-3.9 support
1 parent b484ed1 commit 21948e1

File tree

9 files changed

+25
-27
lines changed

9 files changed

+25
-27
lines changed

.github/workflows/push-copr-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ jobs:
3535
3636
- name: Submit the build by uploading the source RPM
3737
run: |
38-
copr build quadsdev/python3-badfish rpm/*.src.rpm
38+
copr build quadsdev/badfish rpm/*.src.rpm

.github/workflows/source-tarball.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ jobs:
1515
id: create-tarball
1616
run: |
1717
make tarball
18-
echo "tarball_name=$(ls python3-badfish-*.tar.gz | head -n1)" >> $GITHUB_OUTPUT
19-
echo "version=$(ls python3-badfish-*.tar.gz | sed 's/python3-badfish-\(.*\)\.tar\.gz/\1/')" >> $GITHUB_OUTPUT
18+
echo "tarball_name=$(ls badfish-*.tar.gz | head -n1)" >> $GITHUB_OUTPUT
19+
echo "version=$(ls badfish-*.tar.gz | sed 's/badfish-\(.*\)\.tar\.gz/\1/')" >> $GITHUB_OUTPUT
2020
working-directory: rpm
2121

2222
- name: Upload artifact
2323
uses: actions/upload-artifact@v4
2424
with:
2525
name: source-tarball
26-
path: rpm/python3-badfish-*.tar.gz
26+
path: rpm/badfish-*.tar.gz
2727

2828
- name: Create Release and Upload Asset
2929
env:

.github/workflows/tox.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-22.04
1414
strategy:
1515
matrix:
16-
python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
16+
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
1717

1818
steps:
1919
- uses: actions/checkout@v2

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<h2 align="center">The Out-of-Band Wrangler</h2>
66

7-
[![Copr build status](https://copr.fedorainfracloud.org/coprs/quadsdev/python3-badfish/package/python3-badfish/status_image/last_build.png)](https://copr.fedorainfracloud.org/coprs/quadsdev/python3-badfish/package/python3-badfish/)
7+
[![Copr build status](https://copr.fedorainfracloud.org/coprs/quadsdev/badfish/package/badfish/status_image/last_build.png)](https://copr.fedorainfracloud.org/coprs/quadsdev/badfish/package/badfish/)
88
[![Codecov](https://codecov.io/gh/redhat-performance/badfish/branch/master/graph/badge.svg?token=CNJN0CD6GN)](https://codecov.io/gh/redhat-performance/badfish)
99
[![Container image on Quay](https://quay.io/repository/quads/badfish/status "Container image on Quay")](https://quay.io/repository/quads/badfish)
1010
[![Tox](https://github.com/redhat-performance/badfish/actions/workflows/tox.yml/badge.svg)](https://github.com/redhat-performance/badfish/actions)
@@ -128,13 +128,13 @@ We're mostly concentrated on programmatically enforcing interface/device boot or
128128
## Setup
129129
### Badfish RPM package
130130
```bash
131-
dnf copr enable quadsdev/python3-badfish -y
132-
dnf install python3-badfish -y
131+
dnf copr enable quadsdev/badfish -y
132+
dnf install badfish -y
133133
```
134134

135135
Active RPM releases:
136136
- All current Fedora releases
137-
- Some older Fedora releases, check the [RPM releases here](https://copr.fedorainfracloud.org/coprs/quadsdev/python3-badfish/)
137+
- Some older Fedora releases, check the [RPM releases here](https://copr.fedorainfracloud.org/coprs/quadsdev/badfish/)
138138

139139
> [!NOTE]
140140
> RHEL and derivatives (Rocky, Alma, etc) should use [containers](#badfish-container) instead due to missing libs/dependencies.

rpm/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
*.src.rpm
44
noarch/
55
usr/
6-
python3-badfish.spec/
6+
badfish.spec/

rpm/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ BUILD_HELPER := ./build-helper
44
VERSION = $(shell $(BUILD_HELPER) --version)
55
RELEASE = $(shell $(BUILD_HELPER) --release)
66
DATE = $(shell date +'%a %b %d %Y')
7-
TARBALL = python3-badfish-$(VERSION).tar.gz
7+
TARBALL = badfish-$(VERSION).tar.gz
88

9-
all: python3-badfish.spec python3-badfish-$(VERSION).tar.gz
9+
all: badfish.spec badfish-$(VERSION).tar.gz
1010

1111
tarball: $(TARBALL)
1212

1313
.PHONY: $(TARBALL)
1414
$(TARBALL):
1515
rm -f $(TARBALL)
16-
( cd .. && git archive --prefix python3-badfish-$(VERSION)/ HEAD ) \
16+
( cd .. && git archive --prefix badfish-$(VERSION)/ HEAD ) \
1717
| gzip > "$@"
1818

19-
python3-badfish.spec: python3-badfish.spec.tpl
19+
badfish.spec: badfish.spec.tpl
2020
@echo " GEN $@" ; \
2121
sed -e "s|@VERSION@|$(VERSION)|g" \
2222
-e "s|@RELEASE@|$(RELEASE)|g" \
@@ -37,13 +37,13 @@ srpm: all
3737
clean:
3838
rm -rf *.src.rpm *.tar.gz *.spec noarch
3939

40-
test: tarball python3-badfish.spec
40+
test: tarball badfish.spec
4141
@echo "Moving tarball to rpmbuild/SOURCES directory"
4242
mkdir -p ~/rpmbuild/SOURCES
4343
cp $(TARBALL) ~/rpmbuild/SOURCES/
4444
@echo "Tarball $(TARBALL) successfully moved to rpmbuild/SOURCES"
4545
@echo "Building source RPM from spec file"
46-
SRPM_PATH=$$(rpmbuild -bs python3-badfish.spec | grep "Wrote:" | cut -d' ' -f2) && \
46+
SRPM_PATH=$$(rpmbuild -bs badfish.spec | grep "Wrote:" | cut -d' ' -f2) && \
4747
echo "Source RPM build completed: $$SRPM_PATH" && \
4848
echo "Running mock build with the generated SRPM" && \
4949
mock -r fedora-rawhide-x86_64 -n $$SRPM_PATH && \
Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ vendors. Badfish is also a popular song from Sublime, this may be a \
77
coincidence – are you a badfish too?
88

99

10-
Name: python3-%{project}
10+
Name: %{project}
1111
Version: @VERSION@
1212
Release: @RELEASE@%{?dist}
1313
Summary: %{sum}
1414

1515
License: GPL-3.0-or-later and MIT
1616
URL: https://github.com/%{org}/%{project}
17-
Source: %{url}/releases/download/v%{version}/python3-badfish-%{version}.tar.gz
17+
Source: %{url}/releases/download/v%{version}/badfish-%{version}.tar.gz
1818

1919
BuildArch: noarch
2020
BuildRequires: %{py3_dist setuptools}
@@ -41,15 +41,13 @@ Provides: badfish = %{version}-%{release}
4141

4242
%install
4343
%pyproject_install
44+
%pyproject_save_files -l %{project}
4445

4546
%check
46-
tox -e py3 run-parallel --skip-missing-interpreters false
47+
%pytest
4748

48-
%files -n %{name}
49+
%files -n %{name} -f %{pyproject_files}
4950
%doc README.md
50-
%license LICENSE
51-
%{python3_sitelib}/%{project}-%{version}.dist-info/
52-
%{python3_sitelib}/%{project}/
5351
%{_bindir}/%{project}
5452

5553
%changelog

setup.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ classifiers =
1414
Programming Language :: Python :: 3
1515
Operating System :: OS Independent
1616
Programming Language :: Python :: 3
17-
Programming Language :: Python :: 3.8
18-
Programming Language :: Python :: 3.9
1917
Programming Language :: Python :: 3.10
2018
Programming Language :: Python :: 3.11
2119
Programming Language :: Python :: 3.12
20+
Programming Language :: Python :: 3.13
21+
Programming Language :: Python :: 3.14
2222
keywords = oob, management
2323
project_urls =
2424
Bug Tracker = https://github.com/redhat-performance/badfish/issues
@@ -27,7 +27,7 @@ project_urls =
2727

2828
[options]
2929
packages = find:
30-
python_requires = >=3.7
30+
python_requires = >=3.10
3131
install_requires =
3232
pyyaml>=3.10
3333
aiohttp>=3.7.4

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import setuptools
22

33
setuptools.setup(
4-
version="1.0.5"
4+
version="1.0.6"
55
)

0 commit comments

Comments
 (0)