#18 F31 master sync
Merged 3 months ago by churchyard. Opened 3 months ago by churchyard.

file modified
+1 -1

@@ -26,7 +26,7 @@ 

  echo 'python3dist(packaging)'

  echo 'python3dist(pytoml)'

  # setuptools assumes no pre-existing dist-info

- rm -rfv *.dist-info/

+ rm -rfv *.dist-info/ >&2

  if [ -f %{__python3} ]; then

    RPM_TOXENV="%{toxenv}" %{__python3} -I %{_rpmconfigdir}/redhat/pyproject_buildrequires.py %{?**}

  fi

file modified
+4 -1

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

  

  # Keep the version at zero and increment only release

  Version:        0

- Release:        6%{?dist}

+ Release:        7%{?dist}

  

  Source0:        macros.pyproject

  Source1:        pyproject_buildrequires.py

@@ -87,6 +87,9 @@ 

  %license LICENSE

  

  %changelog

+ * Tue Oct 08 2019 Miro Hrončok <mhroncok@redhat.com> - 0-7

+ - Move a verbose line of %%pyproject_buildrequires from stdout to stderr

+ 

  * Fri Jul 26 2019 Petr Viktorin <pviktori@redhat.com> - 0-6

  - Use importlib_metadata rather than pip freeze

  

file modified
+4 -4

@@ -15,11 +15,11 @@ 

  # TODO: check if it has precedence if the release was not bumped in tested PR

  if [ ! -f $config ]; then

    original="/etc/mock/fedora-${fedora}-x86_64.cfg"

-   split=$(sed -n '/\[fedora\]/=' $original | head -n1)

-   head -n$(($split-1)) $original > $config

+   cp $original $config

+ 

+   echo -e '\n\nconfig_opts["yum.conf"] += """' >> $config

    cat /etc/yum.repos.d/test-pyproject-rpm-macros.repo >> $config

-   echo >> $config

-   tail -n +$split $original >> $config

+   echo -e '\n"""\n' >> $config

  fi

  

  # prepare the rpmbuild folders, make sure nothing relevant is there