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

Address deprecation warning #275

Merged
merged 8 commits into from
Apr 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ classifiers = [
"Topic :: Scientific/Engineering",
]
dependencies = [
"importlib-metadata>=4.0,<8",
"psutil>=5.9",
"Deprecated>=1.2.14",
]
Expand Down
37 changes: 12 additions & 25 deletions src/ansys/optislang/core/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,45 +26,32 @@
core
"""

import importlib.metadata
import importlib.util
import os
import sys

try:
import importlib.metadata as importlib_metadata
except ModuleNotFoundError:
import importlib_metadata

from ansys.optislang.core.logging import OslLogger

LOG = OslLogger(loglevel="ERROR", log_to_file=False, log_to_stdout=True)
LOG.logger.debug("Loaded logging module as LOG")

__version__ = importlib_metadata.version(__name__.replace(".", "-"))
__version__ = importlib.metadata.version(__name__.replace(".", "-"))

IRON_PYTHON = sys.platform == "cli"
WINDOWS = os.name == "nt"
LINUX = os.name == "posix"
PY3 = sys.version_info[0] >= 3
# First supported version of optiSLang: 2023R1
FIRST_SUPPORTED_VERSION = 231

from ansys.optislang.core.optislang import Optislang
from ansys.optislang.core.osl_process import OslServerProcess, ServerNotification

# Setup data directory
USER_DATA_PATH = None
LOCAL_DOWNLOADED_EXAMPLES_PATH = None
try:
import pkgutil

spec = pkgutil.get_loader("ansys.optislang.core")
USER_DATA_PATH = os.path.dirname(spec.get_filename())
if not os.path.exists(USER_DATA_PATH): # pragma: no cover
os.makedirs(USER_DATA_PATH)

LOCAL_DOWNLOADED_EXAMPLES_PATH = os.path.join(USER_DATA_PATH, "examples")
if not os.path.exists(LOCAL_DOWNLOADED_EXAMPLES_PATH): # pragma: no cover
os.makedirs(LOCAL_DOWNLOADED_EXAMPLES_PATH)
os.environ["OSL_EXAMPLES"] = LOCAL_DOWNLOADED_EXAMPLES_PATH
except: # pragma: no cover
pass
# Provide examples directory path
examples = "ansys.optislang.core.examples"
if spec := importlib.util.find_spec(examples):
if spec.origin:
os.environ["OSL_EXAMPLES"] = os.path.dirname(spec.origin)
else:
LOG.logger.warning(f"Could not set path to examples. Missing spec for module {examples}.")
else:
LOG.logger.warning(f"Could not set path to examples. Missing origin for module {examples}.")
2 changes: 1 addition & 1 deletion src/ansys/optislang/core/optislang.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
"""Contains Optislang class, which provides the Python API for the optiSLang app."""
from __future__ import annotations

from importlib.metadata import version
from pathlib import Path
from typing import TYPE_CHECKING, Iterable, Mapping, Optional, Sequence, Tuple, Union

from deprecated.sphinx import deprecated
from importlib_metadata import version

from ansys.optislang.core import LOG
from ansys.optislang.core.tcp.application import TcpApplicationProxy
Expand Down
Loading