Skip to content

Commit

Permalink
Merge branch 'master' into rpi5
Browse files Browse the repository at this point in the history
  • Loading branch information
thijstriemstra authored Oct 29, 2024
2 parents 250709a + 7fec6f7 commit 915258c
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
name: Build and publish Python package
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.9
uses: actions/setup-python@v4
- uses: actions/checkout@v4
- name: Set up Python 3.10
uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: "3.10"
- name: Install pypa/build
run: |
python -m pip install --upgrade setuptools pip wheel twine
Expand Down
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ChangeLog
+------------+---------------------------------------------------------------------+------------+
| Version | Description | Date |
+============+=====================================================================+============+
| **3.14.0** | * Drop support for Python 3.7 | TBD |
| **3.14.0** | * Drop support for Python 3.7 | 2024/10/26 |
+------------+---------------------------------------------------------------------+------------+
| **3.13.0** | * Add support for 128x128 SH1107 | 2023/08/12 |
+------------+---------------------------------------------------------------------+------------+
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
The MIT License (MIT)
---------------------

Copyright (c) 2014-2023 Richard Hull and contributors
Copyright (c) 2014-2024 Richard Hull and contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions luma/oled/__init__.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2014-2023 Richard Hull and contributors
# Copyright (c) 2014-2024 Richard Hull and contributors
# See LICENSE.rst for details.

"""
OLED display driver for SSD1306, SSD1309, SSD1322, SSD1325, SSD1327, SSD1331,
SSD1351, SSD1362, SH1106 and SH1107 devices.
"""

__version__ = '3.13.0'
__version__ = '3.14.0'
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ classifiers =
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
Programming Language :: Python :: 3.13

[options]
zip_safe = False
Expand Down
2 changes: 1 addition & 1 deletion tests/test_ssd1351.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright (c) 2017-18 Richard Hull and contributors
# Copyright (c) 2017-2024 Richard Hull and contributors
# See LICENSE.rst for details.

import pytest
Expand Down

0 comments on commit 915258c

Please sign in to comment.