Skip to content

Commit 19e0fe2

Browse files
committed
Prefer uv and pyproject.toml together with namespace update to simplyprint_duet3d. For future merges we will diff patches with the correct namespace update.
1 parent b40cdca commit 19e0fe2

37 files changed

+2244
-3671
lines changed

Diff for: .github/workflows/python-package.yml

+16-21
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,25 @@ on:
1111

1212
jobs:
1313
build:
14-
1514
runs-on: ubuntu-latest
1615
strategy:
1716
fail-fast: false
1817
matrix:
19-
python-version: ["3.9", "3.10", "3.11", "3.12"]
18+
python-version: [ "3.9", "3.10", "3.11", "3.12" ]
2019

2120
steps:
22-
- uses: actions/checkout@v4
23-
- name: Set up Python ${{ matrix.python-version }}
24-
uses: actions/setup-python@v3
25-
with:
26-
python-version: ${{ matrix.python-version }}
27-
- name: Install dependencies
28-
run: |
29-
python -m pip install --upgrade pip setuptools wheel
30-
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
31-
if [ -f requirements_test.txt ]; then pip install -r requirements_test.txt; fi
32-
- name: Lint with flake8
33-
run: |
34-
flake8 --statistics meltingplot
35-
- name: Test with pytest
36-
run: |
37-
pytest --cov-config .coveragerc --cov meltingplot tests/ -vv
38-
- name: Check style with yapf
39-
run: |
40-
yapf --style .style.yapf -r --diff meltingplot/
21+
- uses: actions/checkout@v4
22+
- name: Install uv
23+
uses: astral-sh/setup-uv@v5
24+
with:
25+
python-version: ${{ matrix.python-version }}
26+
27+
- name: Lint with flake8
28+
run: |
29+
uv run flake8 --statistics simplyprint_duet3d
30+
- name: Test with pytest
31+
run: |
32+
uv run pytest --cov-config .coveragerc --cov simplyprint_duet3d tests/ -vv
33+
- name: Check style with yapf
34+
run: |
35+
uv run yapf --style .style.yapf -r --diff simplyprint_duet3d

Diff for: .github/workflows/python-publish.yml

+14-15
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@ name: Upload Python Package
1010

1111
on:
1212
release:
13-
types: [published]
13+
types: [ published ]
1414

1515
permissions:
1616
contents: read
1717

1818
jobs:
1919
deploy:
20-
2120
runs-on: ubuntu-latest
2221

2322
environment: production
@@ -26,17 +25,17 @@ jobs:
2625
id-token: write
2726

2827
steps:
29-
- uses: actions/checkout@v4
30-
- name: Set up Python
31-
uses: actions/setup-python@v3
32-
with:
33-
python-version: '3.x'
34-
- name: Install dependencies
35-
run: |
36-
python -m pip install --upgrade pip
37-
pip install build
38-
- name: Build package
39-
run: python -m build
40-
- name: Publish package
41-
uses: pypa/gh-action-pypi-publish@release/v1
28+
- uses: actions/checkout@v4
29+
- name: Set up Python
30+
uses: actions/setup-python@v3
31+
with:
32+
python-version: '3.x'
33+
- name: Install dependencies
34+
run: |
35+
python -m pip install --upgrade pip
36+
pip install build
37+
- name: Build package
38+
run: python -m build
39+
- name: Publish package
40+
uses: pypa/gh-action-pypi-publish@release/v1
4241

Diff for: MANIFEST.in

-6
This file was deleted.

Diff for: Makefile

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
.PHONY: all
2+
3+
all: test flake8 yapf
4+
5+
test:
6+
uv run pytest --cov-config .coveragerc --cov simplyprint_duet3d tests/ -vv
7+
8+
flake8:
9+
uv run flake8 --statistics simplyprint_duet3d
10+
11+
yapf:
12+
uv run yapf --style .style.yapf -r --diff simplyprint_duet3d

Diff for: README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Open an SSH session to your SimplyPrint-connected device, such as a Raspberry Pi
4646

4747
.. code-block:: sh
4848
49-
source <(curl -sSL https://raw.githubusercontent.com/Meltingplot/duet-simplyprint-connector/refs/heads/main/install.sh)
49+
source <(curl -sSL https://raw.githubusercontent.com/simplyprint/integration-duet3d/refs/heads/main/install.sh)
5050
5151
5252
-----------------------------

Diff for: create-package.sh

-14
This file was deleted.

Diff for: flake8-module.sh

-5
This file was deleted.

Diff for: install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ cd /opt/duet-simplyprint-connector
3131
python3 -m venv venv
3232
source venv/bin/activate
3333
pip install --upgrade pip setuptools wheel
34-
pip install meltingplot.duet_simplyprint_connector
34+
pip install simplyprint_duet3d
3535
simplyprint autodiscover
3636
simplyprint install-as-service

Diff for: meltingplot/__init__.py

-1
This file was deleted.

Diff for: meltingplot/duet_simplyprint_connector/__init__.py

-5
This file was deleted.

0 commit comments

Comments
 (0)