#125 Move test.support module to python3-test subpackage
Merged 2 months ago by churchyard. Opened 2 months ago by lbalhar.
rpms/ lbalhar/python3 master  into  master

file modified
+5 -25

@@ -17,7 +17,7 @@ 

  #global prerel ...

  %global upstream_version %{general_version}%{?prerel}

  Version: %{general_version}%{?prerel:~%{prerel}}

- Release: 2%{?dist}

+ Release: 3%{?dist}

  License: Python

  

  

@@ -1135,20 +1135,6 @@ 

  %{pylibdir}/ensurepip/_bundled/*.whl

  %endif

  

- # The majority of the test module lives in the test subpackage

- # However test.support is in libs - it contains stuff used when testing your code

- # https://bugzilla.redhat.com/show_bug.cgi?id=596258

- %if %{without flatpackage}

- %dir %{pylibdir}/test/

- %dir %{pylibdir}/test/__pycache__/

- %dir %{pylibdir}/test/support/

- %dir %{pylibdir}/test/support/__pycache__/

- %{pylibdir}/test/__init__.py

- %{pylibdir}/test/__pycache__/__init__%{bytecode_suffixes}

- %{pylibdir}/test/support/*.py

- %{pylibdir}/test/support/__pycache__/*%{bytecode_suffixes}

- %endif

- 

  %dir %{pylibdir}/concurrent/

  %dir %{pylibdir}/concurrent/__pycache__/

  %{pylibdir}/concurrent/*.py

@@ -1408,16 +1394,6 @@ 

  %{pylibdir}/tkinter/test

  %{pylibdir}/unittest/test

  

- # stuff already owned by the libs subpackage

- # test requires libs, so we are safe not owning those dirs

- %if %{without flatpackage}

- %exclude %dir %{pylibdir}/test/

- %exclude %dir %{pylibdir}/test/__pycache__/

- %exclude %{pylibdir}/test/__init__.py

- %exclude %{pylibdir}/test/__pycache__/__init__%{bytecode_suffixes}

- %exclude %{pylibdir}/test/support/

- %endif

- 

  # We don't bother splitting the debug build out into further subpackages:

  # if you need it, you're probably a developer.

  

@@ -1557,6 +1533,10 @@ 

  # ======================================================

  

  %changelog

+ * Mon Jul 15 2019 Lumír Balhar <lbalhar@redhat.com> - 3.7.4-3

+ - Move test.support module to python3-test subpackage

+   https://fedoraproject.org/wiki/Changes/Move_test.support_module_to_python3-test_subpackage

+ 

  * Fri Jul 12 2019 Miro Hrončok <mhroncok@redhat.com> - 3.7.4-2

  - https://fedoraproject.org/wiki/Changes/Python_means_Python3

  - The python-unversioned-command package is no longer Python 2, but 3

More info: https://fedoraproject.org/wiki/Changes/Move_test.support_module_to_python3-test_subpackage

Build: https://copr-be.cloud.fedoraproject.org/results/lbalhar/test.support_change/fedora-rawhide-x86_64/00971998-python3/

Tested in Fedora rawhide. test.support module is available in python3-test and it's importable, and python3-libs does not contain /usr/lib64/python3.7/test directory at all.

does this work --with flatpackage? Should this conditional be removed?

rebased onto 6765866

2 months ago

Waiting for test builds with/without flatpackage in COPR.

Note: We need to add a changelog (just before merging, to avoid conflicts)

rebased onto a664336

2 months ago

Metadata Update from @churchyard:
- Pull-request tagged with: merge - rebase - CI

2 months ago

(I plan to merge this if the CI is good.)

Pull-Request has been merged by churchyard

2 months ago