#1 Update to use pyproject macros for poetry
Merged 4 years ago by ankursinha. Opened 4 years ago by ankursinha.
rpms/ ankursinha/python-chaospy 3.0.14  into  master

file modified
+1
@@ -4,3 +4,4 @@ 

  /chaospy-3.0.6.tar.gz

  /chaospy-3.0.7.tar.gz

  /chaospy-3.0.11.tar.gz

+ /chaospy-3.0.14.tar.gz

file modified
+15 -18
@@ -10,8 +10,8 @@ 

  polynomial.}

  

  Name:           python-%{pypi_name}

- Version:        3.0.11

- Release:        3%{?dist}

+ Version:        3.0.14

+ Release:        1%{?dist}

  Summary:        Numerical tool for performing uncertainty quantification using polynomial

  License:        MIT

  URL:            https://github.com/jonathf/chaospy
@@ -24,18 +24,7 @@ 

  %package -n python3-%{pypi_name}

  Summary:        %{summary}

  

- BuildRequires: python3-devel

- BuildRequires: %{py3_dist setuptools}

- BuildRequires: %{py3_dist pytest}

- BuildRequires: %{py3_dist pytest-runner}

- BuildRequires: %{py3_dist pytest-cov}

- BuildRequires: %{py3_dist scikit-learn}

- BuildRequires: %{py3_dist seaborn}

- BuildRequires: %{py3_dist networkx}

- BuildRequires: %{py3_dist numpy}

- BuildRequires: %{py3_dist scipy}

- BuildRequires: %{py3_dist matplotlib}

- BuildRequires: %{py3_dist seaborn}

+ BuildRequires: pyproject-rpm-macros

  

  %if %{with docs}

  BuildRequires: %{py3_dist sphinx}
@@ -62,8 +51,11 @@ 

  %autosetup -n %{pypi_name}-%{version}

  rm -rf %{pypi_name}.egg-info

  

+ %generate_buildrequires

+ %pyproject_buildrequires -r

+ 

  %build

- %py3_build

+ %pyproject_wheel

  

  %if %{with docs}

  pushd doc
@@ -74,7 +66,7 @@ 

  %endif

  

  %install

- %py3_install

+ %pyproject_install

  

  find tutorial/Heaviside.py -type f | xargs chmod 0644 || true

  find tutorial/flow_in_serial_layers.py -type f | xargs chmod 0644 || true
@@ -89,8 +81,8 @@ 

  %files -n python3-%{pypi_name}

  %license LICENSE.txt

  %doc README.rst

- %{python3_sitelib}/%{pypi_name}

- %{python3_sitelib}/*-py?.?.egg-info

+ %{python3_sitelib}/%{pypi_name}/

+ %{python3_sitelib}/%{pypi_name}-%{version}.dist-info/

  

  %files doc

  %license LICENSE.txt
@@ -100,6 +92,11 @@ 

  %endif

  

  %changelog

+ * Fri Oct 25 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.0.14-1

+ - Update to 3.0.14

+ - Build now uses poetry, so we use new python macros

+ - https://src.fedoraproject.org/rpms/pyproject-rpm-macros/tree/master

+ 

  * Tue Sep 24 2019 Luis Bazan <lbazan@fedoraproject.org> - 3.0.11-3

  - Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (chaospy-3.0.11.tar.gz) = 59724cf242191def1488f367848b639a004ba4ae4ec8eb0be6611d2b7184edbcde8384fd381ef29c2e7ec616892a0d6091f9587f3c933d8667bd6a4a76804116

+ SHA512 (chaospy-3.0.14.tar.gz) = 4c680d2ab8aff1e17869b949d2613ee2008fbe6824fa7c1c039ab58114b2b0c38322ee4f5c314706c3e7f6d3ffa86ac59d28e7632a2228bcaebb5510e58219ff

Build fails with a weird error:

+ rm -rfv '*.dist-info/'
+ '[' -f /usr/bin/python3 ']'
+ RPM_TOXENV=py38
+ /usr/bin/python3 -I /usr/lib/rpm/redhat/pyproject_buildrequires.py -t
Handling poetry>=0.12 from build-system.requires
Requirement not satisfied: poetry>=0.12
Exiting dependency generation pass: build backend
+ RPM_EC=0
++ jobs -p
+ exit 0

However, poetry 0.12.17 is in the repos, so this condition is met:
https://koji.fedoraproject.org/koji/packageinfo?packageID=29818

That's not an error. Do you have a link to the build?

My bet is that the actual error is https://src.fedoraproject.org/rpms/pyproject-rpm-macros/c/102626373ec18f1928f53a2c12daf31acec23592?branch=master

Is this pyproject-rpm-macros-0-7? Is this from mock? Try enabling the local repo with buildroot overrides.

This is the failing scratch build: https://koji.fedoraproject.org/koji/taskinfo?taskID=38550467

No, koji: It says it's using: pyproject-rpm-macros noarch 0-7.fc32

I see... The error is:

Traceback (most recent call last):
  File "/usr/lib/rpm/redhat/pyproject_buildrequires.py", line 269, in main
    generate_requires(
  File "/usr/lib/rpm/redhat/pyproject_buildrequires.py", line 221, in generate_requires
    generate_tox_requirements(toxenv, requirements)
  File "/usr/lib/rpm/redhat/pyproject_buildrequires.py", line 184, in generate_tox_requirements
    r = subprocess.run(
  File "/usr/lib64/python3.8/subprocess.py", line 512, in run
    raise CalledProcessError(retcode, process.args,
subprocess.CalledProcessError: Command '['tox', '--print-deps-to-file', '/tmp/tmpg9viv579', '-qre', 'py38']' returned non-zero exit status 1.

In my mock, locally, I ony get:

File not found: /builddir/build/BUILDROOT/python-chaospy-3.0.14-1.fc32.x86_64/usr/lib/python3.8/site-packages/*-py?.?.egg-info

And that is expected.

Is it possible that you error is from a different specfile than in this PR?

Is it possible that you error is from a different specfile than in this PR?

Yes, sorry---the error was when I'd used -t instead of -r. I realised later that it didn't use tox and changed the option.

rebased onto 2e0c642

4 years ago

a trailing slash will make sure this remains a directory forever. same for the line above.

1 new commit added

  • Mark directories in the files section
4 years ago

Pull-Request has been merged by ankursinha

4 years ago

BTW: Why do you BR the runtime deps when you don't run any tests?