Merge pull request #71 from DMTF/urllib3-update

mraineri · web-flow · commit 24607cbcbac5 · 2024-01-05T15:34:42.000-05:00
Allowing for newer versions of urllib3
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,8 @@
-dist: xenial
+dist: focal
 language: python
 cache:
 - pip
 python:
-- '3.5'
-- '3.6'
 - '3.7'
 - '3.8'
 - '3.9'
diff --git a/requirements.txt b/requirements.txt
@@ -2,6 +2,6 @@ aenum
 colorama
 pyasn1
 pyasn1-modules
-requests>=2.23.0
+requests>=2.30.0
 sseclient-py
-urllib3<2
+urllib3
diff --git a/setup.py b/setup.py
@@ -30,5 +30,5 @@
         'console_scripts': ['rf_protocol_validator=redfish_protocol_validator.console_scripts:main']
     },
     install_requires=["aenum", "colorama", "pyasn1", "pyasn1-modules",
-                      "requests>=2.23.0", "sseclient-py", "urllib3<2"]
+                      "requests>=2.30.0", "sseclient-py", "urllib3"]
 )
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py35,py36,py37,py38,py39,pep8
+envlist = py37,py38,py39,pep8
 skip_missing_interpreters = True
 
 [testenv]
@@ -18,6 +18,6 @@ commands =
     --cover-html-dir=.cover {posargs}
 
 [testenv:pep8]
-basepython = python3.6
+basepython = python3.9
 deps = flake8
 commands = flake8

Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,5 @@`
`30`	`30`	`'console_scripts': ['rf_protocol_validator=redfish_protocol_validator.console_scripts:main']`
`31`	`31`	`},`
`32`	`32`	`install_requires=["aenum", "colorama", "pyasn1", "pyasn1-modules",`
`33`		`- "requests>=2.23.0", "sseclient-py", "urllib3<2"]`
	`33`	`+ "requests>=2.30.0", "sseclient-py", "urllib3"]`
`34`	`34`	`)`