Skip to content

Commit

Permalink
Merge 556643b into 7706c91
Browse files Browse the repository at this point in the history
  • Loading branch information
ilaner committed Feb 1, 2024
2 parents 7706c91 + 556643b commit c3468eb
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ repos:
- pytest-freezegun==0.4.2 ; python_version >= "3.8" and python_version < "3.11"
- pytest==7.3.1 ; python_version >= "3.8" and python_version < "3.11"
- python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "3.11"
- python-dotenv==0.20.0 ; python_version >= "3.8" and python_version < "3.11"
- python-dotenv==1.0.1 ; python_version >= "3.8" and python_version < "3.11"
- pytz-deprecation-shim==0.1.0.post0 ; python_version >= "3.8" and python_version < "3.11"
- pytz==2023.3 ; python_version >= "3.8" and python_version < "3.11"
- pywin32==227 ; python_version >= "3.8" and python_version < "3.11" and sys_platform == "win32"
Expand Down
6 changes: 3 additions & 3 deletions demisto_sdk/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from pathlib import Path
from typing import IO, Any, Dict, List, Optional, Tuple, Union

import dotenv
import typer
from pkg_resources import DistributionNotFound, get_distribution

Expand Down Expand Up @@ -69,6 +70,8 @@
from demisto_sdk.commands.upload.upload import upload_content_entity
from demisto_sdk.utils.utils import check_configuration_file

dotenv.load_dotenv(CONTENT_PATH / ".env", override=True) # type: ignore # load .env file from the cwd

SDK_OFFLINE_ERROR_MESSAGE = (
"[red]An internet connection is required for this command. If connected to the "
"internet, un-set the DEMISTO_SDK_OFFLINE_ENV environment variable.[/red]"
Expand Down Expand Up @@ -209,9 +212,6 @@ def main(ctx, config, version, release_notes, **kwargs):
handle_deprecated_args(ctx.args)

config.configuration = Configuration()
import dotenv

dotenv.load_dotenv(CONTENT_PATH / ".env", override=True) # type: ignore # load .env file from the cwd

if platform.system() == "Windows":
logger.warning(
Expand Down
22 changes: 11 additions & 11 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Pebble = ">=4.6.3,<6.0.0"
PyPDF2 = "^1.28.6"
giturlparse = "^0.10.0"
pytest-freezegun = "^0.4.2"
python-dotenv = "^0.20.0"
python-dotenv = "^1.0.0"
importlib-resources = "^5.6.0"
dictdiffer = "^0.9.0"
imagesize = "^1.3.0"
Expand Down

0 comments on commit c3468eb

Please sign in to comment.