Skip to content

split build deps + test build deps #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

split build deps + test build deps #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions pyp2rpm/metadata_extractors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ def __init__(self, local_file, name, name_convertor, version,
self.venv = venv
self.base_python_version = base_python_version
self.metadata_extension = metadata_extension
self.builtin_build_deps = [['BuildRequires', 'python2-devel'], ['BuildRequires', 'python-setuptools']]

def name_convert_deps_list(self, deps_list):
for dep in deps_list:
Expand Down Expand Up @@ -358,13 +359,12 @@ def data_from_archive(self):

if self.archive.is_egg:
archive_data['runtime_deps'] = self.runtime_deps_from_egg_info
archive_data['build_deps'] = [['BuildRequires', 'python2-devel'],
['BuildRequires', 'python-setuptools']]
archive_data['build_deps'] = self.builtin_build_deps
archive_data['test_deps'] = []
else:
archive_data['runtime_deps'] = self.runtime_deps_from_setup_py
archive_data['build_deps'] = utils.unique_deps([['BuildRequires', 'python2-devel'],
['BuildRequires', 'python-setuptools']]
+ self.build_deps_from_setup_py)
archive_data['build_deps'] = self.builtin_build_deps
archive_data['test_deps'] = self.build_deps_from_setup_py

py_vers = self.versions_from_archive
archive_data['base_python_version'] = py_vers[0] if py_vers \
Expand Down Expand Up @@ -589,9 +589,8 @@ def data_from_archive(self):
archive_data['doc_license']) = self.separate_license_files(self.doc_files)
archive_data['has_pth'] = self.has_pth
archive_data['runtime_deps'] = utils.unique_deps(self.runtime_deps)
archive_data['build_deps'] = utils.unique_deps([['BuildRequires', 'python2-devel'],
['BuildRequires', 'python-setuptools']]
+ self.build_deps)
archive_data['build_deps'] = self.builtin_build_deps
archive_data['test_deps'] = self.build_deps
archive_data['py_modules'] = self.modules
archive_data['scripts'] = self.scripts
archive_data['has_test_suite'] = self.has_test_suite
Expand Down
4 changes: 2 additions & 2 deletions pyp2rpm/templates/epel6.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ Source0: {{ data.url|replace(data.name, '%{pypi_name}')|replace(data.vers
{%- if not data.has_extension %}
BuildArch: noarch
{%- endif %}
{{ dependencies(data.build_deps, False, data.base_python_version, data.base_python_version) }}
{{ dependencies(data.build_deps + data.test_deps, False, data.base_python_version, data.base_python_version) }}
{%- for pv in data.python_versions %}
{{ dependencies(data.build_deps, False, pv, data.base_python_version) }}
{{ dependencies(data.build_deps + data.test_deps, False, pv, data.base_python_version) }}
{%- endfor %}
{{ dependencies(data.runtime_deps, True, data.base_python_version, data.base_python_version) }}

Expand Down
4 changes: 2 additions & 2 deletions pyp2rpm/templates/epel7.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ Source0: {{ data.url|replace(data.name, '%{pypi_name}')|replace(data.vers
{%- if not data.has_extension %}
BuildArch: noarch
{%- endif %}
{{ dependencies(data.build_deps, False, data.base_python_version, data.base_python_version,
{{ dependencies(data.build_deps + data.test_deps, False, data.base_python_version, data.base_python_version,
use_with=True, epel=True) }}
{%- for pv in data.python_versions %}
{{ dependencies(data.build_deps, False, pv, data.base_python_version,
{{ dependencies(data.build_deps + data.test_deps, False, pv, data.base_python_version,
use_with=False, epel=True) }}
{%- endfor %}

Expand Down
4 changes: 2 additions & 2 deletions pyp2rpm/templates/fedora.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ Source0: {{ data.url|replace(data.name, '%{pypi_name}')|replace(data.vers
{%- if not data.has_extension %}
BuildArch: noarch
{%- endif %}
{{ dependencies(data.build_deps, False, data.base_python_version, data.base_python_version) }}
{{ dependencies(data.build_deps + data.test_deps, False, data.base_python_version, data.base_python_version) }}
{%- for pv in data.python_versions %}
{{ dependencies(data.build_deps, False, pv, data.base_python_version, False) }}
{{ dependencies(data.build_deps + data.test_deps, False, pv, data.base_python_version, False) }}
{%- endfor %}

%description
Expand Down
4 changes: 2 additions & 2 deletions pyp2rpm/templates/fedora_subdirs.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ Source0: {{ data.url|replace(data.name, '%{pypi_name}')|replace(data.vers
{%- if not data.has_extension %}
BuildArch: noarch
{%- endif %}
{{ dependencies(data.build_deps, False, data.base_python_version, data.base_python_version) }}
{{ dependencies(data.build_deps + data.test_deps, False, data.base_python_version, data.base_python_version) }}
{%- for pv in data.python_versions %}
{{ dependencies(data.build_deps, False, pv, data.base_python_version) }}
{{ dependencies(data.build_deps + data.test_deps, False, pv, data.base_python_version) }}
{%- endfor %}
{{ dependencies(data.runtime_deps, True, data.base_python_version, data.base_python_version) }}

Expand Down
4 changes: 2 additions & 2 deletions pyp2rpm/templates/mageia.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ Source0: {{ data.url|replace(data.name, '%{pypi_name}')|replace(data.vers
{%- if not data.has_extension %}
BuildArch: noarch
{%- endif %}
{{ dependencies(data.build_deps, False, data.base_python_version, data.base_python_version) | replace("python2-devel", "python-devel") }}
{{ dependencies(data.build_deps + data.test_deps, False, data.base_python_version, data.base_python_version) | replace("python2-devel", "python-devel") }}
{%- for pv in data.python_versions %}
{{ dependencies(data.build_deps, False, pv, data.base_python_version) | replace("python2-devel", "python-devel") }}
{{ dependencies(data.build_deps + data.test_deps, False, pv, data.base_python_version) | replace("python2-devel", "python-devel") }}
{%- endfor %}
{{ dependencies(data.runtime_deps, True, data.base_python_version, data.base_python_version) | replace("python2-devel", "python-devel") }}

Expand Down
3 changes: 3 additions & 0 deletions pyp2rpm/templates/pld.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ BuildRequires: rpmbuild(macros) >= 1.714
%if %{with python{{ pv }}}
{{ dependencies(data.build_deps, False, pv, data.base_python_version, False) }}
%endif
%if %{with tests}
{{ dependencies(data.test_deps, False, pv, data.base_python_version, False) }}
%endif
{%- endfor %}
{# runtime deps for base Python version #}
{{ dependencies(data.runtime_deps, True, data.base_python_version, data.base_python_version, False) }}
Expand Down