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

Removing duplicate package entries in requirements.py and bootstrap.py #2795

Closed
wants to merge 2 commits into from
Closed

Removing duplicate package entries in requirements.py and bootstrap.py #2795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e604c24
fix for jira-533 - Removing duplicate version of pyzmq in requirement…
schandrika Sep 20, 2021
88ed32e
fix for jira-533, issue#2796
schandrika Sep 20, 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
2 changes: 1 addition & 1 deletion bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def update(operation, verbose=None, upgrade=False, offline=False, optional_requi
# We must install wheel first to eliminate a bunch of scary looking
# errors at first install.
# TODO Look towards fixing the packaging so that it works with 0.31
pip('install', ['wheel==0.30'], verbose, True, offline=offline)
# option_requirements contains wheel as first entry

# Build option_requirements separately to pass install options
build_option = '--build-option' if wheeling else '--install-option'
Expand Down
11 changes: 7 additions & 4 deletions requirements.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@
# setup.py the import may fail if setuptools in not installed
# in the global python3.

option_requirements = [('pyzmq', ['--zmq=bundled'])]
# We must install wheel first to eliminate a bunch of scary looking
# errors at first install.
# TODO Look towards fixing the packaging so that it works with 0.31
# option_requirements contains wheel as first entry and
# bootstrap.py installs contents of option_requirements first
option_requirements = [('wheel==0.30', []), ('pyzmq==22.2.1', ['--zmq=bundled'])]


install_requires = [
Expand All @@ -54,16 +59,14 @@
'python-dateutil',
'pytz',
'PyYAML',
'pyzmq',
'setuptools>=40.0.0',
# tzlocal 3.0 breaks without the backports.tzinfo package on python < 3.9 https://pypi.org/project/tzlocal/3.0/
'tzlocal==2.1',
'pyOpenSSL==19.0.0',
'cryptography==2.3',
# Cross platform way of handling changes in file/directories.
# https://github.com/Bogdanp/watchdog_gevent
'watchdog-gevent',
'wheel==0.30'
'watchdog-gevent'
]

extras_require = {
Expand Down