rpms/python-rpm-generators
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
python-rpm-generators/python-rpm-generators.spec

216 lines
8.7 KiB
RPMSpec
Raw Permalink Normal View History

Initial import (#1444925)
2017-05-15 16:06:24 +02:00
Name: python-rpm-generators
Fork upstream generators This package is not being kept up to date, it's hard to maintain and we will need to tune it from time to time which is painful. Also removes whole layer of bootstrapping. Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-11 00:00:36 +01:00
Summary: Dependency generators for Python RPMs
Disable the dist generators for Python 2 https://fedoraproject.org/wiki/Changes/Disable_Python_2_Dist_RPM_Generators_and_Freeze_Python_2_Macros The regex previously matched any Python version in a form of <single digit>.<at least one digit>. Now it matches anything from 3.0 above: <single digit (3 or higher)>.<at least one digit> It still does not match <multiple digits>.<at least one digit>, e.g. 11.0. This is a breaking change, hence the version bump.
2021-02-03 14:07:07 +01:00
Version: 12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 09:18:27 +00:00
Release: 8%{?dist}
Fork upstream generators This package is not being kept up to date, it's hard to maintain and we will need to tune it from time to time which is painful. Also removes whole layer of bootstrapping. Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-11 00:00:36 +01:00
# Originally all those files were part of RPM, so license is kept here
Initial import (#1444925)
2017-05-15 16:06:24 +02:00
License: GPLv2+
Fork upstream generators This package is not being kept up to date, it's hard to maintain and we will need to tune it from time to time which is painful. Also removes whole layer of bootstrapping. Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-11 00:00:36 +01:00
Url: https://src.fedoraproject.org/python-rpm-generators
# Commit is the last change in following files
Source0: https://raw.githubusercontent.com/rpm-software-management/rpm/102eab50b3d0d6546dfe082eac0ade21e6b3dbf1/COPYING
Source1: python.attr
Split python to pythondist generator Running this python script on all possible files is way too expensive. Some of the packages timeout due to that. Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-07-28 14:19:20 +02:00
Source2: pythondist.attr
Automatically call %python_provide This allows us to drop the %python_provide macro from most spec files, except where we want to use it for virtual provides or empty packages.
2020-03-05 23:40:17 +01:00
Source3: pythonname.attr
Source4: pythondistdeps.py
Add a script to generate Python bundled provides See https://src.fedoraproject.org/rpms/python-setuptools/pull-request/40 Strictly speaking, this is not an RPM generator, but: - it generates provides - it is tighly coupled with pythondistdeps.py Usage: 1. Run `$ /usr/lib/rpm/pythonbundles.py .../vendored.txt` 2. Copy the output into the spec as a macro definition: %global bundled %{expand: Provides: bundled(python3dist(appdirs)) = 1.4.3 Provides: bundled(python3dist(packaging)) = 16.8 Provides: bundled(python3dist(pyparsing)) = 2.2.1 Provides: bundled(python3dist(six)) = 1.15 } 3. Use the macro to expand the provides 4. Verify the macro contents in %check: %check ... %{_rpmconfigdir}/pythonbundles.py src/_vendor/vendored.txt --compare-with '%{bundled}'
2020-06-26 12:57:41 +02:00
Source5: pythonbundles.py
Initial import (#1444925)
2017-05-15 16:06:24 +02:00
BuildArch: noarch
%description
Fork upstream generators This package is not being kept up to date, it's hard to maintain and we will need to tune it from time to time which is painful. Also removes whole layer of bootstrapping. Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-11 00:00:36 +01:00
%{summary}.
Initial import (#1444925)
2017-05-15 16:06:24 +02:00
Fork upstream generators This package is not being kept up to date, it's hard to maintain and we will need to tune it from time to time which is painful. Also removes whole layer of bootstrapping. Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-11 00:00:36 +01:00
%package -n python3-rpm-generators
Initial import (#1444925)
2017-05-15 16:06:24 +02:00
Summary: %{summary}
scripts/pythondistdeps: Backport switch to importlib.metadata from upstream Upstream change to importlib.metadata: https://github.com/rpm-software-management/rpm/pull/1317 Due to extras packages being hadled slightly differently by importlib, one test case for this was added. And due to changes in handling requires.txt files, comments were removed from the pyreq2rpm.tests testing package. Also because of the switch, we removed the dependency on setuptools and added a dependency on packaging. Note: Some packages with egg-info files might provide a different name due to this change if there is a conflict between the filename and the name in the metadata. Previously, the filename was sometimes used to parse the name, now it is always the content of that file, which is what packaging does, and thus also pip and other Python tooling. Currently, this is known to affect only 1 package in Fedora (ntpsec). The resulting script is different from upstream because of not yet upstreamed changes in Fedora: - scripts/pythondistdeps: Rework error messages - scripts/pythondistdeps: Add parameter --package-name - scripts/pythondistdeps: Implement provides/requires for extras packages - pythondistdeps.py: When parsing extras name, take the rightmost + These changes are proposed in this upstream PR: https://github.com/rpm-software-management/rpm/pull/1546
2021-02-17 12:18:26 +01:00
Requires: python3-packaging
Reimplement pythondeps.sh as parametric macro generators pythondeps.sh was written in shell and unlike the Python dist generators, it uses no Python, it plainly determines the provide / requires from the path. As the script was run for every Python file, we were potentially doing hundreds of shelling outs to execute a script that calls grep and sed. In Lua, this is much more efficient. Some timings: https://github.com/rpm-software-management/rpm/pull/1153#issuecomment-607146356 Parametric macro generators require RPM 4.16+: https://fedoraproject.org/wiki/Changes/RPM-4.16 Fixes https://github.com/rpm-software-management/rpm/issues/1152 Upstream PR: https://github.com/rpm-software-management/rpm/pull/1153 Since this is intended for Fedora 33+ only, clean some old cruft.
2020-04-01 13:54:32 +02:00
# We have parametric macro generators, we need RPM 4.16 (4.15.90+ is 4.16 alpha)
Requires: rpm > 4.15.90-0
Deduplicate automatically provided names trough Python RPM Lua macros
2020-05-05 13:26:30 +02:00
# This contains the Lua functions we use:
Requires: python-srpm-macros >= 3.8-5
Initial import (#1444925)
2017-05-15 16:06:24 +02:00
%description -n python3-rpm-generators
Fork upstream generators This package is not being kept up to date, it's hard to maintain and we will need to tune it from time to time which is painful. Also removes whole layer of bootstrapping. Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-11 00:00:36 +01:00
%{summary}.
Initial import (#1444925)
2017-05-15 16:06:24 +02:00
%prep
Fork upstream generators This package is not being kept up to date, it's hard to maintain and we will need to tune it from time to time which is painful. Also removes whole layer of bootstrapping. Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-11 00:00:36 +01:00
%autosetup -c -T
cp -a %{sources} .
Initial import (#1444925)
2017-05-15 16:06:24 +02:00
%install
Automatically call %python_provide This allows us to drop the %python_provide macro from most spec files, except where we want to use it for virtual provides or empty packages.
2020-03-05 23:40:17 +01:00
install -Dpm0644 -t %{buildroot}%{_fileattrsdir} *.attr
Add a script to generate Python bundled provides See https://src.fedoraproject.org/rpms/python-setuptools/pull-request/40 Strictly speaking, this is not an RPM generator, but: - it generates provides - it is tighly coupled with pythondistdeps.py Usage: 1. Run `$ /usr/lib/rpm/pythonbundles.py .../vendored.txt` 2. Copy the output into the spec as a macro definition: %global bundled %{expand: Provides: bundled(python3dist(appdirs)) = 1.4.3 Provides: bundled(python3dist(packaging)) = 16.8 Provides: bundled(python3dist(pyparsing)) = 2.2.1 Provides: bundled(python3dist(six)) = 1.15 } 3. Use the macro to expand the provides 4. Verify the macro contents in %check: %check ... %{_rpmconfigdir}/pythonbundles.py src/_vendor/vendored.txt --compare-with '%{bundled}'
2020-06-26 12:57:41 +02:00
install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} *.py
Initial import (#1444925)
2017-05-15 16:06:24 +02:00
%files -n python3-rpm-generators
Fixups after review
2017-05-18 11:07:51 +02:00
%license COPYING
Initial import (#1444925)
2017-05-15 16:06:24 +02:00
%{_fileattrsdir}/python.attr
reference new attr file in %files Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-07-28 14:30:57 +02:00
%{_fileattrsdir}/pythondist.attr
Automatically call %python_provide This allows us to drop the %python_provide macro from most spec files, except where we want to use it for virtual provides or empty packages.
2020-03-05 23:40:17 +01:00
%{_fileattrsdir}/pythonname.attr
Initial import (#1444925)
2017-05-15 16:06:24 +02:00
%{_rpmconfigdir}/pythondistdeps.py
Add a script to generate Python bundled provides See https://src.fedoraproject.org/rpms/python-setuptools/pull-request/40 Strictly speaking, this is not an RPM generator, but: - it generates provides - it is tighly coupled with pythondistdeps.py Usage: 1. Run `$ /usr/lib/rpm/pythonbundles.py .../vendored.txt` 2. Copy the output into the spec as a macro definition: %global bundled %{expand: Provides: bundled(python3dist(appdirs)) = 1.4.3 Provides: bundled(python3dist(packaging)) = 16.8 Provides: bundled(python3dist(pyparsing)) = 2.2.1 Provides: bundled(python3dist(six)) = 1.15 } 3. Use the macro to expand the provides 4. Verify the macro contents in %check: %check ... %{_rpmconfigdir}/pythonbundles.py src/_vendor/vendored.txt --compare-with '%{bundled}'
2020-06-26 12:57:41 +02:00
%{_rpmconfigdir}/pythonbundles.py
Initial import (#1444925)
2017-05-15 16:06:24 +02:00
%changelog
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 09:18:27 +00:00
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 12-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
pythondistdeps.py: Catch all exceptions and terminate build if one is raised
2021-05-25 17:56:00 +02:00
* Tue May 25 2021 Tomas Orsava <torsava@redhat.com> - 12-7
- pythondistdeps.py: Detect missing or corrupted metadata
- pythondistdeps.py: Catch all exceptions and terminate the build if one is raised
Fix python(abi) generator (the one written in Python) There were three problems: - sys.version was not imported - sys.version[:3] is not reliable on Python 3.10+ - distutils is deprecated on Python 3.10+ We were not hit by the missing import in Fedora because we only run the script on .dist-info/.egg-info/.egg and not on .py files, so this if-branch never runs. But when the script was fed with a .py path, it errored: Traceback (most recent call last): File "/usr/lib/rpm/pythondistdeps.py", line 344, in <module> purelib = get_python_lib(standard_lib=0, plat_specific=0).split(version[:3])[0] NameError: name 'version' is not defined The sys.version[:3] thing kinda works for Python 3.10+ because *in this particular case* splitting on '3.1' and taking the prefix yields the same results as splitting on '3.10', but I consider that mere coincidence. Finally, since the distutils import happened at module-level, we got the Deprecation warning in all Fedora's Python packages: /usr/lib/rpm/pythondistdeps.py:16: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12 Backported from https://github.com/rpm-software-management/python-rpm-packaging/commit/d12e039037
2021-04-19 22:56:25 +02:00
* Mon Apr 19 2021 Miro Hrončok <mhroncok@redhat.com> - 12-6
- Get rid of distutils deprecation warning (by not using it)
- The distutils module is deprecated in Python 3.10+
- https://www.python.org/dev/peps/pep-0632/
Do not generate setuptools requirement for console_scripts on Python 3.10+ See https://fedoraproject.org/wiki/Changes/Reduce_dependencies_on_python3-setuptools
2021-03-15 18:59:40 +01:00
* Wed Mar 31 2021 Miro Hrončok <mhroncok@redhat.com> - 12-5
- Do not generate setuptools requirement for console_scripts on Python 3.10+
- See https://fedoraproject.org/wiki/Changes/Reduce_dependencies_on_python3-setuptools
pythondistdeps.py: Always output extras names in lowercase
2021-03-11 12:43:37 +01:00
* Thu Mar 11 2021 Tomas Orsava <torsava@redhat.com> - 12-4
- scripts/pythondistdeps: Treat extras names case-insensitively and always
output them in lower case (#1936875)
scripts/pythondistdeps: Fix for Python 3.10 self.name in PathDistribution is a property in Python 3.10+ and thus we can't redefine it as an instance variable. Instead we explicitly define it as a property, which works on all supported Python versions.
2021-02-22 13:16:24 +01:00
* Mon Feb 22 2021 Tomas Orsava <torsava@redhat.com> - 12-3
- scripts/pythondistdeps: Fix for Python 3.10
scripts/pythondistdeps: Backport switch to importlib.metadata from upstream Upstream change to importlib.metadata: https://github.com/rpm-software-management/rpm/pull/1317 Due to extras packages being hadled slightly differently by importlib, one test case for this was added. And due to changes in handling requires.txt files, comments were removed from the pyreq2rpm.tests testing package. Also because of the switch, we removed the dependency on setuptools and added a dependency on packaging. Note: Some packages with egg-info files might provide a different name due to this change if there is a conflict between the filename and the name in the metadata. Previously, the filename was sometimes used to parse the name, now it is always the content of that file, which is what packaging does, and thus also pip and other Python tooling. Currently, this is known to affect only 1 package in Fedora (ntpsec). The resulting script is different from upstream because of not yet upstreamed changes in Fedora: - scripts/pythondistdeps: Rework error messages - scripts/pythondistdeps: Add parameter --package-name - scripts/pythondistdeps: Implement provides/requires for extras packages - pythondistdeps.py: When parsing extras name, take the rightmost + These changes are proposed in this upstream PR: https://github.com/rpm-software-management/rpm/pull/1546
2021-02-17 12:18:26 +01:00
* Wed Feb 17 2021 Tomas Orsava <torsava@redhat.com> - 12-2
- scripts/pythondistdeps: Switch from using pkg_resources to importlib.metadata
for reading the egg/dist-info metadata
- The script no longer requires setuptools but instead requires packaging
Disable the dist generators for Python 2 https://fedoraproject.org/wiki/Changes/Disable_Python_2_Dist_RPM_Generators_and_Freeze_Python_2_Macros The regex previously matched any Python version in a form of <single digit>.<at least one digit>. Now it matches anything from 3.0 above: <single digit (3 or higher)>.<at least one digit> It still does not match <multiple digits>.<at least one digit>, e.g. 11.0. This is a breaking change, hence the version bump.
2021-02-03 14:07:07 +01:00
* Wed Feb 03 2021 Miro Hrončok <mhroncok@redhat.com> - 12-1
- Disable the dist generators for Python 2
- https://fedoraproject.org/wiki/Changes/Disable_Python_2_Dist_RPM_Generators_and_Freeze_Python_2_Macros
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 13:13:21 +00:00
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 11-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Run scripts in an isolated environment (#1889080)
2020-10-19 12:50:23 +02:00
* Mon Oct 19 2020 Tomas Orsava <torsava@redhat.com> - 11-12
- Run scripts in an isolated Python environment (#1889080)
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 03:42:44 +00:00
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 11-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
pythondistdeps.py: When parsing extras name, take the rightmost +
2020-07-21 22:11:16 +02:00
* Tue Jul 21 2020 Miro Hrončok <mhroncok@redhat.com> - 11-10
- pythondistdeps: Split Python Extras names after the rightmost plus sign
Sync python dependency conversion with pyreq2rpm.
2020-07-03 22:38:41 -07:00
- pythondistdeps: Handle edge cases of version comparisons more closely to
upstream, despite irrationality
See: https://github.com/pypa/packaging/issues/320
pythondistdeps.py: When parsing extras name, take the rightmost +
2020-07-21 22:11:16 +02:00
scripts/pythondistdeps: Rework error messages
2020-07-10 13:08:20 +02:00
* Fri Jul 10 2020 Tomas Orsava <torsava@redhat.com> - 11-9
Enable --require-extras-subpackages and bump release
2020-06-17 14:36:33 +02:00
- pythondistdeps: Implement provides/requires for extras packages
- Enable --require-extras-subpackages
pythondistdeps.py: Adapt Python version marker workaround for setuptools 42+ See https://bugzilla.redhat.com/show_bug.cgi?id=1853597#c11 pkg_resources from setuptools 42+ no longer only use platform.python_version(), but also platform.python_version_tuple() -- this was updated in packaging 19.1+. This fix makes it work again with both new and old setuptools, hopefully for some while. https://github.com/pypa/setuptools/commit/bf069fe9ddcadaa2c029067601d06a07d037d4f7 https://github.com/pypa/packaging/commit/86a443f3185024edd0b826afdd91d8f9a4917022
2020-07-10 15:08:30 +02:00
- Adapt Python version marker workaround for setuptools 42+
Enable --require-extras-subpackages and bump release
2020-06-17 14:36:33 +02:00
Add a script to generate Python bundled provides See https://src.fedoraproject.org/rpms/python-setuptools/pull-request/40 Strictly speaking, this is not an RPM generator, but: - it generates provides - it is tighly coupled with pythondistdeps.py Usage: 1. Run `$ /usr/lib/rpm/pythonbundles.py .../vendored.txt` 2. Copy the output into the spec as a macro definition: %global bundled %{expand: Provides: bundled(python3dist(appdirs)) = 1.4.3 Provides: bundled(python3dist(packaging)) = 16.8 Provides: bundled(python3dist(pyparsing)) = 2.2.1 Provides: bundled(python3dist(six)) = 1.15 } 3. Use the macro to expand the provides 4. Verify the macro contents in %check: %check ... %{_rpmconfigdir}/pythonbundles.py src/_vendor/vendored.txt --compare-with '%{bundled}'
2020-06-26 12:57:41 +02:00
* Fri Jun 26 2020 Miro Hrončok <mhroncok@redhat.com> - 11-8
Fix python(abi) requires generator, it picked files from almost good directories The %__python_magic filter suddenly got actually working with file 5.39: Before: file.cpython-38.opt-1.pyc: data After: file.cpython-38.opt-1.pyc: python 3.8 byte-compiled Hence, the filter started to pick all Python files regardless of their location. Later, in the actual generator, paths like this were considered: /opt/usr/lib/python3.X/... And generated requirements on python(abi). We don't actually need to filter the files by file magic, so we drop it to get the previously accidentally working behavior. We could choose if the path and magic filters are applied as OR or AND. However, we don't want either. We actually want to mach any files in Python directories regardless of their magic. We *could* filter by file type (and executable bit) for provides, but that would require us to split the attr files into two.
2020-06-17 15:55:57 +02:00
- Fix python(abi) requires generator, it picked files from almost good directories
Add a script to generate Python bundled provides See https://src.fedoraproject.org/rpms/python-setuptools/pull-request/40 Strictly speaking, this is not an RPM generator, but: - it generates provides - it is tighly coupled with pythondistdeps.py Usage: 1. Run `$ /usr/lib/rpm/pythonbundles.py .../vendored.txt` 2. Copy the output into the spec as a macro definition: %global bundled %{expand: Provides: bundled(python3dist(appdirs)) = 1.4.3 Provides: bundled(python3dist(packaging)) = 16.8 Provides: bundled(python3dist(pyparsing)) = 2.2.1 Provides: bundled(python3dist(six)) = 1.15 } 3. Use the macro to expand the provides 4. Verify the macro contents in %check: %check ... %{_rpmconfigdir}/pythonbundles.py src/_vendor/vendored.txt --compare-with '%{bundled}'
2020-06-26 12:57:41 +02:00
- Add a script to generate Python bundled provides
Fix python(abi) requires generator, it picked files from almost good directories The %__python_magic filter suddenly got actually working with file 5.39: Before: file.cpython-38.opt-1.pyc: data After: file.cpython-38.opt-1.pyc: python 3.8 byte-compiled Hence, the filter started to pick all Python files regardless of their location. Later, in the actual generator, paths like this were considered: /opt/usr/lib/python3.X/... And generated requirements on python(abi). We don't actually need to filter the files by file magic, so we drop it to get the previously accidentally working behavior. We could choose if the path and magic filters are applied as OR or AND. However, we don't want either. We actually want to mach any files in Python directories regardless of their magic. We *could* filter by file type (and executable bit) for provides, but that would require us to split the attr files into two.
2020-06-17 15:55:57 +02:00
Use PEP 503 names for requires
2020-05-21 17:43:19 +02:00
* Thu May 21 2020 Miro Hrončok <mhroncok@redhat.com> - 11-7
- Use PEP 503 names for requires
Deduplicate automatically provided names trough Python RPM Lua macros
2020-05-05 13:26:30 +02:00
* Tue May 05 2020 Miro Hrončok <mhroncok@redhat.com> - 11-6
- Deduplicate automatically provided names trough Python RPM Lua macros
Bump version, enable new features, add test suite to Fedora CI
2020-04-30 16:24:11 +02:00
* Wed Apr 29 2020 Tomas Orsava <torsava@redhat.com> - 11-5
- Backporting proposed upstream changes
https://github.com/rpm-software-management/rpm/pull/1195
- Only provide python3dist(..) for the main Python versions (BZ#1812083)
- Preparation for the proper handling of normalized names (BZ#1791530)
- Add a test suite (and enable it in Fedora CI)
- Better error messages for unsupported package versions
- Fix sorting of dev versions
Don't define global Lua variables from Python generator
2020-04-28 14:47:32 +02:00
* Tue Apr 28 2020 Miro Hrončok <mhroncok@redhat.com> - 11-4
- Don't define global Lua variables from Python generator
Handle all-zero versions without crashing From https://github.com/rpm-software-management/rpm/pull/1184
2020-04-19 14:24:00 -07:00
* Mon Apr 20 2020 Gordon Messmer <gordon.messmer@gmail.com> - 11-3
- Handle all-zero versions without crashing
Use dynamic %_prefix value when matching files for python(abi) provides See https://lists.fedoraproject.org/archives/list/packaging@lists.fedoraproject.org/thread/UFKUM5UKCTNGIT3KJVYEI5VXPI23QMBN/ Flatpak builds redefine %_prefix and the dependencies should remain present. Also get rid of one useless ^ and prep the pattern for two digit Python major versions. Add a test that tests that we match our default %_prefix (was the case even before this commit).
2020-04-07 14:41:51 +02:00
* Tue Apr 07 2020 Miro Hrončok <mhroncok@redhat.com> - 11-2
- Use dynamic %%_prefix value when matching files for python(abi) provides
Sync with upstream RPM dist generator
2020-04-10 07:41:01 +02:00
- Sync with upstream RPM dist generator
Use dynamic %_prefix value when matching files for python(abi) provides See https://lists.fedoraproject.org/archives/list/packaging@lists.fedoraproject.org/thread/UFKUM5UKCTNGIT3KJVYEI5VXPI23QMBN/ Flatpak builds redefine %_prefix and the dependencies should remain present. Also get rid of one useless ^ and prep the pattern for two digit Python major versions. Add a test that tests that we match our default %_prefix (was the case even before this commit).
2020-04-07 14:41:51 +02:00
Reimplement pythondeps.sh as parametric macro generators pythondeps.sh was written in shell and unlike the Python dist generators, it uses no Python, it plainly determines the provide / requires from the path. As the script was run for every Python file, we were potentially doing hundreds of shelling outs to execute a script that calls grep and sed. In Lua, this is much more efficient. Some timings: https://github.com/rpm-software-management/rpm/pull/1153#issuecomment-607146356 Parametric macro generators require RPM 4.16+: https://fedoraproject.org/wiki/Changes/RPM-4.16 Fixes https://github.com/rpm-software-management/rpm/issues/1152 Upstream PR: https://github.com/rpm-software-management/rpm/pull/1153 Since this is intended for Fedora 33+ only, clean some old cruft.
2020-04-01 13:54:32 +02:00
* Wed Apr 01 2020 Miro Hrončok <mhroncok@redhat.com> - 11-1
- Rewrite python(abi) generators to Lua to make them faster
- RPM 4.16+ is needed
Automatically call %python_provide This allows us to drop the %python_provide macro from most spec files, except where we want to use it for virtual provides or empty packages.
2020-03-05 23:40:17 +01:00
- Automatically call %%python_provide
Reimplement pythondeps.sh as parametric macro generators pythondeps.sh was written in shell and unlike the Python dist generators, it uses no Python, it plainly determines the provide / requires from the path. As the script was run for every Python file, we were potentially doing hundreds of shelling outs to execute a script that calls grep and sed. In Lua, this is much more efficient. Some timings: https://github.com/rpm-software-management/rpm/pull/1153#issuecomment-607146356 Parametric macro generators require RPM 4.16+: https://fedoraproject.org/wiki/Changes/RPM-4.16 Fixes https://github.com/rpm-software-management/rpm/issues/1152 Upstream PR: https://github.com/rpm-software-management/rpm/pull/1153 Since this is intended for Fedora 33+ only, clean some old cruft.
2020-04-01 13:54:32 +02:00
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-30 15:05:48 +00:00
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 10-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Also provide pythonXdist() with PEP 503 normalized names (#1791530) That is, we add new provides that replace dots with a dash. Package that used to provide python3dist(zope.component) and python3.8dist(zope.component) now also provides python3dist(zope-component) and python3.8dist(zope-component). Package that used to provide python3dist(a.-.-.-.a) now provides python3dist(a-a) as well. This is consistent with pip behavior, `pip install zope-component` installs zope.component. Historically, we have always used dist.key (safe_name) from setuptools, but that is a non-standardized convention -- whether or not it replaces dots with dashes is not even documented. We say we use "canonical name" or "normalized name" everywhere, yet we didn't. We really need to follow the standard (PEP 503): https://www.python.org/dev/peps/pep-0503/#normalized-names The proper function here would be packaging.utils.canonicalize_name https://packaging.pypa.io/en/latest/utils/#packaging.utils.canonicalize_name -- we reimplement it here to avoid an external dependency. This is the first required step needed if we want to change our requirements later. If we decide we don't, for whatever reason, this doesn't break anything.
2020-01-17 17:27:09 +01:00
* Fri Jan 17 2020 Miro Hrončok <mhroncok@redhat.com> - 10-3
- Also provide pythonXdist() with PEP 503 normalized names (#1791530)
Fix more complicated requirement expressions by adding parenthesis Puts bounded requirements into parenthesis Fixes: https://github.com/rpm-software-management/rpm/issues/995 Upstream: https://github.com/rpm-software-management/rpm/pull/996 For this input: pyparsing>=2.0.1,!=2.0.4,!=2.1.2,!=2.1.6 Instead of (invalid): (python3.8dist(pyparsing) >= 2.0.1 with python3.8dist(pyparsing) < 2.1.2 or python3.8dist(pyparsing) >= 2.1.2.0 with python3.8dist(pyparsing) < 2.1.6 or python3.8dist(pyparsing) >= 2.1.6.0 with python3.8dist(pyparsing) < 2.0.4 or python3.8dist(pyparsing) >= 2.0.4.0) Produces (valid): (python3.8dist(pyparsing) >= 2.0.1 with (python3.8dist(pyparsing) < 2.1.2 or python3.8dist(pyparsing) >= 2.1.2.0) with (python3.8dist(pyparsing) < 2.0.4 or python3.8dist(pyparsing) >= 2.0.4.0) with (python3.8dist(pyparsing) < 2.1.6 or python3.8dist(pyparsing) >= 2.1.6.0)) For this input: babel>=1.3,!=2.0 Instead of (invalid): (python3.8dist(babel) >= 1.3 with python3.8dist(babel) < 2 or python3.8dist(babel) >= 2.0) Produces (valid): (python3.8dist(babel) >= 1.3 with (python3.8dist(babel) < 2 or python3.8dist(babel) >= 2.0)) For this input: pbr!=2.1.0,>=2.0.0 Instead of (invalid): (python3.8dist(pbr) >= 2 with python3.8dist(pbr) < 2.1 or python3.8dist(pbr) >= 2.1.0) Produces (valid): (python3.8dist(pbr) >= 2 with (python3.8dist(pbr) < 2.1 or python3.8dist(pbr) >= 2.1.0))
2020-01-03 11:00:19 +01:00
* Fri Jan 03 2020 Miro Hrončok <mhroncok@redhat.com> - 10-2
- Fix more complicated requirement expressions by adding parenthesis
Sync with upstream RPM - Handle version ending with ".*" - Handle compatible-release operator "~=" - Use rich deps for semantically versioned dependencies - Match Python version if minor has multiple digits (e.g. 3.10) - Only add setuptools requirement for egg-info packages https://github.com/rpm-software-management/rpm/pull/951 https://github.com/rpm-software-management/rpm/pull/973 https://github.com/rpm-software-management/rpm/pull/982 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1758141 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1777382
2020-01-01 23:17:07 +01:00
* Wed Jan 01 2020 Miro Hrončok <mhroncok@redhat.com> - 10-1
- Handle version ending with ".*" (#1758141)
- Handle compatible-release operator "~=" (#1758141)
- Use rich deps for semantically versioned dependencies
- Match Python version if minor has multiple digits (e.g. 3.10, #1777382)
- Only add setuptools requirement for egg-info packages
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-26 16:06:05 +00:00
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Canonicalize Python versions and properly handle != spec Fixes https://github.com/rpm-software-management/rpm/issues/639 From upstream PR: https://github.com/rpm-software-management/rpm/pull/757
2019-06-20 11:03:40 +02:00
* Mon Jun 24 2019 Tomas Orsava <torsava@redhat.com> - 9-1
- Canonicalize Python versions and properly handle != spec
console_scripts entry points to require setuptools https://github.com/rpm-software-management/rpm/pull/666
2019-04-17 14:35:46 +02:00
* Wed Apr 17 2019 Miro Hrončok <mhroncok@redhat.com> - 8-1
- console_scripts entry points to require setuptools
https://github.com/rpm-software-management/rpm/pull/666
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-02 09:09:35 +00:00
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Enable requires generator References: https://fedoraproject.org/wiki/Changes/EnablingPythonGeneratorsByDefault References: https://pagure.io/fesco/issue/2026 Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-12-20 14:21:14 +01:00
* Thu Dec 20 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 7-1
- Enable requires generator
Tighten regex for depgen Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-10-03 14:21:26 +02:00
* Wed Oct 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 6-1
- Tighten regex for depgen
Use nonstandardlib for purelib definition (#1609492) The purelib and platlib were both defined to /usr/lib64/python on 64bits systems. This is because: >>> get_python_lib(standard_lib=1, plat_specific=0) '/usr/lib64/python3.7' >>> get_python_lib(standard_lib=1, plat_specific=1) '/usr/lib64/python3.7' >>> get_python_lib(standard_lib=0, plat_specific=0) '/usr/lib/python3.7/site-packages' >>> get_python_lib(standard_lib=0, plat_specific=1) '/usr/lib64/python3.7/site-packages' So now we use standard_lib=0 to get the site-packages base path from /usr/lib and not /usr/lib64. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1609492
2018-07-28 22:15:16 +02:00
* Sat Jul 28 2018 Miro Hrončok <mhroncok@redhat.com> - 5-4
- Use nonstandardlib for purelib definition (#1609492)
Split python to pythondist generator Running this python script on all possible files is way too expensive. Some of the packages timeout due to that. Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-07-28 14:19:20 +02:00
* Sat Jul 28 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 5-3
- Add pythondist generator
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 01:58:03 +00:00
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Fork upstream generators This package is not being kept up to date, it's hard to maintain and we will need to tune it from time to time which is painful. Also removes whole layer of bootstrapping. Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-11 00:00:36 +01:00
* Sun Feb 11 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 5-1
- Fork upstream generators
"Fix" support of environment markers Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-11 00:32:23 +01:00
- "Fix" support of environment markers
Fork upstream generators This package is not being kept up to date, it's hard to maintain and we will need to tune it from time to time which is painful. Also removes whole layer of bootstrapping. Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-11 00:00:36 +01:00
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 10:39:37 +00:00
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.14.0-2.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Bump the release, add a changelog entry
2017-09-21 15:25:57 +02:00
* Tue Nov 28 2017 Tomas Orsava <torsava@redhat.com> - 4.14.0-2
- Switch bootsrapping macro to a bcond for modularity
Rebase to rpm 4.14.0 final
2017-10-20 11:52:42 +02:00
* Fri Oct 20 2017 Tomas Orsava <torsava@redhat.com> - 4.14.0-1
- Rebase to rpm 4.14.0 final (http://rpm.org/wiki/Releases/4.14.0)
- Re-synchronize version/release macros with the rpm Fedora package
Update to a new upstream version of RPM - Drop upstreamed patches - Renumber remaining patches
2017-09-18 16:54:18 +02:00
* Mon Sep 18 2017 Tomas Orsava <torsava@redhat.com> - 4.14.0-0.rc1.1
- Update to a new upstream version of RPM
- Drop upstreamed patches
- Renumber remaining patches
Do not provide pythonXdist for platform-python packages
2017-08-24 13:50:13 +02:00
* Thu Aug 24 2017 Miro Hrončok <mhroncok@redhat.com> - 4.13.0.1-4
- Add patch 10: Do not provide pythonXdist for platform-python packages (rhbz#1484607)
Generate requires and provides for platform-python(abi)
2017-08-14 15:39:58 +02:00
* Tue Aug 08 2017 Tomas Orsava <torsava@redhat.com> - 4.13.0.1-3
- Add patch 9: Generate requires and provides for platform-python(abi)
(https://fedoraproject.org/wiki/Changes/Platform_Python_Stack)
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
2017-07-27 11:44:11 +00:00
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.13.0.1-2.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
Fixups after review
2017-05-18 11:07:51 +02:00
* Thu May 18 2017 Tomas Orsava <torsava@redhat.com> - 4.13.0.1-2
- Added a license file
- Added a dependency on rpm for the proper directory structure
- Properly owning the __pycache__ directory
Initial import (#1444925)
2017-05-15 16:06:24 +02:00
* Tue May 02 2017 Tomas Orsava <torsava@redhat.com> - 4.13.0.1-1
- Splitting Python RPM generators from the `rpm` package to standalone one
Reference in New Issue Copy Permalink