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.

Sign up for GitHub

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

Jump to bottom

Update style dependencies for 7.48 release #15618

Closed
wants to merge 2 commits into from
Closed

Update style dependencies for 7.48 release #15618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ce7adc
Update style dependencies
vivek-datadog Aug 18, 2023
624f087
Fix ruff errors
vivek-datadog Aug 18, 2023
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
1 change: 1 addition & 0 deletions datadog_checks_dev/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
* Ignore `pydantic` when bumping the dependencies ([#15597](https://github.com/DataDog/integrations-core/pull/15597))
* Stop using the TOX_ENV_NAME variable ([#15528](https://github.com/DataDog/integrations-core/pull/15528))
* Prevent `command already in progress` errors in the Postgres integration ([#15489](https://github.com/DataDog/integrations-core/pull/15489))
* Update style dependencies ([#15618](https://github.com/DataDog/integrations-core/pull/15618))

## 23.0.0 / 2023-08-10

Expand Down
4 changes: 2 additions & 2 deletions datadog_checks_dev/datadog_checks/dev/plugin/tox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# Style deps:
# We pin deps in order to make CI more stable/reliable.
BLACK_DEP = 'black==22.12.0'
RUFF_DEP = 'ruff==0.0.257'
RUFF_DEP = 'ruff==0.0.285'
# TODO: remove extra when we drop Python 2
MYPY_DEP = 'mypy[python2]==0.910'
# TODO: when we drop Python 2 and replace with --install-types --non-interactive
Expand All @@ -32,7 +32,7 @@
'types-simplejson==3.17.5',
]
# Keep in sync with: /datadog_checks_base/datadog_checks/data/agent_requirements.in and ./hatch/environment_collector.py
PYDANTIC_DEP = 'pydantic==1.10.8'
PYDANTIC_DEP = 'pydantic==2.0.2'


@tox.hookimpl
Expand Down
1 change: 0 additions & 1 deletion datadog_checks_dev/datadog_checks/dev/tooling/catalog_const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
'pdh_check', # No default metrics
'prometheus', # No default metrics
'teamcity', # No metrics
'windows_service', # No metrics
'win32_event_log', # No metrics
'wmi_check', # No default metrics
'windows_service', # No metrics
Expand Down
2 changes: 1 addition & 1 deletion datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/jmx_metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def duplicate_bean_check(bean_list):
duplicate_bean = defaultdict(list)
for beans in bean_list:
bean = beans.get("include").get("bean")
if type(bean) == list:
if isinstance(bean, list):
for b in bean:
for attr in beans.get("include").get("attribute", {}).keys():
if attr in bean_dict[b]:
Expand Down
2 changes: 1 addition & 1 deletion datadog_checks_dev/datadog_checks/dev/tooling/configuration/consumers/example.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ def write_option(option, writer, indent='', start_list=False):
example = option.get('example', [] if option.get('multiple', False) else {})
option_yaml = construct_yaml({option_name: example})

example_indent = ' ' if type(example) is list and example else ''
example_indent = ' ' if isinstance(example, list) and example else ''
for i, line in enumerate(option_yaml.splitlines()):
if not option_enabled(option):
writer.write(indent, '# ')
Expand Down
4 changes: 4 additions & 0 deletions ddev/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
* Migrate documentation commands to ddev ([#15582](https://github.com/DataDog/integrations-core/pull/15582))
* Migrate `ddev release agent integrations` to `ddev` ([#15598](https://github.com/DataDog/integrations-core/pull/15598))

***Fixed***:

* Update style dependencies ([#15618](https://github.com/DataDog/integrations-core/pull/15618))

## 3.5.0 / 2023-08-11

***Added***:
Expand Down
4 changes: 2 additions & 2 deletions ddev/src/ddev/plugin/external/hatch/environment_collector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def get_initial_config(self):
# We pin deps in order to make CI more stable/reliable.
'dependencies': [
'black==22.12.0',
'ruff==0.0.257',
'ruff==0.0.285',
# Keep in sync with: /datadog_checks_base/pyproject.toml
'pydantic==2.0.2',
],
Expand All @@ -134,7 +134,7 @@ def get_initial_config(self):
[
# TODO: remove extra when we drop Python 2
'mypy[python2]==0.910; python_version<"3"',
'mypy[python2]==1.3.0; python_version>"3"',
'mypy[python2]==1.5.1; python_version>"3"',
# TODO: remove these when drop Python 2 and replace with --install-types --non-interactive
'types-python-dateutil==2.8.2',
'types-pyyaml==5.4.10',
Expand Down
Loading