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

Release 2024.9.3 #280

Merged
merged 15 commits into from
Sep 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 0 additions & 64 deletions .github/workflows/build.yml

This file was deleted.

32 changes: 0 additions & 32 deletions .github/workflows/develop.yml

This file was deleted.

43 changes: 0 additions & 43 deletions .github/workflows/master.yml

This file was deleted.

42 changes: 21 additions & 21 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
name: PyTest

on:
workflow_dispatch:
pull_request:
workflow_dispatch:
pull_request:

jobs:
PyTest:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
PyTest:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: actions/setup-python@v4
with:
python-version: '3.8'

- name: Install dependencies
run: pip install -r requirements_dev.txt && pip install pytest-md
- uses: actions/setup-python@v4
with:
python-version: '3.8'

- name: Run pytest
uses: pavelzw/pytest-action@v2
with:
verbose: true
emoji: false
job-summary: true
custom-arguments: '-q'
click-to-expand: true
report-title: 'Test Report'
- name: Install dependencies
run: pip install -r requirements_dev.txt && pip install pytest-md

- name: Run pytest
uses: pavelzw/pytest-action@v2
with:
verbose: true
emoji: false
job-summary: true
custom-arguments: '-q'
click-to-expand: true
report-title: 'Test Report'
90 changes: 90 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
name: GitHub release

on:
workflow_dispatch:
push:
branches:
- master
- develop
paths-ignore:
- '.github/**'
- '**.md'

jobs:
Binaries:
runs-on: ${{ matrix.os }}
outputs:
version-tag: ${{ steps.version_tag.outputs.VERSION_TAG }}
strategy:
fail-fast: false
matrix:
include:
- os: windows-2019
arch: x86
- os: windows-2019
arch: x64
- os: macos-13
arch: x64

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up Python 3.8
uses: actions/setup-python@v4
with:
python-version: '3.8'
architecture: ${{ matrix.arch }}

- name: Install PyInstaller
run: pip install -r requirements_build.txt

- name: Retrieve version tag
id: version_tag
shell: bash
run: echo "VERSION_TAG=$(python -m setuptools_scm)" >> $GITHUB_OUTPUT

- name: Build with PyInstaller
run: pyinstaller --noconfirm --clean tdmgr.spec

- name: Upload binaries artifact to workflow
uses: actions/upload-artifact@v3
with:
name: tdmgr
path: dist/*

Draft-Release:
runs-on: ubuntu-latest
needs: Binaries
env:
VERSION_TAG: ${{ needs.Binaries.outputs.version-tag }}
steps:
- uses: actions/checkout@v3

# Create a draft release
- name: Create Draft Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ env.VERSION_TAG }}
release_name: TDM ${{ env.VERSION_TAG }}
draft: ${{ github.ref_name != 'refs/heads/develop'}}
prerelease: ${{ github.ref_name == 'refs/heads/develop'}}


- name: Download artifacts from build
uses: actions/download-artifact@v3
with:
path: dist

# Upload release assets: each file in `dist/` to the GitHub Release
- name: Upload Release Assets
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
for asset in dist/tdmgr/*; do
echo "Uploading asset: $asset"
gh release upload ${{ env.VERSION_TAG }} "$asset" --clobber
done
36 changes: 36 additions & 0 deletions .github/workflows/release_pypi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Master Branch PyPI release

on:
push:
branches:
- master
paths-ignore:
- '.github/**'
- '**.md'

jobs:
build_wheel_and_release:
permissions:
id-token: write

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0

- uses: actions/setup-python@v4
with:
python-version: '3.8'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel build

- name: Build package
run: python -m build --wheel --outdir dist/

- name: Publish package to PyPI
uses: pypa/gh-action-pypi-publish@release/v1

15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## [2024.9.3]
## Added
- up to 8 shutters supported

## Changed
- ethernet-enabled devices now show eth ip address when wifi is disabled (#266)
- rows in device list are slimmer now
- made shutter icons in device list smaller

## Fixed
- clicking main menu buttons doesn't crash anymore (#235)

## [2024.9.2] - 2024-09-14
## Fixed
- missing pydantic in pyproject.toml
Expand All @@ -8,13 +20,12 @@
- TDM now stores tdm.cfg in locations suggested by the OS

## Added
- support for MQTT wildcards in autodiscovery patterns
- support for MQTT wildcards in autodiscovery patterns (#254)
- misc UI changes

## Fixed
- many bugs, crashes, small annoyances


## [0.2.6] - 2019-12-24
## Changed
- support for 16 var/mem in rules editor
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,19 @@ While I'm not in any way abandoning this project, I don't have as much time as I
- [autodiscovery](https://github.com/jziolkowski/tdm/wiki/Autodiscovery) of Tasmota devices (even if they use custom FullTopics)
- module, GPIO and template configuration
- rules editor with Var/Mem/Ruletimer monitor
- easy to read detachable telemetry viewers (working in active and passive mode)
- easy to read detachable telemetry viewers (working in active and passive mode)
- relay, color and PWM control
- user-friendly configuration of buttons, switches and relays, including their related SetOptions
- timers editor
- clear retained relay and LWT topics
- detachable device consoles with command completion and intuitive history
- detachable device consoles with command completion and intuitive history
- selectable views to see the most vital device parameters at a glance
- BSSID aliasing for larger deployments
- support for current and legacy Timers payloads (thanks @GrahamM)

# Planned functions

- PWM/NTP/Topics configuration dialogs and a few others
- config export for OpenHAB and HomeAssistant
- dynamic and manual grouping of devices: by group topic, module, firmware revision, and more
- group actions: reset/restart/control power/upgrade
- quick settings for common use cases
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools>=42", "setuptools_scm>=6.0"]
requires = ["setuptools>=64", "setuptools-scm>=8"]
build-backend = "setuptools.build_meta"

[project]
Expand Down
3 changes: 2 additions & 1 deletion requirements_build.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-r requirements.txt
pyinstaller>=4
setuptools_scm
setuptools>=64
setuptools-scm>=8
Loading
Loading