Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding Support for Fedora 39, 40 and dropping setup #339

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ jobs:
- centos-stream-9-x86_64
- centos-stream-9-aarch64
# fedora is like an even farther future preview.
- fedora-38-x86_64
- fedora-38-aarch64
# - fedora-39 # currently not supported due to python 3.11 vs 3.12 issues
- fedora-39-x86_64
- fedora-39-aarch64
- fedora-40-x86_64
- fedora-40-aarch64

- job: copr_build
trigger: commit
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ clean:
find . -type d -name __pycache__ -delete

install:
$(PYTHON) setup.py build -f
$(PYTHON) setup.py install -f
poetry run pipx install .

lint: lint-ruff lint-docs

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ To work with the qpc code, begin by cloning the repository:
git clone [email protected]:quipucords/qpc.git
```

qpc development requires Python 3.11 and Poetry. Install using your local pakage manager or manually from:
qpc development requires Python 3.12 and Poetry. Install using your local pakage manager or manually from:

* https://www.python.org/downloads/
* https://python-poetry.org/
Expand Down
16 changes: 8 additions & 8 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
[project]
requires-python = ">=3.11, <3.13"
license = {file = "LICENSE"}
requires-python = ">=3.11,<3.13"
dynamic = ["scripts"]

[tool.poetry]
name = "qpc"
version = "1.8.0"
description = ""
classifiers=[
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
]
authors = ["QPC Team <[email protected]>"]
license = "GPLv3"
exclude = [
"**/test_*.py",
"**/*_tests.py",
Expand All @@ -20,7 +24,7 @@ qpc = 'qpc.__main__:main'
python = ">=3.11,<3.13"
requests = ">=2.28.1"
cryptography = ">=37.0.4"
setuptools = "^67.8.0"
setuptools = "69.0.3"
faker = "^20.0.3"

[tool.poetry.group.dev.dependencies]
Expand Down
15 changes: 11 additions & 4 deletions qpc.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%global __python3 /usr/bin/python3.11
%global python3_pkgversion 3.11
%global __python3 /usr/bin/python3.12
%global python3_pkgversion 3.12
Name: qpc
Summary: command-line client interface for quipucords

Expand All @@ -13,24 +13,31 @@ Source0: %{url}/archive/%{version}.tar.gz

BuildArch: noarch
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-pip
BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python%{python3_pkgversion}-wheel
BuildRequires: python%{python3_pkgversion}-poetry_core
BuildRequires: pyproject-rpm-macros

Requires: python%{python3_pkgversion}
Requires: python%{python3_pkgversion}-cryptography
Requires: python%{python3_pkgversion}-requests
Requires: python%{python3_pkgversion}-setuptools

%generate_buildrequires
%pyproject_buildrequires

%description
qpc is the command-line client interface for the quipucords server.

%prep
%autosetup -n qpc-%{version}

%build
%py3_build
%pyproject_wheel

%install
QPC_VAR_PROGRAM_NAME=qpc %py3_install
QPC_VAR_PROGRAM_NAME=qpc %pyproject_install
mkdir -p %{buildroot}%{_mandir}/man1/
sed \
-e "s/QPC_VAR_PROGRAM_NAME/qpc/g" \
Expand Down
3 changes: 1 addition & 2 deletions qpc/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
__package__version__ = metadata.version(__package__)
except metadata.PackageNotFoundError:
# PackageNotFoundError may be raised if *not* called from
# within a poetry environment, such as during execution of
# `python setup.py install` in downstream builds.
# within a poetry environment.
# As a failsafe, try to load the version defined for poetry
# from the pyproject.toml.
toml_path = Path(__file__).absolute().parent.parent / "pyproject.toml"
Expand Down
42 changes: 0 additions & 42 deletions setup.py

This file was deleted.

Loading