From 9a80a38e6158634e2fa54bf709e51d7721110e5c Mon Sep 17 00:00:00 2001 From: Thijs Triemstra Date: Sat, 26 Oct 2024 18:58:37 +0200 Subject: [PATCH 1/5] ci: update deps --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e8fed7a..09a729d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,12 +12,12 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-minor-version: [8, 9, 10, 11, 12, 13-dev] + python-minor-version: [8, 9, 10, 11, 12, 13] name: Python 3.${{ matrix.python-minor-version }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup pip cache - uses: actions/cache@v3 + uses: actions/cache@v4 id: pipcache with: path: ~/.cache/pip @@ -27,7 +27,7 @@ jobs: - name: Install system dependencies run: sudo apt-get install graphviz - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.${{ matrix.python-minor-version }} check-latest: true From b003d3903826ec30371751d18c9699d59a4ab2da Mon Sep 17 00:00:00 2001 From: Thijs Triemstra Date: Sat, 26 Oct 2024 18:59:25 +0200 Subject: [PATCH 2/5] use luma.core branch for testing --- setup.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 39dc799..7baee17 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,7 +29,8 @@ zip_safe = False packages = find_namespace: python_requires = >=3.8, <4 install_requires = - luma.core>=2.4.1 + luma.core[gpio,spi] @ git+https://github.com/rm-hull/luma.core.git@optional-270 + tests_require = pytest pytest-cov From 45623e17bfe8a819e926a629d0dbf56c33c6e640 Mon Sep 17 00:00:00 2001 From: Thijs Triemstra Date: Sat, 26 Oct 2024 19:11:56 +0200 Subject: [PATCH 3/5] ci: install system deps --- .github/workflows/main.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 09a729d..f972c4f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,6 +33,16 @@ jobs: check-latest: true - name: Display Python version run: python -c "import sys; print(sys.version)" + - name: Install system dependencies + run: sudo apt-get install swig python3-setuptools python3-dev + - name: Install lg library + run: | + cd $RUNNER_TEMP + wget http://abyz.me.uk/lg/lg.zip + unzip lg.zip + cd lg + make + sudo make install - name: Install Python packages run: pip install --upgrade setuptools pip wheel tox coveralls - name: Run tests From 02e63014a4b1216320382682ec26a0d0986895de Mon Sep 17 00:00:00 2001 From: Thijs Triemstra Date: Sat, 26 Oct 2024 19:14:22 +0200 Subject: [PATCH 4/5] ci: install system deps --- .github/workflows/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f972c4f..accdff1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,7 +25,7 @@ jobs: restore-keys: | ${{ runner.os }}-py3${{ matrix.python-minor-version }}-pip- - name: Install system dependencies - run: sudo apt-get install graphviz + run: sudo apt-get install graphviz swig python3-setuptools python3-dev - name: Set up Python uses: actions/setup-python@v5 with: @@ -33,8 +33,6 @@ jobs: check-latest: true - name: Display Python version run: python -c "import sys; print(sys.version)" - - name: Install system dependencies - run: sudo apt-get install swig python3-setuptools python3-dev - name: Install lg library run: | cd $RUNNER_TEMP From 250709a439bbde05b89c859ae8cf4b93d58cd707 Mon Sep 17 00:00:00 2001 From: Thijs Triemstra Date: Sat, 26 Oct 2024 19:15:25 +0200 Subject: [PATCH 5/5] fix lint error --- tests/test_ssd1351.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_ssd1351.py b/tests/test_ssd1351.py index de6a4cd..97b9d78 100644 --- a/tests/test_ssd1351.py +++ b/tests/test_ssd1351.py @@ -215,7 +215,7 @@ def command(*cmd): assert recordings == get_reference_data('demo_ssd1351') -@ pytest.mark.parametrize("bit,expected_16_bit_color", [ +@pytest.mark.parametrize("bit,expected_16_bit_color", [ (7, [0b10000100, 0b00010000]), (6, [0b01000010, 0b00001000]), (5, [0b00100001, 0b00000100]),