Skip to content

Commit

Permalink
Merge branch 'kplindegaard:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
0xc0decafe authored Oct 15, 2023
2 parents 1cb93af + 7e1badc commit d64f3c9
Show file tree
Hide file tree
Showing 15 changed files with 242 additions and 147 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -50,7 +50,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -64,4 +64,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
76 changes: 76 additions & 0 deletions .github/workflows/python-build-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: Build and test

on:
push:
branches:
- 'master'
pull_request:

jobs:
build-py3:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install flake8 pytest
python setup.py install
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --show-source --statistics
- name: Test with pytest
run: |
pytest --capture=no
build-py_legacy:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ["3.6"]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install flake8 pytest mock
python setup.py install
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --show-source --statistics
- name: Test with pytest
run: |
pytest --capture=no
build-docs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.10"]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install sphinx
- name: Build docs with Sphinx
run: |
cd doc
sphinx-build -W -b html -d ./doctrees . ./html
6 changes: 3 additions & 3 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ name: Upload Python Package

on:
release:
types: [created]
types: [published]

jobs:
deploy:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.x'
- name: Install dependencies
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.tox/
doc/_build
doc/doctrees
doc/html
build/
dist/
.vscode/
Expand Down
24 changes: 0 additions & 24 deletions .travis.yml

This file was deleted.

20 changes: 18 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,21 @@
Notable changes to the smbus2 project are recorded here.

## [Unreleased]
No unreleased updates.
No changes since last release.

## [0.4.3] - 2023-08-25
- Build pipeline and test updates only:
- Upgrade build pipelines
- Added Python 3.11
- Python 2.7, 3.4, and 3.5 no longer tested.
- Update deprecated Sphinx config format.
- Corrected deprecated `assertEquals` in the unit tests.

## [0.4.2] - 2022-06-05
### General
- Explicitly export from top level of package [#69](https://github.com/kplindegaard/smbus2/pull/69).
- Transitioned pipelines from Travis-CI to GitHub Actions.
- Python 3.10 added.

## [0.4.1] - 2021-01-17
### General
Expand Down Expand Up @@ -86,7 +100,9 @@ with SMBus(1) as bus:
First published version.


[Unreleased]: https://github.com/kplindegaard/smbus2/compare/0.4.1...HEAD
[Unreleased]: https://github.com/kplindegaard/smbus2/compare/0.4.3...HEAD
[0.4.3]: https://github.com/kplindegaard/smbus2/compare/0.4.2...0.4.3
[0.4.2]: https://github.com/kplindegaard/smbus2/compare/0.4.1...0.4.2
[0.4.1]: https://github.com/kplindegaard/smbus2/compare/0.4.0...0.4.1
[0.4.0]: https://github.com/kplindegaard/smbus2/compare/0.3.0...0.4.0
[0.3.0]: https://github.com/kplindegaard/smbus2/compare/0.2.3...0.3.0
Expand Down
Loading

0 comments on commit d64f3c9

Please sign in to comment.