From 96f7b8dc0395a87e72f7075851ac3027a17efa11 Mon Sep 17 00:00:00 2001 From: Irene Bandera Date: Wed, 11 Sep 2024 13:35:51 +0200 Subject: [PATCH 01/10] update script_dir in setup.cfg for ddsrouter_yaml_validator Signed-off-by: Irene Bandera --- tools/ddsrouter_yaml_validator/setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ddsrouter_yaml_validator/setup.cfg b/tools/ddsrouter_yaml_validator/setup.cfg index 3c1f99b9e..829ee81ed 100644 --- a/tools/ddsrouter_yaml_validator/setup.cfg +++ b/tools/ddsrouter_yaml_validator/setup.cfg @@ -1,4 +1,4 @@ [develop] -script_dir=$base/bin +script_dir=$base/bin/ddsrouter_yaml_validator [install] -install_scripts=$base/bin +install_scripts=$base/bin/ddsrouter_yaml_validator From 53fb36d4d7056c842e8dfeac1198a4819af7aa27 Mon Sep 17 00:00:00 2001 From: Irene Bandera Date: Wed, 11 Sep 2024 14:01:59 +0200 Subject: [PATCH 02/10] Add ddsrouter_yaml_validator to code_packages_names in reusable-workflow.yml Signed-off-by: Irene Bandera --- .github/workflows/reusable-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-workflow.yml b/.github/workflows/reusable-workflow.yml index 6444314ca..d0ad33a2a 100644 --- a/.github/workflows/reusable-workflow.yml +++ b/.github/workflows/reusable-workflow.yml @@ -60,7 +60,7 @@ on: type: string env: - code_packages_names: 'ddsrouter_core ddsrouter_yaml ddsrouter_tool' + code_packages_names: 'ddsrouter_core ddsrouter_yaml ddsrouter_tool ddsrouter_yaml_validator' docs_packages_names: 'ddsrouter_docs' jobs: From b57dc9871093aa90f82ff1d0ca5d554b5fc1260e Mon Sep 17 00:00:00 2001 From: Irene Bandera Date: Wed, 11 Sep 2024 14:16:12 +0200 Subject: [PATCH 03/10] Restore script_dir in setup.cfg for ddsrouter_yaml_validator Signed-off-by: Irene Bandera --- tools/ddsrouter_yaml_validator/setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ddsrouter_yaml_validator/setup.cfg b/tools/ddsrouter_yaml_validator/setup.cfg index 829ee81ed..3c1f99b9e 100644 --- a/tools/ddsrouter_yaml_validator/setup.cfg +++ b/tools/ddsrouter_yaml_validator/setup.cfg @@ -1,4 +1,4 @@ [develop] -script_dir=$base/bin/ddsrouter_yaml_validator +script_dir=$base/bin [install] -install_scripts=$base/bin/ddsrouter_yaml_validator +install_scripts=$base/bin From 35e1cd00f2237eebc3674e5d1f2cce2fd2f8c72f Mon Sep 17 00:00:00 2001 From: Irene Bandera Date: Wed, 11 Sep 2024 14:28:35 +0200 Subject: [PATCH 04/10] Install jsonchema for windows Signed-off-by: Irene Bandera --- .github/actions/project_dependencies/action.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/actions/project_dependencies/action.yml b/.github/actions/project_dependencies/action.yml index 4a4051d71..b35e33900 100644 --- a/.github/actions/project_dependencies/action.yml +++ b/.github/actions/project_dependencies/action.yml @@ -45,6 +45,12 @@ runs: with: cmake_build_type: ${{ inputs.cmake_build_type }} + - name: Install Python dependencies + uses: eProsima/eProsima-CI/multiplatform/install_python_packages@v0 + if: runner.os == 'Windows' + with: + packages: jsonschema + - name: Install yaml cpp dependency uses: eProsima/eProsima-CI/multiplatform/install_yamlcpp@v0 with: From f90a087c0d65d5468182c6c96356c4eab25200e5 Mon Sep 17 00:00:00 2001 From: Irene Bandera Date: Wed, 11 Sep 2024 15:18:30 +0200 Subject: [PATCH 05/10] Add python dependencies for windows Signed-off-by: Irene Bandera --- .github/actions/project_dependencies/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/project_dependencies/action.yml b/.github/actions/project_dependencies/action.yml index b35e33900..e7275b1cb 100644 --- a/.github/actions/project_dependencies/action.yml +++ b/.github/actions/project_dependencies/action.yml @@ -49,7 +49,7 @@ runs: uses: eProsima/eProsima-CI/multiplatform/install_python_packages@v0 if: runner.os == 'Windows' with: - packages: jsonschema + packages: jsonschema pytest pywin32 - name: Install yaml cpp dependency uses: eProsima/eProsima-CI/multiplatform/install_yamlcpp@v0 From a52016bd91e193477c86188218160551002383ca Mon Sep 17 00:00:00 2001 From: Irene Bandera Date: Wed, 11 Sep 2024 15:22:48 +0200 Subject: [PATCH 06/10] Add setuptools to project dependencies Signed-off-by: Irene Bandera --- .github/actions/project_dependencies/action.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/actions/project_dependencies/action.yml b/.github/actions/project_dependencies/action.yml index e7275b1cb..1250d2671 100644 --- a/.github/actions/project_dependencies/action.yml +++ b/.github/actions/project_dependencies/action.yml @@ -51,6 +51,11 @@ runs: with: packages: jsonschema pytest pywin32 + - name: Install setuptools + uses: eProsima/eProsima-CI/multiplatform/install_python_packages@v0 + with: + packages: setuptools + - name: Install yaml cpp dependency uses: eProsima/eProsima-CI/multiplatform/install_yamlcpp@v0 with: From 757a82a0358a423cd8753e0d794426f03c578843 Mon Sep 17 00:00:00 2001 From: Irene Bandera Date: Wed, 11 Sep 2024 16:00:31 +0200 Subject: [PATCH 07/10] Setup Python version to 3.11 Signed-off-by: Irene Bandera --- .github/actions/project_dependencies/action.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/actions/project_dependencies/action.yml b/.github/actions/project_dependencies/action.yml index 1250d2671..732ae8d27 100644 --- a/.github/actions/project_dependencies/action.yml +++ b/.github/actions/project_dependencies/action.yml @@ -40,6 +40,11 @@ runs: using: composite steps: + - name: Setup Python version + uses: eProsima/eProsima-CI/external/setup-python@v0 + with: + python-version: '3.11' + - name: Install Fast DDS dependencies uses: eProsima/eProsima-CI/multiplatform/install_fastdds_dependencies@v0 with: From 777ca4e7a79d91fd54231db3924959299540dbfa Mon Sep 17 00:00:00 2001 From: Irene Bandera Date: Wed, 11 Sep 2024 17:23:02 +0200 Subject: [PATCH 08/10] Refactor setup.py Signed-off-by: Irene Bandera --- tools/ddsrouter_yaml_validator/setup.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/ddsrouter_yaml_validator/setup.py b/tools/ddsrouter_yaml_validator/setup.py index 30a938c32..a84c801e3 100644 --- a/tools/ddsrouter_yaml_validator/setup.py +++ b/tools/ddsrouter_yaml_validator/setup.py @@ -15,14 +15,17 @@ ('share/' + package_name, [package_name + '/ddsrouter_config_schema.json']), ('share/' + package_name, [package_name + '/full_example.yaml']) ], - install_requires=['setuptools'], + install_requires=[], zip_safe=True, maintainer='eprosima', maintainer_email='juanlopez@eprosima.com', description='Tool used for validating DDS-Router configuration files', license='Apache License, Version 2.0', - tests_require=['pytest'], - test_suite='tests', + extras_require={ + 'test': [ + 'pytest', # Add your testing dependencies here + ], + }, entry_points={ 'console_scripts': [ 'ddsrouter_yaml_validator = ddsrouter_yaml_validator.ddsrouter_yaml_validator:main', From a52668b10c73e8ce4a54f924c0587270601b25fc Mon Sep 17 00:00:00 2001 From: Irene Bandera Date: Wed, 11 Sep 2024 17:29:45 +0200 Subject: [PATCH 09/10] Install jsonschema always Signed-off-by: Irene Bandera --- .github/actions/project_dependencies/action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/project_dependencies/action.yml b/.github/actions/project_dependencies/action.yml index 732ae8d27..4cda28ae7 100644 --- a/.github/actions/project_dependencies/action.yml +++ b/.github/actions/project_dependencies/action.yml @@ -54,12 +54,12 @@ runs: uses: eProsima/eProsima-CI/multiplatform/install_python_packages@v0 if: runner.os == 'Windows' with: - packages: jsonschema pytest pywin32 + packages: pytest pywin32 - - name: Install setuptools + - name: Install setuptools and jsonschema uses: eProsima/eProsima-CI/multiplatform/install_python_packages@v0 with: - packages: setuptools + packages: setuptools jsonschema - name: Install yaml cpp dependency uses: eProsima/eProsima-CI/multiplatform/install_yamlcpp@v0 From 353efbdcac9a2b1b61dc17e88e6ab823f5502c31 Mon Sep 17 00:00:00 2001 From: Irene Bandera Date: Thu, 12 Sep 2024 08:24:45 +0200 Subject: [PATCH 10/10] Remove unnecessary changes Signed-off-by: Irene Bandera --- .github/actions/project_dependencies/action.yml | 15 ++------------- tools/ddsrouter_yaml_validator/setup.py | 2 +- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/actions/project_dependencies/action.yml b/.github/actions/project_dependencies/action.yml index 4cda28ae7..994ee08b2 100644 --- a/.github/actions/project_dependencies/action.yml +++ b/.github/actions/project_dependencies/action.yml @@ -40,26 +40,15 @@ runs: using: composite steps: - - name: Setup Python version - uses: eProsima/eProsima-CI/external/setup-python@v0 - with: - python-version: '3.11' - - name: Install Fast DDS dependencies uses: eProsima/eProsima-CI/multiplatform/install_fastdds_dependencies@v0 with: cmake_build_type: ${{ inputs.cmake_build_type }} - - name: Install Python dependencies - uses: eProsima/eProsima-CI/multiplatform/install_python_packages@v0 - if: runner.os == 'Windows' - with: - packages: pytest pywin32 - - - name: Install setuptools and jsonschema + - name: Install jsonschema uses: eProsima/eProsima-CI/multiplatform/install_python_packages@v0 with: - packages: setuptools jsonschema + packages: jsonschema - name: Install yaml cpp dependency uses: eProsima/eProsima-CI/multiplatform/install_yamlcpp@v0 diff --git a/tools/ddsrouter_yaml_validator/setup.py b/tools/ddsrouter_yaml_validator/setup.py index a84c801e3..9fc8377a6 100644 --- a/tools/ddsrouter_yaml_validator/setup.py +++ b/tools/ddsrouter_yaml_validator/setup.py @@ -15,7 +15,7 @@ ('share/' + package_name, [package_name + '/ddsrouter_config_schema.json']), ('share/' + package_name, [package_name + '/full_example.yaml']) ], - install_requires=[], + install_requires=['setuptools'], zip_safe=True, maintainer='eprosima', maintainer_email='juanlopez@eprosima.com',