From ac018930a3ada18e8812272d4f18b611e2a3051b Mon Sep 17 00:00:00 2001 From: Maurice Hendrix Date: Fri, 28 Feb 2025 10:07:38 +0100 Subject: [PATCH 1/2] fix moved message import in frbc example --- examples/example_frbc_rm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/example_frbc_rm.py b/examples/example_frbc_rm.py index 53b80df..774d936 100644 --- a/examples/example_frbc_rm.py +++ b/examples/example_frbc_rm.py @@ -30,7 +30,7 @@ ) from s2python.s2_connection import S2Connection, AssetDetails from s2python.s2_control_type import FRBCControlType, NoControlControlType -from s2python.validate_values_mixin import S2Message +from s2python.message import S2Message logger = logging.getLogger("s2python") logger.addHandler(logging.StreamHandler(sys.stdout)) From ca35cc6c8eff74151614f9a88ac2a11c3d307828 Mon Sep 17 00:00:00 2001 From: Dr Maurice Hendrix Date: Fri, 28 Feb 2025 11:04:46 +0100 Subject: [PATCH 2/2] Update ci.yml updated artifacts to v4 due to github giving depracation errors en not running pipeline --- .github/workflows/ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf4e441..7ca3906 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: outputs: wheel-distribution: ${{ steps.wheel-distribution.outputs.path }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: {fetch-depth: 0} # deep clone for setuptools-scm - uses: actions/setup-python@v4 id: setup-python @@ -46,7 +46,7 @@ jobs: - name: Store the distribution files for use in other stages # `tests` and `publish` will use the same pre-built distributions, # so we make sure to release the exact same package that was tested - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: python-distribution-files path: dist/ @@ -68,13 +68,13 @@ jobs: # - windows-latest runs-on: ${{ matrix.platform }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 id: setup-python with: python-version: ${{ matrix.python }} - name: Retrieve pre-built distribution files - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: {name: python-distribution-files, path: dist/} - name: Run tests run: >- @@ -107,13 +107,13 @@ jobs: # - windows-latest runs-on: ${{ matrix.platform }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 id: setup-python with: python-version: ${{ matrix.python }} - name: Retrieve pre-built distribution files - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: {name: python-distribution-files, path: dist/} - name: Run tests run: >- @@ -136,13 +136,13 @@ jobs: # - windows-latest runs-on: ${{ matrix.platform }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 id: setup-python with: python-version: ${{ matrix.python }} - name: Retrieve pre-built distribution files - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: {name: python-distribution-files, path: dist/} - name: Run tests run: >- @@ -165,11 +165,11 @@ jobs: permissions: id-token: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: {python-version: "3.11"} - name: Retrieve pre-built distribution files - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: {name: python-distribution-files, path: dist/} - name: Publish Package uses: pypa/gh-action-pypi-publish@release/v1 @@ -185,11 +185,11 @@ jobs: permissions: id-token: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: {python-version: "3.11"} - name: Retrieve pre-built distribution files - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: {name: python-distribution-files, path: dist/} - name: Publish Package uses: pypa/gh-action-pypi-publish@release/v1