#26 F31: Sync with master
Merged 2 months ago by churchyard. Opened 2 months ago by churchyard.

file modified
+2 -1

@@ -33,6 +33,8 @@ 

      %install

      %pyproject_install

  

+ `%pyproject_install` installs all wheels in `$PWD/pyproject-macros-wheeldir/`. If you would like to save wheels somewhere else redefine `%{_pyproject_wheeldir}`.

+ 

  

  Adding run-time and test-time dependencies

  ------------------------------------------

@@ -131,7 +133,6 @@ 

  Limitations

  -----------

  

- `%pyproject_install` currently installs all wheels in `$PWD`. We are working on a more explicit solution.

  

  This macro changes shebang lines of every Python script in `%{buildroot}%{_bindir}` to `#! %{__python3} %{py3_shbang_opt}` (`#! /usr/bin/python3 -s`).

  We plan to preserve existing Python flags in shebangs, but the work is not yet finished.

file modified
+5 -2

@@ -1,13 +1,16 @@ 

+ %_pyproject_wheeldir ./pyproject-macros-wheeldir

+ 

  %pyproject_wheel() %{expand:\\\

  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}" \\\

- %{__python3} -m pip wheel --no-deps --use-pep517 --no-build-isolation --disable-pip-version-check --progress-bar off --verbose .

+ %{__python3} -m pip wheel --wheel-dir %{_pyproject_wheeldir} --no-deps --use-pep517 --no-build-isolation --disable-pip-version-check --progress-bar off --verbose .

  }

  

  

  %pyproject_install() %{expand:\\\

- %{__python3} -m pip install --root %{buildroot} --no-deps --disable-pip-version-check --progress-bar off --verbose --ignore-installed --no-warn-script-location ./*.whl

+ %{__python3} -m pip install --root %{buildroot} --no-deps --disable-pip-version-check --progress-bar off --verbose --ignore-installed --no-warn-script-location %{_pyproject_wheeldir}/*.whl

  if [ -d %{buildroot}%{_bindir} ]; then

    pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/*

+   rm -rfv %{buildroot}%{_bindir}/__pycache__

  fi

  if [ -d %{buildroot}%{python3_sitelib} ]; then

    sed -i 's/pip/rpm/' %{buildroot}%{python3_sitelib}/*.dist-info/INSTALLER

file modified
+8 -1

@@ -6,7 +6,7 @@ 

  

  # Keep the version at zero and increment only release

  Version:        0

- Release:        8%{?dist}

+ Release:        10%{?dist}

  

  Source0:        macros.pyproject

  Source1:        pyproject_buildrequires.py

@@ -87,6 +87,13 @@ 

  %license LICENSE

  

  %changelog

+ * Fri Nov 15 2019 Patrik Kopkan <pkopkan@redhat.com> - 0-10

+ - Install wheel in '$PWD/pyproject-macros-wheeldir' to have more explicit path from which we install.

+ - The path can be changed by redefining %%_pyproject_wheeldir.

+ 

+ * Wed Nov 13 2019 Anna Khaitovich <akhaitov@redhat.com> - 0-9

+ - Remove stray __pycache__ directory from /usr/bin when running %%pyproject_install

+ 

  * Fri Oct 25 2019 Miro Hrončok <mhroncok@redhat.com> - 0-8

  - When tox fails, print tox output before failing

  

file modified
+3

@@ -25,6 +25,9 @@ 

      - clikit:

          dir: .

          run: ./mocktest.sh python-clikit

+     - tldr:

+         dir: .

+         run: ./mocktest.sh tldr

      required_packages:

      - mock

      - rpmdevtools

file added
+38

@@ -0,0 +1,38 @@ 

+ Name:           tldr

+ Version:        0.4.4

+ Release:        1%{?dist}

+ Summary:        Simplified and community-driven man pages

+ 

+ License:        MIT

+ URL:            https://github.com/tldr-pages/tldr-python-client

+ Source0:        %{pypi_source}

+ 

+ BuildArch:      noarch

+ BuildRequires:  pyproject-rpm-macros

+ 

+ %description

+ %{summary}.

+ 

+ %prep

+ %autosetup -n %{name}-%{version}

+ 

+ %generate_buildrequires

+ %pyproject_buildrequires

+ 

+ %build

+ %pyproject_wheel

+ 

+ %install

+ %pyproject_install

+ 

+ %check

+ test ! -d %{buildroot}%{_bindir}/__pycache__

+ 

+ %files

+ %license LICENSE

+ %doc README.md

+ %{_bindir}/%{name}

+ %{_bindir}/%{name}.py

+ %{python3_sitelib}/%{name}.py

+ %{python3_sitelib}/__pycache__/*.pyc

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

no initial comment

1 new commit added

  • create directory in `$PWD` for built wheel
2 months ago

1 new commit added

  • Tests: Simplify tldr.spec
2 months ago

Pull-Request has been merged by churchyard

2 months ago