diff --git a/changelog.d/75.bugfix.md b/changelog.d/75.bugfix.md new file mode 100644 index 0000000..8740941 --- /dev/null +++ b/changelog.d/75.bugfix.md @@ -0,0 +1 @@ +Properly create rpm package arch based on the arch of binary dependencies diff --git a/invirtualenv_plugins/rpm.py b/invirtualenv_plugins/rpm.py index 42d4ff9..d0e4015 100644 --- a/invirtualenv_plugins/rpm.py +++ b/invirtualenv_plugins/rpm.py @@ -184,6 +184,7 @@ def system_requirements_ok(self): def run_package_command(self, package_hashes, wheel_dir='wheels'): self.config['rpm_package']['cwd'] = os.getcwd() + self.config['rpm_package']['noarch'] = self.noarch # Get the packaging script for script in ['rpm_scripts/post_install.py', 'rpm_scripts/pre_uninstall.py']: diff --git a/setup.cfg b/setup.cfg index 7cf2ef7..cb76ba9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,11 +28,12 @@ install_requires = defusedxml distro jinja2 + pip>=21.1 requests>=2.22.0 six>=1.5 virtualenv wheel - urllib3 + urllib3>=1.26.4 configparser; python_version<"3.4" packages =