Skip to content

Commit

Permalink
requirements: split up requirements files
Browse files Browse the repository at this point in the history
The requirements.txt file is used for the new installation process,
crossbar-requirements is used to fix the crossbar dependencies as well.
To use labgrid as an application, we pin the requirements of labgrid to known
tested values.
We also remove crossbar from extra_require, since we have a new installation
process for the coordinator.
We also split out requirements files for every optional feature.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
  • Loading branch information
Emantor committed Feb 15, 2018
1 parent b101155 commit 8dbcec4
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 15 deletions.
8 changes: 8 additions & 0 deletions crossbar-requirements.txt
@@ -0,0 +1,8 @@
-r requirements.txt
crossbar==17.12.1
pexpect==4.3.1
pyserial>=3.3
pyudev==0.21.0
xmodem>=0.4.5
# For crossbar
idna==2.5
18 changes: 4 additions & 14 deletions dev-requirements.txt
@@ -1,22 +1,12 @@
PyYAML==3.12
attrs==17.4.0
crossbar==17.12.1
pexpect==4.3.1
pyModbusTCP==0.1.5
pyserial>=3.3
pysnmp==4.4.4
pysnmp-mibs==0.1.6
pytest==3.4.0
pytest-cache==1.0
pytest-cov==2.5.1
pytest-isort==0.1.0
pytest-mock==1.6.3
pytest-pylint==0.7.1
pytest-runner==3.0
onewire>=0.2
pyudev==0.21.0
yapf==0.20.1
requests==2.18.4
autobahn==17.10.1
xmodem>=0.4.5
-r doc-requirements.txt
-r crossbar-requirements.txt
-r onewire-requirements.txt
-r modbus-requirements.txt
-r snmp-requirements.txt
1 change: 1 addition & 0 deletions modbus-requirements.txt
@@ -0,0 +1 @@
pyModbusTCP==0.1.5
1 change: 1 addition & 0 deletions onewire-requirements.txt
@@ -0,0 +1 @@
onewire==0.2
10 changes: 10 additions & 0 deletions requirements.txt
@@ -0,0 +1,10 @@
attrs==17.4.0
jinja2==2.10
pexpect==4.3.1
pyserial==3.4
pytest==3.4.0
pyudev==0.21.0
requests==2.18.4
xmodem==0.4.5
autobahn==17.10.1
PyYAML==3.12
1 change: 0 additions & 1 deletion setup.py
Expand Up @@ -17,7 +17,6 @@
python_requires='>=3.4',
extras_require={
'onewire': ['onewire>=0.2'],
'coordinator': ['crossbar', 'idna==2.5'],
'snmp': ['pysnmp', 'pysnmp-mibs'],
'modbus': ['pyModbusTCP'],
},
Expand Down
2 changes: 2 additions & 0 deletions snmp-requirements.txt
@@ -0,0 +1,2 @@
pysnmp==4.4.4
pysnmp-mibs==0.1.6

0 comments on commit 8dbcec4

Please sign in to comment.