Compare commits

...

No commits in common. 'epel9' and 'i9cf' have entirely different histories.
epel9 ... i9cf

5
.gitignore vendored

@ -1,4 +1 @@
/poetry-core-*.tar.gz SOURCES/poetry-core-1.0.7.tar.gz
/poetry-core-*/
/results_*/
*.rpm

@ -0,0 +1 @@
c15928bd7a37829b50626005fcb57f40e478ead9 SOURCES/poetry-core-1.0.7.tar.gz

@ -1,9 +1,6 @@
# RHEL does not include the test dependencies
%bcond tests %{undefined rhel}
Name: python-poetry-core Name: python-poetry-core
Version: 1.6.1 Version: 1.0.7
Release: 1%{?dist} Release: 2%{?dist}
Summary: Poetry PEP 517 Build Backend Summary: Poetry PEP 517 Build Backend
# We bundle a lot of libraries with poetry, which itself is under MIT license. # We bundle a lot of libraries with poetry, which itself is under MIT license.
@ -11,15 +8,14 @@ Summary: Poetry PEP 517 Build Backend
# attrs: MIT # attrs: MIT
# jsonschema: MIT # jsonschema: MIT
# lark: MIT # lark-parser: MIT
# packaging: ASL 2.0 or BSD # packaging: ASL 2.0 or BSD
# pkgutil-resolve-name: MIT
# pyparsing: MIT # pyparsing: MIT
# pyrsistent: MIT # pyrsistent: MIT
# six: MIT
# tomlkit: MIT # tomlkit: MIT
# typing-extensions: Python
License: MIT and (ASL 2.0 or BSD) and Python License: MIT and (ASL 2.0 or BSD)
URL: https://github.com/python-poetry/poetry-core URL: https://github.com/python-poetry/poetry-core
Source0: %{url}/archive/%{version}/poetry-core-%{version}.tar.gz Source0: %{url}/archive/%{version}/poetry-core-%{version}.tar.gz
@ -35,17 +31,13 @@ BuildArch: noarch
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: pyproject-rpm-macros BuildRequires: pyproject-rpm-macros
%if %{with tests}
# for tests (only specified via poetry poetry.dev-dependencies with pre-commit etc.) # for tests (only specified via poetry poetry.dev-dependencies with pre-commit etc.)
BuildRequires: python3-build
BuildRequires: python3-pytest BuildRequires: python3-pytest
BuildRequires: python3-pytest-mock BuildRequires: python3-pytest-mock
BuildRequires: python3-setuptools BuildRequires: python3-pep517
BuildRequires: python3-tomli-w
BuildRequires: python3-virtualenv BuildRequires: python3-virtualenv
BuildRequires: gcc BuildRequires: gcc
BuildRequires: git-core BuildRequires: git-core
%endif
%global _description %{expand: %global _description %{expand:
@ -62,13 +54,15 @@ Summary: %{summary}
# Previous versions of poetry included poetry-core in it # Previous versions of poetry included poetry-core in it
Conflicts: python%{python3_version}dist(poetry) < 1.1 Conflicts: python%{python3_version}dist(poetry) < 1.1
# The bundled versions are taken from src/poetry/core/_vendor/vendor.txt # The bundled versions are taken from poetry/core/_vendor/vendor.txt
Provides: bundled(python3dist(attrs)) = 23.1.0 Provides: bundled(python3dist(attrs)) = 20.3
Provides: bundled(python3dist(jsonschema)) = 4.17.3 Provides: bundled(python3dist(jsonschema)) = 3.2
Provides: bundled(python3dist(lark)) = 1.1.5 Provides: bundled(python3dist(lark-parser)) = 0.9
Provides: bundled(python3dist(packaging)) = 23.1 Provides: bundled(python3dist(packaging)) = 20.9
Provides: bundled(python3dist(pyrsistent)) = 0.19.3 Provides: bundled(python3dist(pyparsing)) = 2.4.7
Provides: bundled(python3dist(tomli)) = 2.0.1 Provides: bundled(python3dist(pyrsistent)) = 0.16.1
Provides: bundled(python3dist(six)) = 1.15
Provides: bundled(python3dist(tomlkit)) = 0.7
%description -n python3-poetry-core %_description %description -n python3-poetry-core %_description
@ -76,6 +70,12 @@ Provides: bundled(python3dist(tomli)) = 2.0.1
%prep %prep
%autosetup -p1 -n poetry-core-%{version} %autosetup -p1 -n poetry-core-%{version}
# We sed out shebang from non-execeutable-script to fix rpmlint error.
# This can be removed once we again devendor python-poetry-core and
# the Patch1 is enabled again.
# Upstream PR: https://github.com/Julian/jsonschema/pull/833
sed -i '1!b;/^#!/d' poetry/core/_vendor/jsonschema/benchmarks/issue232.py
sed -i '1!b;/^#!/d' poetry/core/_vendor/jsonschema/benchmarks/json_schema_test_suite.py
%generate_buildrequires %generate_buildrequires
%pyproject_buildrequires -r %pyproject_buildrequires -r
@ -94,13 +94,9 @@ Provides: bundled(python3dist(tomli)) = 2.0.1
%check %check
%if %{with tests}
# don't use %%tox here because tox.ini runs "poetry install" # don't use %%tox here because tox.ini runs "poetry install"
# TODO investigate failures in test_default_with_excluded_data, test_default_src_with_excluded_data # TODO investigate failures in test_default_with_excluded_data, test_default_src_with_excluded_data
%pytest -k "not with_excluded_data" %pytest -k "not with_excluded_data"
%else
%pyproject_check_import
%endif
%files -n python3-poetry-core -f %{pyproject_files} %files -n python3-poetry-core -f %{pyproject_files}
@ -109,49 +105,8 @@ Provides: bundled(python3dist(tomli)) = 2.0.1
%changelog %changelog
* Wed Jul 26 2023 Tomáš Hrnčiar <thrnciar@redhat.com> - 1.6.1-1 * Tue Jan 09 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 1.0.7-2
- Update to 1.6.1 - Rebuilt for MSVSphere 9.3
- Fixes: rhbz#2144878
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri Jun 30 2023 Tomáš Hrnčiar <thrnciar@redhat.com> - 1.6.0-1
- Update to 1.6.0
* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 1.4.0-4
- Rebuilt for Python 3.12
* Mon May 29 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.4.0-3
- Disable tests in RHEL builds
* Sat Feb 25 2023 Miro Hrončok <mhroncok@redhat.com> - 1.4.0-2
- Remove unused build dependency on python3-pep517
* Mon Feb 20 2023 Tomáš Hrnčiar <thrnciar@redhat.com> - 1.4.0-1
- Update to 1.4.0
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Nov 22 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 1.3.2-1
- Update to 1.3.2
- Fixes: rhbz#1944752
* Wed Nov 16 2022 Lumír Balhar <lbalhar@redhat.com> - 1.2.0-2
- Add missing buildrequire - setuptools (#2142040)
* Fri Sep 30 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 1.2.0-1
- Update to 1.2.0
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.0.8-2
- Rebuilt for Python 3.11
* Mon Mar 07 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 1.0.8-1
- Update to 1.0.8
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-2 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

@ -1,32 +0,0 @@
diff --git a/pyproject.toml b/pyproject.toml
index d55b844..822c584 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -43,6 +43,13 @@ enum34 = {version = "^1.1.10", python = "~2.7"}
# required by tomlkit, jsonschema
functools32 = {version = "^3.2.3-2", python = "~2.7"}
+# moved here from vendors/pyproject.toml
+jsonschema = "^3.2.0"
+lark-parser = "^0.9.0"
+packaging = "*"
+pyrsistent = ">=0.16.0,<0.19.0"
+tomlkit = ">=0.7.0,<1.0.0"
+
[tool.poetry.dev-dependencies]
pre-commit = "^1.10"
pyrsistent = "^0.16.0"
diff --git a/vendors/pyproject.toml b/vendors/pyproject.toml
index 2671380..fb0b28e 100644
--- a/vendors/pyproject.toml
+++ b/vendors/pyproject.toml
@@ -20,9 +20,3 @@ classifiers = [
[tool.poetry.dependencies]
python = "^3.6"
-
-jsonschema = "^3.2.0"
-lark-parser = "^0.9.0"
-packaging = "^20.9"
-pyrsistent = "^0.16.0"
-tomlkit = ">=0.7.0,<1.0.0"

@ -1 +0,0 @@
SHA512 (poetry-core-1.6.1.tar.gz) = 53db0e4f4d5bc6ed2b201cd88a84e07dc6421e910292b8b5efb0dcce1af6e8c62836458a6409aac0394b5063b7c4a6be93784b0bce8592d74f61800f54916706

@ -1,20 +0,0 @@
---
- hosts: localhost
roles:
- role: standard-test-basic
tags:
- classic
repositories:
- repo: "https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git"
dest: "pyproject-rpm-macros"
tests:
- smoke:
run: poetry new smoke && cd smoke && poetry add pello && poetry run pello_greeting
- pyproject_clikit:
dir: pyproject-rpm-macros/tests
run: ./mocktest.sh python-clikit
required_packages:
- poetry
- mock
- rpmdevtools
- rpm-build
Loading…
Cancel
Save