Skip to content
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

Fix: update rpm_package noarch value based on the wheel dependencies #76

Closed
wants to merge 3 commits into from
Closed

Fix: update rpm_package noarch value based on the wheel dependencies #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9e1bc3
Fix: update rpm_package noarch value based on the wheel dependencies
Jun 9, 2021
475ac66
Update changelog
Jun 11, 2021
5f8993d
Update python dependency
Jun 11, 2021
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
1 change: 1 addition & 0 deletions changelog.d/75.bugfix.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Properly create rpm package arch based on the arch of binary dependencies
1 change: 1 addition & 0 deletions invirtualenv_plugins/rpm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']:
Expand Down
3 changes: 2 additions & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ install_requires =
defusedxml
distro
jinja2
pip>=21.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

During deployment on older OSes invirtualenv needs to be able to run with the version of pip the OS uses so we can't add a requirement for pip without breaking stuff.

requests>=2.22.0
six>=1.5
virtualenv
wheel
urllib3
urllib3>=1.26.4
configparser; python_version<"3.4"

packages =
Expand Down