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

Address deprecation warning #275

Merged
merged 8 commits into from
Apr 27, 2024
Merged

Address deprecation warning #275

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2ec4bcd
Address deprecation warning
widerschein Apr 23, 2024
7c6baad
Drop 3rd-party package importlib.metadata
widerschein Apr 24, 2024
1dfe155
Fix import
widerschein Apr 24, 2024
e9fecf7
Update optislang.py
widerschein Apr 24, 2024
3e51ebc
Update optislang.py
widerschein Apr 24, 2024
51644e9
Shorten code to provide examples path
widerschein Apr 24, 2024
643ddd0
Merge remote-tracking branch 'origin/main' into maint/deprecation-war…
widerschein Apr 24, 2024
ad42dc6
Add error path for potentially missing examples module
widerschein Apr 26, 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
27 changes: 13 additions & 14 deletions src/ansys/optislang/core/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@
__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
Expand All @@ -52,19 +50,20 @@
from ansys.optislang.core.osl_process import OslServerProcess, ServerNotification

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

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)
if spec := importlib.util.find_spec("ansys.optislang.core"):
if spec.origin:
user_data_path = os.path.dirname(spec.origin)
if not os.path.exists(user_data_path):
widerschein marked this conversation as resolved.
Show resolved Hide resolved
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
local_examples_path = os.path.join(user_data_path, "examples")
if not os.path.exists(local_examples_path):
os.makedirs(local_examples_path)

os.environ["OSL_EXAMPLES"] = local_examples_path
except Exception as e:
LOG.logger.warning(f"Could not set up path to examples: {e}")
pass
Loading