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

Fix InProcess path update #1449

Merged
merged 28 commits into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
2b9e7fa
update generated code
rlagha Feb 26, 2024
50e90ae
Revert correct licensing behavior
rafacanton Feb 26, 2024
dfade53
debug
rafacanton Feb 27, 2024
fdbc474
Move one test to other file
rafacanton Feb 27, 2024
7c8af19
update generated code
rafacanton Feb 29, 2024
cecf76f
Merge branch 'maint/update_code_for_242_rcs_242_after_on_master' of h…
rafacanton Feb 29, 2024
777909b
Temporary skip of remote_operator tests
rafacanton Feb 29, 2024
8a8301d
revert
rafacanton Feb 29, 2024
2963051
revert prints
rafacanton Feb 29, 2024
b485326
revert CI
rafacanton Feb 29, 2024
ded2061
missing print
rafacanton Feb 29, 2024
4d56b19
readd tests
rafacanton Feb 29, 2024
77455f5
Revert "missing print"
rafacanton Feb 29, 2024
a0719e1
Revert "Revert "missing print""
rafacanton Feb 29, 2024
98e465a
Revert "readd tests"
rafacanton Feb 29, 2024
cda3fc2
Fix 1
PProfizi Feb 29, 2024
3514ccc
Remote Operators Fix2
PProfizi Feb 29, 2024
fa84b09
Revert "Temporary skip of remote_operator tests"
PProfizi Feb 29, 2024
7f212b0
Remote Operators Fix3
PProfizi Feb 29, 2024
cc4d22d
Revert PATH fix for Linux
PProfizi Mar 1, 2024
07cbc3a
Revert "Temporary skip of remote_operator tests"
PProfizi Mar 1, 2024
357d10a
Merge branch 'maint/update_code_for_242_rcs_242_after_on_master' into…
PProfizi Mar 1, 2024
b9324d2
Get the right standalone suffix when PR on a "maint/update_code_for_*…
PProfizi Mar 1, 2024
3a383ae
Merge branch 'master' into fix/inprocess_path_update
PProfizi Mar 4, 2024
3a94c05
Unskip test_remote_operator.py tests
PProfizi Mar 4, 2024
d97bcb4
Fix code quality
PProfizi Mar 4, 2024
32eb91e
Fix code quality
PProfizi Mar 4, 2024
f9e248f
Fix code quality
PProfizi Mar 4, 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
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ jobs:
base_ref=${{ github.base_ref }}
suffix=${ref_name/$sub[0-9][0-9][0-9]/''}
suffix=${suffix/_on_$base_ref/''}
elif [[ "${{ github.base_ref }}" == *"$sub"* ]]; then
base_ref=${{ github.base_ref }}
suffix=${base_ref/$sub[0-9][0-9][0-9]/''}
suffix=${suffix/_on_*/''}
fi
echo "suffix=$suffix" >> "$GITHUB_OUTPUT"
fi
Expand Down
5 changes: 5 additions & 0 deletions src/ansys/dpf/core/server_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import os
import socket
import subprocess
import sys
import time
import warnings
import traceback
Expand Down Expand Up @@ -925,6 +926,10 @@ def __init__(
self._context = server_context.AvailableServerContexts.premium
pass
self.set_as_global(as_global=as_global)
# Update the python os.environment
if not os.name == "posix":
new_path = subprocess.check_output(["echo", "%PATH%"], shell=True, text=True)
os.environ["PATH"] = new_path

@property
def version(self):
Expand Down
3 changes: 0 additions & 3 deletions tests/test_remote_operator.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import pytest


@pytest.mark.skip
@pytest.mark.skipif(
not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_3_0,
reason="Connecting data from different servers is " "supported starting server version 3.0",
Expand All @@ -21,7 +20,6 @@ def test_connect_remote_operators(simple_bar):
assert np.allclose(fc[0].data, 2 * op1.outputs.fields_container()[0].data)


@pytest.mark.skip
@pytest.mark.skipif(
not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_3_0,
reason="Connecting data from different servers is " "supported starting server version 3.0",
Expand All @@ -36,7 +34,6 @@ def test_connect_3remote_operators(simple_bar):
assert np.allclose(fc[0].data, 2 * op1.outputs.fields_container()[0].data)


@pytest.mark.skip
@pytest.mark.skipif(
not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_4_0,
reason="Connecting data from different servers is " "supported starting server version 4.0",
Expand Down
Loading