diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95a42ac..f101421 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,12 +15,12 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup constants shell: bash run: | - TOIT_VERSION=v2.0.0-alpha.12 + TOIT_VERSION=v2.0.0-alpha.118 echo "TOIT_VERSION=$TOIT_VERSION" >> $GITHUB_ENV export DOWNLOAD_DIR="${{ github.workspace }}/downloads" echo "DOWNLOAD_DIR=$DOWNLOAD_DIR" >> $GITHUB_ENV @@ -67,14 +67,14 @@ jobs: - name: Use new Python uses: actions/setup-python@v4 with: - python-version: '3.x' + python-version: '3.11' architecture: x64 - name: Fetch Python dependencies run: | pip install -r tests/requirements.txt - - uses: suisei-cn/actions-download-file@v1 + - uses: suisei-cn/actions-download-file@v1.4.0 name: Download Toit with: url: ${{ env.TOIT_URL }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f15b942..b137520 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,12 +1,28 @@ +# Zero-Clause BSD License + +# Copyright (C) 2023 Toitware ApS. + +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted. + +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +# FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + name: Publish package on: push: tags: - - 'v*' + - 'v[0-9]+.[0-9]+.[0-9]+' + - 'v[0-9]+.[0-9]+.[0-9]+-*' jobs: create-release: name: Create new release runs-on: ubuntu-latest steps: - name: Publish - uses: toitlang/pkg-publish@v1.0.2 + uses: toitlang/pkg-publish@v1.4.0 diff --git a/package.lock b/package.lock index 2461262..abd5b41 100644 --- a/package.lock +++ b/package.lock @@ -1,7 +1,9 @@ +sdk: ^2.0.0-alpha.118 prefixes: rs485: toit-rs485 packages: toit-rs485: url: github.com/toitware/toit-rs485 - version: 1.0.1 - hash: 854d96a9d27b6ce7325a9698001087b292f4b4b5 + name: rs485 + version: 1.2.0 + hash: 8e38736d19dab1d9275568df269f982e6118acec diff --git a/package.yaml b/package.yaml index 3407802..ed267a9 100644 --- a/package.yaml +++ b/package.yaml @@ -1,4 +1,8 @@ +name: modbus +description: A Modbus Toit client. +environment: + sdk: ^2.0.0-alpha.118 dependencies: rs485: url: github.com/toitware/toit-rs485 - version: ^1.0.1 + version: ^1.2.0 diff --git a/tests/README.md b/tests/README.md index 59f167d..64ce9f5 100644 --- a/tests/README.md +++ b/tests/README.md @@ -10,6 +10,8 @@ The safe choice is to consider them BSD as well. ## Installation +pymodbus=3.0.0.dev4 requires the 'imp' module, which was removed with Python 3.12. + Install with ``` shell diff --git a/tests/package.lock b/tests/package.lock index 92a01cf..9fa1deb 100644 --- a/tests/package.lock +++ b/tests/package.lock @@ -1,4 +1,4 @@ -sdk: ^1.6.10 +sdk: ^2.0.0-alpha.64 prefixes: host: pkg-host modbus: .. @@ -9,9 +9,11 @@ packages: rs485: toit-rs485 pkg-host: url: github.com/toitlang/pkg-host - version: 1.6.0 - hash: d05b91390e76c3543a9968b042aed330210bafa4 + name: host + version: 1.11.0 + hash: 7e7df6ac70d98a02f232185add81a06cec0d77e8 toit-rs485: url: github.com/toitware/toit-rs485 - version: 1.0.1 - hash: 854d96a9d27b6ce7325a9698001087b292f4b4b5 + name: rs485 + version: 1.2.0 + hash: 8e38736d19dab1d9275568df269f982e6118acec diff --git a/tests/package.yaml b/tests/package.yaml index 27fd0e5..56e5927 100644 --- a/tests/package.yaml +++ b/tests/package.yaml @@ -1,6 +1,6 @@ dependencies: host: url: github.com/toitlang/pkg-host - version: ^1.6.0 + version: ^1.11.0 modbus: path: ..