Skip to content

Commit 4e00127

Browse files
authored
Merge pull request #367 from y0urself/drop-35-36-support
Dropping the support for Python 3.5 and 3.6, adding Python 3.9
2 parents 3de2900 + ada35a0 commit 4e00127

File tree

21 files changed

+212
-275
lines changed

21 files changed

+212
-275
lines changed

.circleci/config.yml

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
version: 2.1
22

33
executors:
4-
python-35:
5-
docker:
6-
- image: circleci/python:3.5
7-
working_directory: ~/repo
8-
python-36:
9-
docker:
10-
- image: circleci/python:3.6
11-
working_directory: ~/repo
4+
125
python-37:
136
docker:
147
- image: circleci/python:3.7
@@ -17,6 +10,10 @@ executors:
1710
docker:
1811
- image: circleci/python:3.8
1912
working_directory: ~/repo
13+
python-39:
14+
docker:
15+
- image: circleci/python:3.9
16+
working_directory: ~/repo
2017

2118
commands:
2219
build:
@@ -97,22 +94,6 @@ commands:
9794
poetry run twine upload dist/*
9895
9996
jobs:
100-
build-35:
101-
executor: python-35
102-
steps:
103-
- build
104-
test-35:
105-
executor: python-35
106-
steps:
107-
- test
108-
build-36:
109-
executor: python-36
110-
steps:
111-
- build
112-
test-36:
113-
executor: python-36
114-
steps:
115-
- test
11697
build-37:
11798
executor: python-37
11899
steps:
@@ -129,6 +110,14 @@ jobs:
129110
executor: python-38
130111
steps:
131112
- test
113+
build-39:
114+
executor: python-39
115+
steps:
116+
- build
117+
test-39:
118+
executor: python-39
119+
steps:
120+
- test
132121
lint-37:
133122
executor: python-37
134123
steps:
@@ -143,15 +132,13 @@ workflows:
143132
version: 2
144133
build_and_test:
145134
jobs:
146-
- build-35
147-
- test-35
148-
- build-36
149-
- test-36
150135
- build-37
151136
- test-37
152137
- lint-37
153138
- build-38
154139
- test-38
140+
- build-39
141+
- test-39
155142
build_and_deploy:
156143
jobs:
157144
- build-37:

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99
### Added
10+
* CI tests Python 3.9 now. [#367](https://github.com/greenbone/python-gvm/pull/367)
11+
1012
### Changed
1113
### Deprecated
14+
* Dropped Python 3.5 and Python 3.6 support. Python 3.7+ is required now. [#367](https://github.com/greenbone/python-gvm/pull/367)
15+
1216
### Removed
1317
### Fixed
1418
* Add missing types and functions to "latest" GMP [#369](https://github.com/greenbone/python-gvm/pull/369)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The current release of `python-gvm` can be used with all supported GOS versions.
4545

4646
### Requirements
4747

48-
Python 3.5 and later is supported.
48+
Python 3.7 and later is supported.
4949

5050
### Install using pip
5151

gvm/connections.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ def __init__(
189189
hostname: Optional[str] = DEFAULT_HOSTNAME,
190190
port: Optional[int] = DEFAULT_SSH_PORT,
191191
username: Optional[str] = DEFAULT_SSH_USERNAME,
192-
password: Optional[str] = DEFAULT_SSH_PASSWORD
192+
password: Optional[str] = DEFAULT_SSH_PASSWORD,
193193
):
194194
super().__init__(timeout=timeout)
195195

@@ -294,7 +294,7 @@ def __init__(
294294
hostname: Optional[str] = DEFAULT_HOSTNAME,
295295
port: Optional[int] = DEFAULT_GVM_PORT,
296296
password: Optional[str] = None,
297-
timeout: Optional[int] = DEFAULT_TIMEOUT
297+
timeout: Optional[int] = DEFAULT_TIMEOUT,
298298
):
299299
super().__init__(timeout=timeout)
300300

@@ -348,7 +348,7 @@ def __init__(
348348
self,
349349
*,
350350
path: Optional[str] = DEFAULT_UNIX_SOCKET_PATH,
351-
timeout: Optional[int] = DEFAULT_TIMEOUT
351+
timeout: Optional[int] = DEFAULT_TIMEOUT,
352352
):
353353
super().__init__(timeout=timeout)
354354

gvm/errors.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def __init__(
111111
message: Optional[str] = None,
112112
*,
113113
argument: Optional[str] = None,
114-
function: Optional[str] = None
114+
function: Optional[str] = None,
115115
):
116116
super().__init__(message, argument, function)
117117
self.argument = argument
@@ -146,7 +146,7 @@ def __init__(
146146
argument: str = None,
147147
arg_type: str = None,
148148
*,
149-
function: Optional[str] = None
149+
function: Optional[str] = None,
150150
):
151151
# pylint: disable=super-init-not-called
152152
self.argument = argument
@@ -180,7 +180,7 @@ def __init__(
180180
message: Optional[str] = None,
181181
*,
182182
argument: Optional[str] = None,
183-
function: Optional[str] = None
183+
function: Optional[str] = None,
184184
):
185185
super().__init__(message, argument, function)
186186
self.argument = argument

gvm/protocols/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def __init__(
3939
self,
4040
connection: GvmConnection,
4141
*,
42-
transform: Optional[Callable[[str], Any]] = None
42+
transform: Optional[Callable[[str], Any]] = None,
4343
):
4444
self._connection = connection
4545

gvm/protocols/gmp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def __init__(
7676
self,
7777
connection: GvmConnection,
7878
*,
79-
transform: Optional[Callable[[str], Any]] = None
79+
transform: Optional[Callable[[str], Any]] = None,
8080
):
8181
super().__init__(connection, transform=EtreeCheckCommandTransform())
8282
self._gmp_transform = transform

gvm/protocols/gmpv208/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def __init__(
4848
self,
4949
connection: GvmConnection,
5050
*,
51-
transform: Optional[Callable[[str], Any]] = None
51+
transform: Optional[Callable[[str], Any]] = None,
5252
):
5353
super().__init__(connection, transform=transform)
5454

gvm/protocols/gmpv208/gmpv208.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def __init__(
5353
self,
5454
connection: GvmConnection,
5555
*,
56-
transform: Optional[Callable[[str], Any]] = None
56+
transform: Optional[Callable[[str], Any]] = None,
5757
):
5858
super().__init__(connection, transform=transform)
5959

@@ -68,7 +68,7 @@ def create_agent(
6868
*,
6969
comment: Optional[str] = None,
7070
howto_install: Optional[str] = None,
71-
howto_use: Optional[str] = None
71+
howto_use: Optional[str] = None,
7272
) -> None:
7373
# pylint: disable=unused-argument
7474
deprecation(
@@ -94,7 +94,7 @@ def modify_agent(
9494
agent_id: str,
9595
*,
9696
name: Optional[str] = None,
97-
comment: Optional[str] = None
97+
comment: Optional[str] = None,
9898
) -> None:
9999
# pylint: disable=unused-argument
100100
deprecation(
@@ -147,7 +147,7 @@ def get_info_list(
147147
filter: Optional[str] = None,
148148
filter_id: Optional[str] = None,
149149
name: Optional[str] = None,
150-
details: Optional[bool] = None
150+
details: Optional[bool] = None,
151151
) -> Any:
152152
"""Request a list of security information
153153
@@ -244,7 +244,7 @@ def create_target(
244244
reverse_lookup_only: Optional[bool] = None,
245245
reverse_lookup_unify: Optional[bool] = None,
246246
port_range: Optional[str] = None,
247-
port_list_id: Optional[str] = None
247+
port_list_id: Optional[str] = None,
248248
) -> Any:
249249
"""Create a new target
250250

gvm/protocols/gmpv214/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def __init__(
5050
self,
5151
connection: GvmConnection,
5252
*,
53-
transform: Optional[Callable[[str], Any]] = None
53+
transform: Optional[Callable[[str], Any]] = None,
5454
):
5555
super().__init__(connection, transform=transform)
5656

0 commit comments

Comments
 (0)