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.

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

Hotfix/modbustk #3085

Open
wants to merge 25 commits into
base: develop
Choose a base branch
from
Open
Changes from 4 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6bbd78f
pinned greenlet to compatible version for gevent
acedrew Nov 18, 2020
d65994a
fix for #2618
schandrika Feb 23, 2021
619dcfd
documented requirement for web packages for volttron 7.x. github iss…
schandrika Feb 23, 2021
b51576c
documented requirement for web packages for volttron 7.x. github iss…
schandrika Feb 23, 2021
9a7c90e
Merge pull request #2620 from schandrika/voltrron7_fix
shwethanidd Feb 23, 2021
36d887e
Merge branch 'VOLTTRON:releases/7.x' into releases/7.x
acedrew May 14, 2021
41eac5e
Pin 7.x branch #2795
craig8 Sep 19, 2021
951fe39
Merge branch '7x_rabbit_update' of https://github.com/shwethanidd/vol…
craig8 Sep 19, 2021
09b9d34
Updating rabbitmq dependency script since the rabbitmq server repos h…
shwethanidd Sep 21, 2021
bc81e78
Merge pull request #2800 from shwethanidd/7x_rabbit_update
craig8 Sep 21, 2021
5f19a74
Moved all requirements to requirements.py rather than split across bo…
craig8 Sep 21, 2021
b0f8192
Merge pull request #2799 from craig8/pin_v7_x
shwethanidd Sep 21, 2021
e861697
Fixing requirements.py related to wheels entry in option requirements
shwethanidd Sep 21, 2021
c540747
Merge pull request #2801 from shwethanidd/7x_rabbit_update
shwethanidd Sep 21, 2021
5bb3d9b
seems to be working, implemented only for reading
acedrew Apr 15, 2022
27442df
Merge branch 'hotfix-modbus-tk' into hotfix/modbustk
bonicim Apr 25, 2022
f4661af
Merge remote-tracking branch 'upstream/main' into hotfix/modbustk
bonicim Apr 25, 2022
dda15f0
Update logs
bonicim Apr 25, 2022
0ccf2a1
Fix reference from master_driver to platform_driver
bonicim Apr 25, 2022
0401b75
Update init for modbustk
bonicim May 3, 2022
b863431
Update drivers
bonicim May 4, 2022
ccba16d
Add test configs for modbus
bonicim May 10, 2022
a2b1d08
Add lock counter and logs
bonicim May 24, 2022
51eacea
Merge remote-tracking branch 'origin/develop' into hotfix/modbustk
bonicim May 9, 2024
ba5d6b1
Merge upstream develop.
rlutes Oct 11, 2024
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
5 changes: 0 additions & 5 deletions bootstrap.py
Original file line number Diff line number Diff line change
@@ -130,11 +130,6 @@ def update(operation, verbose=None, upgrade=False, offline=False, optional_requi
path = os.path.dirname(__file__) or '.'
_log.info('%sing required packages', 'Build' if wheeling else 'Install')

# 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)

# Build option_requirements separately to pass install options
build_option = '--build-option' if wheeling else '--install-option'
for requirement, options in option_requirements:
144 changes: 52 additions & 92 deletions requirements.py
Original file line number Diff line number Diff line change
@@ -36,102 +36,62 @@
# under Contract DE-AC05-76RL01830
# }}}

# These need to be importable by bootstrap.py. If we put them in
# setup.py the import may fail if setuptools in not installed
# in the global python3.

option_requirements = [
('pyzmq', ['--zmq=bundled']),
]
extras_require = { 'crate': ['crate==0.26.0'],
'databases': [ 'mysql-connector-python-rf==2.2.2',
'pymongo==3.7.2',
'bson==0.5.7',
'crate==0.26.0',
'influxdb==5.3.1',
'psycopg2-binary==2.8.6'],
'dnp3': ['pydnp3'],
'documentation': [ 'mock==4.0.3',
'Sphinx==4.1.2',
'sphinx-rtd-theme==0.5.2',
'sphinx==3.3.0',
'm2r2==0.3.1'],
'drivers': [ 'pymodbus==2.3.0',
'bacpypes==0.16.7',
'modbus-tk==1.1.1',
'pyserial==3.4'],
'influxdb': ['influxdb==5.3.1'],
'market': ['numpy==1.19.5', 'transitions==0.8.8'],
'mongo': ['pymongo==3.7.2',
'bson==0.5.7'],
'mysql': ['mysql-connector-python-rf==2.2.2'],
'pandas': ['numpy==1.19.5', 'pandas==1.1.5'],
'postgres': ['psycopg2-binary==2.8.6'],
'testing': [ 'mock==4.0.3',
'pytest==6.2.4',
'pytest-timeout==1.4.2',
'websocket-client==1.2.1',
'deepdiff==5.5.0'],
'weather': ['Pint==0.17'],
'web': [ 'ws4py==0.5.1',
'PyJWT==1.7.1',
'Jinja2==2.11.2',
'passlib==1.7.2',
'argon2-cffi==20.1.0',
'Werkzeug==1.0.1']}

install_requires = [
'gevent==20.6.1',
'grequests',
'greenlet==0.4.16',
install_requires = [ 'gevent==20.6.0',
'grequests==0.6.0',
'idna<3,>=2.5',
'requests==2.23.0',
'ply',
'psutil',
'python-dateutil',
'pytz',
'PyYAML',
'pyzmq',
'setuptools',
'tzlocal',
'ply==3.11',
'psutil==5.7.0',
'python-dateutil==2.8.1',
'pytz==2020.1',
'PyYAML==5.3.1',
'pyzmq==19.0.1',
'setuptools==39.0.1',
'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==0.1.1',
'wheel==0.30']

option_requirements = [('wheel==0.30'), ('pyzmq==19.0.1', ['--zmq=bundled'])]



extras_require = {
'crate': [ # crate databases
'crate'
],
'databases': [ # Support for all known databases
'mysql-connector-python-rf',
'pymongo',
'crate',
'influxdb',
'psycopg2-binary'
],
'dnp3': [ # dnp3 agent requirements.
'pydnp3'
],
'documentation': [ # Requirements for building the documentation
'mock',
'mysql-connector-python-rf',
'psutil',
'pymongo',
'Sphinx',
'recommonmark',
'sphinx-rtd-theme'
],
'drivers': [
'pymodbus',
'bacpypes==0.16.7',
'modbus-tk',
'pyserial'
],
'influxdb': [ # influxdb historian requirements.
'influxdb'
],
'market': [ # Requirements for the market service
'numpy',
'transitions',
],
'mongo': [ # mongo databases
'pymongo',
],
'mysql': [ # mysql databases
'mysql-connector-python-rf',
],
'pandas': [ # numpy and pandas for applications
'numpy',
'pandas',
],
'postgres': [ # numpy and pandas for applications
'psycopg2-binary'
],
'testing': [ # Testing infrastructure dependencies
'mock',
'pytest',
'pytest-timeout',
'websocket-client',
# Allows us to compare nested dictionaries easily.
'deepdiff'
],
'web': [ # Web support for launching web based agents including ssl and json web tokens.
'ws4py',
'PyJWT',
'Jinja2',
'passlib',
'argon2-cffi',
'Werkzeug'
],
'weather': [
'Pint'
],
}