Skip to content

Commit 4a286f0

Browse files
authored
πŸš€ 5.3.0, #360
2 parents 7a06b9b + d3fb509 commit 4a286f0

17 files changed

Lines changed: 2437 additions & 2863 deletions

β€Ž.github/workflows/CI.yamlβ€Ž

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,26 @@ jobs:
1212
UI:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- name: Get yarn cache dir
16-
id: yarnCache
17-
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
1815
- name: Checkout
1916
uses: actions/checkout@v4
17+
- uses: pnpm/action-setup@v5
18+
with:
19+
package_json_file: ui/package.json
2020
- name: Install Node.js
2121
uses: actions/setup-node@v4
2222
with:
23-
node-version: 20.x
24-
- name: Cache node modules
25-
uses: actions/cache@v4
26-
with:
27-
path: ${{ steps.yarnCache.outputs.dir }}
28-
key: ${{ runner.os }}-build-cache-yarn-${{ hashFiles('**/yarn.lock') }}
23+
node-version: 22.x
24+
cache: pnpm
25+
cache-dependency-path: ui/pnpm-lock.yaml
2926
- name: Install dependencies
3027
working-directory: ui
31-
run: yarn install
28+
run: pnpm install
3229
- name: Lint
3330
working-directory: ui
34-
run: yarn lint
31+
run: pnpm lint
3532
- name: Test
3633
working-directory: ui
37-
run: yarn test
34+
run: pnpm test
3835
- name: Coveralls
3936
uses: coverallsapp/github-action@v2
4037
continue-on-error: true
@@ -44,7 +41,7 @@ jobs:
4441
parallel: true
4542
- name: Build UI
4643
working-directory: ui
47-
run: yarn build
44+
run: pnpm build
4845

4946
Python:
5047
name: Python ${{ matrix.python }}, OctoPrint ${{ matrix.octoprint }}
@@ -107,15 +104,15 @@ jobs:
107104
with:
108105
path: ${{ steps.pipCache.outputs.dir }}
109106
key: ${{ runner.os }}-build-cache-pip-python-${{ matrix.python }}-octoprint-${{ matrix.octoprint}}
107+
- name: Install setuptools 81
108+
# https://github.com/pypa/setuptools/issues/3085
109+
run: pip install 'setuptools>=81.0.0,<82.0.0'
110110
- name: Install OctoPrint
111111
# see https://stackoverflow.com/questions/49854628/how-do-i-pip-install-the-latest-patch-number-of-a-package
112112
run: pip install octoprint~=${{ matrix.octoprint }}.0
113113
- name: Install Wheel
114114
# see https://community.octoprint.org/t/setuptools-error-while-installing-plugin-octoklipper-on-manual-op-installation/51387
115115
run: pip install wheel
116-
- name: Fixed setuptools
117-
# see https://blog.ganssle.io/articles/2021/10/setup-py-deprecated.html
118-
run: pip install "setuptools~=79.0.0"
119116
- name: Make liblgpio.so
120117
if: ${{ matrix.python == '3.13' }}
121118
# see https://github.com/borisbu/OctoRelay/issues/346#issuecomment-2849009685

β€Ž.github/workflows/release.yamlβ€Ž

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,28 @@ jobs:
1111
name: Build the distribution
1212
runs-on: ubuntu-latest
1313
env:
14-
NODE_VERSION: 20.x
14+
NODE_VERSION: 22.x
1515
PYTHON_VERSION: 3.11
16-
OCTOPRINT_VERSION: 1.9
16+
OCTOPRINT_VERSION: 1.11
1717
steps:
1818
### UI
19-
- name: Get yarn cache dir
20-
id: yarnCache
21-
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
2219
- name: Checkout
2320
uses: actions/checkout@v4
21+
- uses: pnpm/action-setup@v5
22+
with:
23+
package_json_file: ui/package.json
2424
- name: Install Node.js
2525
uses: actions/setup-node@v4
2626
with:
2727
node-version: ${{ env.NODE_VERSION }}
28-
- name: Cache node modules
29-
uses: actions/cache@v4
30-
with:
31-
path: ${{ steps.yarnCache.outputs.dir }}
32-
key: ${{ runner.os }}-release-cache-yarn-${{ hashFiles('**/yarn.lock') }}
28+
cache: pnpm
29+
cache-dependency-path: ui/pnpm-lock.yaml
3330
- name: Install UI dependencies
3431
working-directory: ui
35-
run: yarn install
32+
run: pnpm install
3633
- name: Build UI
3734
working-directory: ui
38-
run: yarn build
35+
run: pnpm build
3936
### Python
4037
- name: Install Python
4138
uses: actions/setup-python@v5

β€Ž.pylintrcβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ source-roots=
103103

104104
# When enabled, pylint would attempt to guess common misconfiguration and emit
105105
# user-friendly hints instead of false-positive error messages.
106-
suggestion-mode=yes
106+
# suggestion-mode=yes
107107

108108
# Allow loading of arbitrary C extensions. Extensions are imported into the
109109
# active Python interpreter and may run arbitrary code.
@@ -193,7 +193,7 @@ good-names=Run
193193

194194
# Good variable names regexes, separated by a comma. If names match any regex,
195195
# they will always be accepted
196-
good-names-rgxs=^v\d+$
196+
good-names-rgxs=^v\d+$,.*Mock$
197197

198198
# Include a hint for the correct naming format with invalid-name.
199199
include-naming-hint=no

β€ŽCHANGELOG.mdβ€Ž

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
## Version 5
44

5+
### 5.3.0
6+
7+
- Adds `pyproject.toml` file to the distribution:
8+
- See https://blog.ganssle.io/articles/2021/10/setup-py-deprecated.html for details.
9+
- The bundler changed from `tsup` to `tsdown`;
10+
- Upgrades to UI and dev dependencies.
11+
512
### 5.2.0
613

714
- Switched from SASS to LESS;

β€ŽMANIFEST.inβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
include README.md
22
include CHANGELOG.md
3+
include pyproject.toml
34
recursive-include octoprint_octorelay/templates *
45
recursive-include octoprint_octorelay/translations *
56
recursive-include octoprint_octorelay/static *

β€Žmypy.iniβ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
[mypy]
22
check_untyped_defs = True
3-
exclude = (?x)(
4-
_version\.py$
5-
)
63

74
[mypy-octoprint.*]
85
ignore_missing_imports = True
@@ -12,3 +9,6 @@ ignore_missing_imports = True
129

1310
[mypy-flask.*]
1411
ignore_missing_imports = True
12+
13+
[mypy-octoprint_octorelay._version]
14+
ignore_errors = True

β€Žpyproject.tomlβ€Ž

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[build-system]
2+
requires = [
3+
"setuptools",
4+
"wheel",
5+
"octoprint",
6+
]
7+
build-backend = "setuptools.build_meta"

0 commit comments

Comments
Β (0)