Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Python 3.11 #2801

Merged
merged 155 commits into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
d3e3d52
python311
Feb 26, 2023
c3453dc
added CI to python 3.11
Feb 26, 2023
ff9b047
add CI
Feb 26, 2023
8a4bc29
check pylint version
Feb 26, 2023
e57a3ce
check 2.13
Feb 26, 2023
67b6bdc
str
Feb 26, 2023
19fe472
marketplace str
Feb 26, 2023
b34e2c1
try with OR
Feb 26, 2023
13a82cd
OR
Feb 26, 2023
f00a94c
fix
Feb 26, 2023
64a561e
test
Feb 26, 2023
a614e65
try to lock gitpython
Feb 28, 2023
8220abc
trigger build
Feb 28, 2023
625b099
Fix
Mar 1, 2023
4297f68
3.11 support
Mar 1, 2023
cfdde8e
test
Mar 1, 2023
3baf2eb
no update
Mar 1, 2023
699d476
lock
Mar 1, 2023
9c1db32
Merge remote-tracking branch 'origin/master' into support-python-311
Mar 5, 2023
2403ce6
fix
Mar 5, 2023
e5392d1
SLACK
Mar 5, 2023
799cb52
ignore dup files
Mar 5, 2023
9d842f7
fix path
Mar 5, 2023
497ac9c
fix
May 10, 2023
3b1a2a7
fix
May 10, 2023
e5aa79f
Merge branch 'master' of github.com:demisto/demisto-sdk into support-…
dorschw Jul 25, 2023
856e2e0
undo autouse
dorschw Jul 25, 2023
9d723d4
changelog
dorschw Jul 25, 2023
9702c1d
Merge branch 'master' of github.com:demisto/demisto-sdk into support-…
dorschw Sep 20, 2023
61b59f9
type:ignore in progressbar
dorschw Sep 20, 2023
785b44d
no pre commit
Sep 20, 2023
a48e862
Merge branch 'master' of https://github.com/demisto/demisto-sdk into …
dorschw Mar 4, 2024
56a69da
update matrix
dorschw Mar 4, 2024
95d5c36
helpful comment
dorschw Mar 4, 2024
a8d8630
undo changelog
dorschw Mar 4, 2024
b4f7726
add test `id`s
dorschw Mar 4, 2024
4c32b5a
improve test ids
dorschw Mar 4, 2024
6632d65
xfail
dorschw Mar 4, 2024
1b25816
Merge branch 'master' into support-python-311
dorschw Mar 10, 2024
95a0b25
Merge branch 'master' into support-python-311
dorschw Mar 10, 2024
c57fe4b
modify UTs
dorschw Mar 10, 2024
04968f3
Merge branch 'master' of https://github.com/demisto/demisto-sdk into …
dorschw Mar 10, 2024
3e941cd
fix UTs
dorschw Mar 10, 2024
86ee9f0
changelog
dorschw Mar 10, 2024
315a7af
fix UTs
dorschw Mar 11, 2024
7302d96
fix more UTs
dorschw Mar 12, 2024
184b2c6
format
dorschw Mar 12, 2024
3fcbbb8
Merge branch 'master' of https://github.com/demisto/demisto-sdk into …
dorschw Mar 12, 2024
d13ab40
fix more checker UTs
dorschw Mar 12, 2024
13e6b53
bump autopep8 dependency to fix UT failure
dorschw Mar 12, 2024
49530ef
StrEnum
dorschw Mar 12, 2024
7678f02
pre-commit hook rev
dorschw Mar 12, 2024
612e46c
fix `BA110` UT
dorschw Mar 12, 2024
b3c2d22
fix `BA110` UT
dorschw Mar 12, 2024
97f3a37
strenum
dorschw Mar 13, 2024
35b634f
update dependencies
dorschw Mar 14, 2024
30a233b
fix mypy
dorschw Mar 14, 2024
8e2e50a
fix mypy
dorschw Mar 14, 2024
2993725
fix pre-commit mypy
dorschw Mar 14, 2024
98728c0
update CI env py
dorschw Mar 14, 2024
52fedb1
Merge branch 'master' of https://github.com/demisto/demisto-sdk into …
dorschw Mar 14, 2024
ed43762
poetry fix, pre-commit
dorschw Mar 14, 2024
3693bf3
Update .pre-commit-config.yaml
ilaner Mar 14, 2024
3ad7e94
remove mypy temp
Mar 14, 2024
9ae1e47
remove mypy temp2
Mar 14, 2024
823a761
try fix content init
dorschw Mar 14, 2024
5c2c9a3
fix import
dorschw Mar 14, 2024
80e43da
fix import
dorschw Mar 14, 2024
6a479d9
init
dorschw Mar 14, 2024
8dc7842
more StrEnum fixes, less diff
dorschw Mar 14, 2024
965ac90
update pytest to 2.17 for official 3.11 support
dorschw Mar 14, 2024
41ed8d4
mypy is back
dorschw Mar 14, 2024
b1336d5
flake8 version
dorschw Mar 14, 2024
3e76161
name
dorschw Mar 14, 2024
47e473b
test pre-commit
dorschw Mar 17, 2024
b6e6307
use potery
dorschw Mar 17, 2024
b2a5f62
run natively
dorschw Mar 17, 2024
1cde795
poetry lock
dorschw Mar 17, 2024
678767c
bring back `pre-commit/action`
dorschw Mar 17, 2024
777f3b2
Merge branch 'master' into support-python-311
dorschw Mar 17, 2024
26a1806
change pre-commit ci setup
dorschw Mar 17, 2024
490dbcd
Merge branch 'support-python-311' of https://github.com/demisto/demis…
dorschw Mar 17, 2024
130eb78
remove file
dorschw Mar 17, 2024
e17efe6
test rev
dorschw Mar 17, 2024
119b87f
change depth
dorschw Mar 17, 2024
eb95367
fix ref
dorschw Mar 17, 2024
a07e0fe
fix depth
dorschw Mar 17, 2024
be55970
fetch more content
dorschw Mar 17, 2024
f3c1b13
fix typing issue
dorschw Mar 17, 2024
a093dff
fix syntax
dorschw Mar 17, 2024
9f8a829
remove pre-commit all
dorschw Mar 17, 2024
80a1008
update urllib3
dorschw Mar 18, 2024
56ef85c
types-setuptools
dorschw Mar 18, 2024
dcd8bea
types-pytz
dorschw Mar 18, 2024
e6aa956
types-requests
dorschw Mar 18, 2024
7df9640
Merge branch 'ds-update-deps-311' of https://github.com/demisto/demis…
dorschw Mar 18, 2024
8247a66
remove most `types-` deps
dorschw Mar 18, 2024
6bb417c
lock & update dependencies
dorschw Mar 19, 2024
9acd10c
Merge branch 'master' of https://github.com/demisto/demisto-sdk into …
dorschw Mar 19, 2024
841ad16
undo unintended change from master
dorschw Mar 19, 2024
918bdb0
update `types-setuptools`
dorschw Mar 19, 2024
c93dfac
update packaging
dorschw Mar 19, 2024
67af8ba
update deps
dorschw Mar 19, 2024
2b0cf4f
fixes
dorschw Mar 20, 2024
66a6be1
update docker version
dorschw Mar 21, 2024
3608d28
add some `types-` back
dorschw Mar 21, 2024
d157a07
add some `types-` back
dorschw Mar 21, 2024
bfd8585
format
dorschw Mar 21, 2024
002a2e8
ruff
dorschw Mar 21, 2024
9f6131b
mypy fixes
dorschw Mar 21, 2024
c5c71b9
Merge branch 'master' of https://github.com/demisto/demisto-sdk into …
dorschw Mar 21, 2024
f92b7fb
Merge branch 'master' of https://github.com/demisto/demisto-sdk into …
dorschw Mar 27, 2024
0d7fc61
Merge branch 'master' into support-python-311
dorschw Apr 4, 2024
b38c15d
poetry lock with docker 6
dorschw Apr 4, 2024
93214d9
add toml
dorschw Apr 4, 2024
248088a
lock werkzeug
dorschw Apr 4, 2024
986010c
fix mypy
dorschw Apr 4, 2024
d8b3460
bump CI to 3.11
dorschw Apr 4, 2024
f4139ed
retrigger
dorschw Apr 4, 2024
2ae0b4d
black
dorschw Apr 4, 2024
3cd5940
fix black
dorschw Apr 4, 2024
72c25f1
downgrade pre-commit CI to 3.10
dorschw Apr 4, 2024
33bee15
downgrade coverage to work
Apr 4, 2024
817d959
add mock address
Apr 4, 2024
59c4afa
add mocks to test
Apr 4, 2024
0b44309
add docker image flag
Apr 11, 2024
564ea23
add docker image and docker flag
Apr 15, 2024
a4aa68b
comment
Apr 15, 2024
b395a47
Merge branch 'master' of https://github.com/demisto/demisto-sdk into …
dorschw Apr 15, 2024
fc2fc6a
fixes
Apr 15, 2024
4cc24ed
fix
Apr 15, 2024
1c9f1cf
refactor names
Apr 15, 2024
90ef385
RN
Apr 15, 2024
f6919bd
lower integration batch
Apr 15, 2024
e513acb
tiny fixes
dorschw Apr 15, 2024
6ae4644
fix
Apr 15, 2024
264c5f9
if obj
Apr 15, 2024
5f3a5d0
tiny fixes
dorschw Apr 15, 2024
4fe1b22
Merge remote-tracking branch 'origin/docker_image_flag_to_precommit' …
dorschw Apr 15, 2024
7f4c36b
Merge remote-tracking branch 'origin/master' into docker_image_flag_t…
Apr 15, 2024
a25b73c
docstrings
Apr 15, 2024
109464d
Merge remote-tracking branch 'origin/docker_image_flag_to_precommit' …
dorschw Apr 15, 2024
a6a4041
fix test
Apr 15, 2024
bf7f93f
Merge remote-tracking branch 'origin/docker_image_flag_to_precommit' …
dorschw Apr 15, 2024
72e74e4
Merge branch 'master' of https://github.com/demisto/demisto-sdk into …
dorschw Apr 16, 2024
d660eff
CR changes
dorschw Apr 16, 2024
1f04905
Delete .changelog/4223.yml
dorschw Apr 16, 2024
3b0255d
Merge branch 'master' of https://github.com/demisto/demisto-sdk into …
dorschw Apr 24, 2024
6e8d7e6
Merge branch 'master' of https://github.com/demisto/demisto-sdk into …
dorschw Apr 30, 2024
abd20d9
fix UT
dorschw Apr 30, 2024
94c0951
Merge branch 'master' into support-python-311
dorschw Apr 30, 2024
57e38c2
Merge branch 'master' of https://github.com/demisto/demisto-sdk into …
dorschw May 6, 2024
0f6e2fd
poetry lock
dorschw May 6, 2024
5277aa6
use content/master as ref
dorschw May 7, 2024
02f0726
Merge branch 'master' into support-python-311
dorschw May 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ parameters:
default: v4 # Change this parameter to clear cache.
global-docker-image:
type: string
default: cimg/python:3.10-node
default: cimg/python:3.10-node # TODO: change to 3.11 when content is updated
pythonversion_latest:
type: string
default: "3.10"
default: "3.11"


