Skip to content

Commit c9af07c

Browse files
authored
Merge pull request #164 from bridadan/fix_requirements
Fixing a few dependency issues
2 parents 5c50c9f + 9f4c8c6 commit c9af07c

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

azure-pipelines.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,17 @@ jobs:
6161
versionSpec: $(python.version)
6262
architecture: x64
6363
-
64-
script: 'python -m pip install --upgrade pip && pip install -r test_requirements.txt && pip install pytest'
64+
script: 'python -m pip install --upgrade pip && pip install -r test_requirements.txt'
6565
displayName: 'Install mbed-os test dependencies'
6666
-
6767
script: |
6868
pip install --user flake8==3.7.3
6969
python -m flake8
7070
condition: eq(variables['extraActions'], 'true')
7171
displayName: 'Enforce code style'
72+
-
73+
script: 'pip install --user "urllib3<1.25"'
74+
displayName: 'Fix dependency issue for requests package'
7275
-
7376
script: "python -m coverage run setup.py test"
7477
displayName: "Test mbed-os-tools"

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def read(fname):
5757
"six>=1.0,<2.0",
5858
"colorama>=0.3,<0.5",
5959
],
60-
tests_require=["mock>=2", "pytest>=3"],
60+
tests_require=read("test_requirements.txt").splitlines(),
6161
extras_require={
6262
"pyocd": ["pyocd==0.14.0"]
6363
},

test_requirements.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
coverage
2-
coveralls
1+
coverage>=4,<5
2+
coveralls>=1,<2
3+
mock>=2,<4
4+
pytest>=3,<5

0 commit comments

Comments
 (0)