Refactor

nexus-main · Jan 17, 2025 · 77ac5c5 · 77ac5c5
1 parent 74860bf
commit 77ac5c5
Show file tree

Hide file tree

Showing 25 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
@@ -67,7 +67,7 @@ jobs:
         run: |
           (cd src/Nexus && libman restore)
           dotnet publish -c Release -o app /p:GeneratePackage=true src/Nexus/Nexus.csproj
-          python -m build --wheel --outdir artifacts/package --no-isolation src/clients/python-client
+          python -m build --wheel --outdir artifacts/package --no-isolation src/clients/python
           python -m build --wheel --outdir artifacts/package --no-isolation src/extensibility/python-extensibility
 
       - name: Test

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -5,7 +5,7 @@
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,
     "python.analysis.extraPaths": [
-        "src/clients/python-client"
+        "src/clients/python"
     ],
     "editor.formatOnSave": true,
     "[aspnetcorerazor]": {

diff --git a/Nexus.sln b/Nexus.sln
@@ -28,11 +28,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nexus.Tests", "tests\Nexus.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nexus", "src\Nexus\Nexus.csproj", "{6DDD84D7-8FCF-4E49-A5DB-EAF95B0E040F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-client", "src\clients\dotnet-client\dotnet-client.csproj", "{FD8E5EA0-674B-492D-8D1E-1D0B8374B71D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet", "src\clients\dotnet\client.csproj", "{FD8E5EA0-674B-492D-8D1E-1D0B8374B71D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nexus.UI", "src\Nexus.UI\Nexus.UI.csproj", "{121840FD-19CC-4C48-86DE-AF0B6C70A089}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-client-tests", "tests\clients\dotnet-client-tests\dotnet-client-tests.csproj", "{AFCE2F13-F54D-439A-B796-DC3F32E1A12B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-tests", "tests\clients\dotnet-tests\client-tests.csproj", "{AFCE2F13-F54D-439A-B796-DC3F32E1A12B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nexus.ClientGenerator", "src\Nexus.ClientGenerator\Nexus.ClientGenerator.csproj", "{E12BE061-CCEF-48AF-8442-BC23A1C4D3F2}"
 EndProject

diff --git a/pyrightconfig.json b/pyrightconfig.json
@@ -1,16 +1,16 @@
 {
   "include": [
-    "src/clients/python-client",
+    "src/clients/python",
     "src/extensibility/python-extensibility",
-    "tests/clients/python-client-tests",
+    "tests/clients/python-tests",
     "tests/extensibility/python-extensibility-tests"
   ],
   "stubPath": "",
   "executionEnvironments": [
     {
       "root": ".",
       "extraPaths": [
-        "src/clients/python-client",
+        "src/clients/python",
         "src/extensibility/python-extensibility"
       ]
     }

diff --git a/pytest.ini b/pytest.ini
@@ -6,8 +6,8 @@ python_files=*-tests.py
 python_classes=*Tests
 python_functions=*_test
 pythonpath = 
-    src/clients/python-client
+    src/clients/python
     src/extensibility/python-extensibility
 testpaths = 
-    tests/clients/python-client-tests
+    tests/clients/python-tests
     tests/extensibility/python-extensibility-tests
diff --git a/samples/matlab/sample_export.m b/samples/matlab/sample_export.m
@@ -1,7 +1,7 @@
 %% load Nexus client
 connectorFolderPath = fullfile(tempdir, 'nexus');
 [~, ~]              = mkdir(connectorFolderPath);
-url                 = 'https://raw.githubusercontent.com/nexus-main/nexus/master/src/clients/matlab-client/NexusClient.m';
+url                 = 'https://raw.githubusercontent.com/nexus-main/nexus/master/src/clients/matlab/NexusClient.m';
 websave(fullfile(connectorFolderPath, 'NexusClient.m'), url);
 addpath(connectorFolderPath)
 

diff --git a/samples/matlab/sample_load.m b/samples/matlab/sample_load.m
@@ -1,7 +1,7 @@
 %% load Nexus client
 connectorFolderPath = fullfile(tempdir, 'nexus');
 [~, ~]              = mkdir(connectorFolderPath);
-url                 = 'https://raw.githubusercontent.com/nexus-main/nexus/master/src/clients/matlab-client/NexusClient.m';
+url                 = 'https://raw.githubusercontent.com/nexus-main/nexus/master/src/clients/matlab/NexusClient.m';
 websave(fullfile(connectorFolderPath, 'NexusClient.m'), url);
 addpath(connectorFolderPath)
 

diff --git a/src/Nexus.ClientGenerator/Program.cs b/src/Nexus.ClientGenerator/Program.cs
@@ -70,12 +70,12 @@ public static async Task Main(string[] args)
 
         // generate C# client
         var csharpGenerator = new CSharpGenerator(settings);
-        var csharpOutputFolderPath = $"{solutionRoot}src/clients/dotnet-client";
+        var csharpOutputFolderPath = $"{solutionRoot}src/clients/dotnet";
 
         csharpGenerator.Generate(csharpOutputFolderPath, document);
 
         // generate Python client
-        var pythonOutputFolderPath = $"{solutionRoot}src/clients/python-client/nexus_api";
+        var pythonOutputFolderPath = $"{solutionRoot}src/clients/python/nexus_api";
         var pythonGenerator = new PythonGenerator(settings);
 
         pythonGenerator.Generate(pythonOutputFolderPath, document);

diff --git a/src/Nexus.UI/Nexus.UI.csproj b/src/Nexus.UI/Nexus.UI.csproj
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\clients\dotnet-client\dotnet-client.csproj" />
+    <ProjectReference Include="..\clients\dotnet\client.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/clients/dotnet-client/NexusClient.g.cs → src/clients/dotnet/NexusClient.g.cs b/src/clients/dotnet-client/NexusClient.g.cs → src/clients/dotnet/NexusClient.g.cs
diff --git a/src/clients/dotnet-client/README.md → src/clients/dotnet/README.md b/src/clients/dotnet-client/README.md → src/clients/dotnet/README.md
diff --git a/...lients/dotnet-client/dotnet-client.csproj → src/clients/dotnet/client.csproj b/...lients/dotnet-client/dotnet-client.csproj → src/clients/dotnet/client.csproj
diff --git a/src/clients/matlab-client/NexusClient.m → src/clients/matlab/NexusClient.m b/src/clients/matlab-client/NexusClient.m → src/clients/matlab/NexusClient.m
diff --git a/src/clients/python-client/README.md → src/clients/python/README.md b/src/clients/python-client/README.md → src/clients/python/README.md
diff --git a/src/clients/python-client/nexus_api/V1.py → src/clients/python/nexus_api/V1.py b/src/clients/python-client/nexus_api/V1.py → src/clients/python/nexus_api/V1.py
diff --git a/...ients/python-client/nexus_api/__init__.py → src/clients/python/nexus_api/__init__.py b/...ients/python-client/nexus_api/__init__.py → src/clients/python/nexus_api/__init__.py
diff --git a/...lients/python-client/nexus_api/_client.py → src/clients/python/nexus_api/_client.py b/...lients/python-client/nexus_api/_client.py → src/clients/python/nexus_api/_client.py
diff --git a/...ients/python-client/nexus_api/_encoder.py → src/clients/python/nexus_api/_encoder.py b/...ients/python-client/nexus_api/_encoder.py → src/clients/python/nexus_api/_encoder.py
diff --git a/...lients/python-client/nexus_api/_shared.py → src/clients/python/nexus_api/_shared.py b/...lients/python-client/nexus_api/_shared.py → src/clients/python/nexus_api/_shared.py
diff --git a/src/clients/python-client/pyproject.toml → src/clients/python/pyproject.toml b/src/clients/python-client/pyproject.toml → src/clients/python/pyproject.toml
diff --git a/src/clients/python-client/setup.py → src/clients/python/setup.py b/src/clients/python-client/setup.py → src/clients/python/setup.py
diff --git a/...lients/dotnet-client-tests/ClientTests.cs → tests/clients/dotnet-tests/ClientTests.cs b/...lients/dotnet-client-tests/ClientTests.cs → tests/clients/dotnet-tests/ClientTests.cs
diff --git a/...t-client-tests/dotnet-client-tests.csproj → .../clients/dotnet-tests/client-tests.csproj b/...t-client-tests/dotnet-client-tests.csproj → .../clients/dotnet-tests/client-tests.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\clients\dotnet-client\dotnet-client.csproj" />
+    <ProjectReference Include="..\..\..\src\clients\dotnet\client.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...python-client-tests/async-client-tests.py → ...lients/python-tests/async-client-tests.py b/...python-client-tests/async-client-tests.py → ...lients/python-tests/async-client-tests.py
diff --git a/.../python-client-tests/sync-client-tests.py → ...clients/python-tests/sync-client-tests.py b/.../python-client-tests/sync-client-tests.py → ...clients/python-tests/sync-client-tests.py