Skip to content

Commit b7f73ba

Browse files
authored
Security/fix requests version (#59)
* Increase requests minimum version As of security warnings in older `requests` version we decided to increase the minimum version of that libery in all requirements. * Set explicitly ubuntu to 20.04 for test As in current `ubuntu-latest` not all python version are available we switch explicitly back to `ubunt-20.04`. We also remove `python 3.6` from supported python distributions because it does not safely provide needed requests version.
1 parent d85ec66 commit b7f73ba

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
phpipam-version: ['1.4x', '1.5x']
14-
python-version: ['3.6.x', '3.7.x', '3.8.x', '3.9.x', '3.10.x']
14+
python-version: ['3.7.x', '3.8.x', '3.9.x', '3.10.x']
1515
steps:
1616
- uses: actions/checkout@v2
1717
- uses: actions/setup-python@v2

Makefile

+11-11
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ default: help
2020

2121
help:
2222
@echo "Please use \`make <target>' where <target> is one of:"
23-
@echo " help - to show this message"
24-
@echo " dist - to build the collection archive"
25-
@echo " lint - to run code linting"
26-
@echo " clean - clean workspace"
27-
@echo " doc-setup - prepare environment for creating documentation"
28-
@echo " doc - create documentation"
29-
@echo " test-setup - prepare environment for tests"
30-
@echo " test-all - run all tests"
31-
@echo " test-<test> - run a specifig test"
32-
@echo " coverage - display code coverage"
33-
@echo " coverage-xml - create xml coverage report"
23+
@echo " help - to show this message"
24+
@echo " dist - to build the collection archive"
25+
@echo " lint - to run code linting"
26+
@echo " clean - clean workspace"
27+
@echo " doc-setup - prepare environment for creating documentation"
28+
@echo " docs - create documentation"
29+
@echo " test-setup - prepare environment for tests"
30+
@echo " test-all - run all tests"
31+
@echo " test-<test> - run a specifig test"
32+
@echo " coverage - display code coverage"
33+
@echo " coverage-xml - create xml coverage report"
3434

3535
lint:
3636
flake8 phpypam

requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ changelog-cli
33
flake8
44
flake8-colors
55
flake8-docstrings
6-
requests~=2.24.0
6+
requests >=2.31,<3.0
77
inflection
88
twine
99
setuptools

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
requests
1+
requests >=2.21,<3.0
22
inflection

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
keywords='api phpipam',
2424
python_requires='>=3.6',
2525
install_requires=[
26-
'requests (>=2.21,<3.0)',
26+
'requests (>=2.31,<3.0)',
2727
],
2828
)

0 commit comments

Comments
 (0)