Skip to content

Update workflow versions, platforms, library and tool versions + README #1214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,13 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
experimental: [false]
python-version: ["3.6", "3.7", "3.8", "3.9", "pypy-3.7"]
include:
# Skipping Py 3.10 on Windows until windows-curses has a cp310 wheel,
# see https://github.com/zephyrproject-rtos/windows-curses/issues/26
- os: ubuntu-latest
experimental: false
python-version: "3.10"
- os: macos-latest
experimental: false
python-version: "3.10"
python-version: ["3.7", "3.8", "3.9", "3.10", "pypy-3.7", "pypy-3.8"]
# Do not test on Python 3.11 pre-releases since wrapt causes problems: https://github.com/GrahamDumpleton/wrapt/issues/196
# include:
# Only test on a single configuration while there are just pre-releases
# - os: ubuntu-latest
# experimental: true
# python-version: "3.11.0-alpha.3"
fail-fast: false
steps:
- uses: actions/checkout@v2
Expand All @@ -38,15 +35,15 @@ jobs:
run: |
tox -e gh
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v2
with:
fail_ci_if_error: true

format:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.10
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: "3.10"
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/format-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.9
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand All @@ -22,10 +22,7 @@ jobs:
run: |
black --verbose .
- name: Commit Formated Code
uses: EndBug/add-and-commit@v5
env:
# This is necessary in order to push a commit to the repo
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
uses: EndBug/add-and-commit@v7
with:
message: "Format code with black"
# Ref https://git-scm.com/docs/git-add#_examples
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Library Version Python
------------------------------ -----------
2.x 2.6+, 3.4+
3.x 2.7+, 3.5+
4.x *(currently on develop)* 3.6+
4.x *(currently on develop)* 3.7+
============================== ===========


Expand Down
6 changes: 3 additions & 3 deletions requirements-lint.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pylint==2.11.1
black==21.10b0
mypy==0.910
pylint==2.12.2
black==21.12b0
mypy==0.931
mypy-extensions==0.4.3
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
classifiers=[
# a list of all available ones: https://pypi.org/classifiers/
"Programming Language :: Python",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
Expand Down Expand Up @@ -73,7 +72,7 @@
version=version,
packages=find_packages(exclude=["test*", "doc", "scripts", "examples"]),
scripts=list(filter(isfile, (join("scripts/", f) for f in listdir("scripts/")))),
author="Python CAN contributors",
author="python-can contributors",
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I renamed this since it's more familiar for most, I suppose?

license="LGPL v3",
package_data={
"": ["README.rst", "CONTRIBUTORS.txt", "LICENSE.txt", "CHANGELOG.txt"],
Expand All @@ -82,7 +81,7 @@
},
# Installation
# see https://www.python.org/dev/peps/pep-0345/#version-specifiers
python_requires=">=3.6",
python_requires=">=3.7",
install_requires=[
"setuptools",
"wrapt~=1.10",
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
[testenv]
deps =
pytest==6.2.*,>=6.2.5
pytest-timeout==2.0.1
pytest-timeout==2.0.2
pytest-cov==3.0.0
coverage==6.0.2
coverage==6.2
codecov==2.1.12
hypothesis~=6.24.0
hypothesis~=6.35.0
pyserial~=3.5
parameterized~=0.8

Expand Down