references:
Expand Down Expand Up @@ -471,13 +471,13 @@ workflows:
<<: *tag_filter
matrix:
parameters:
pythonversion: ["3.8", "3.9", "3.10"]
pythonversion: ["3.8", "3.9", "3.10", "3.11"]
name: run-unit-tests-<< matrix.pythonversion >>
- run-integration-tests:
<<: *tag_filter
matrix:
parameters:
pythonversion: ["3.8", "3.9", "3.10"]
pythonversion: ["3.8", "3.9", "3.10", "3.11"]
name: run-integration-tests-<< matrix.pythonversion >>
- validate-files:
<<: *tag_filter
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Added the value `3` (out of bounds) to the `onChangeRepAlg` and `reputationCalc` fields under the `IncidentType` and `GenericType` schemas. **validate** will allow using it now.
* Added support for running **lint** in multiple native-docker images.
* Fixed an issue where **doc-review** required dot suffixes in release notes describing new content.
* Added support for Python 3.11.

## 1.10.4
* Added support for running **lint** in multiple native-docker images.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import re
from typing import List, Optional, Union

from packaging.version import LegacyVersion, Version, parse
from packaging.version import Version, parse
from wcmatch.pathlib import Path

from demisto_sdk.commands.common.constants import (
Expand Down Expand Up @@ -78,7 +78,7 @@ def readme(self) -> Optional[Readme]:
return self._readme

@property
def from_version(self) -> Union[Version, LegacyVersion]:
def from_version(self) -> Version:
"""Object from_version attribute.

Returns:
Expand All @@ -91,7 +91,7 @@ def from_version(self) -> Union[Version, LegacyVersion]:
return parse(self.get("fromVersion", DEFAULT_CONTENT_ITEM_FROM_VERSION))

@property
def to_version(self) -> Union[Version, LegacyVersion]:
def to_version(self) -> Version:
"""Object to_version attribute.

Returns:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import re
from typing import List, Optional, Union

from packaging.version import LegacyVersion, Version, parse
from packaging.version import Version, parse
from wcmatch.pathlib import EXTGLOB, Path

from demisto_sdk.commands.common.constants import (
Expand Down Expand Up @@ -77,7 +77,7 @@ def readme(self) -> Optional[Readme]:
return self._readme

@property
def from_version(self) -> Union[Version, LegacyVersion]:
def from_version(self) -> Version:
"""Object from_version attribute.

Returns:
Expand All @@ -90,7 +90,7 @@ def from_version(self) -> Union[Version, LegacyVersion]:
return parse(self.get("fromversion", DEFAULT_CONTENT_ITEM_FROM_VERSION))

@property
def to_version(self) -> Union[Version, LegacyVersion]:
def to_version(self) -> Version:
"""Object to_version attribute.

Returns:
Expand Down
4 changes: 2 additions & 2 deletions demisto_sdk/commands/common/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import urllib3
from bs4.dammit import UnicodeDammit
from git.types import PathLike
from packaging.version import LegacyVersion, Version, parse
from packaging.version import Version, parse
from pebble import ProcessFuture, ProcessPool
from requests.exceptions import HTTPError
from ruamel.yaml.comments import CommentedSeq
Expand Down Expand Up @@ -2320,7 +2320,7 @@ def open_id_set_file(id_set_path):
return id_set


def get_demisto_version(client: demisto_client) -> Union[Version, LegacyVersion]:
def get_demisto_version(client: demisto_client) -> Version:
"""
Args:
demisto_client: A configured demisto_client instance
Expand Down
Loading