Skip to content

Commit

Permalink
Merge pull request #20 from GavinHuttley/develop
Browse files Browse the repository at this point in the history
DEV: misc changes
  • Loading branch information
GavinHuttley authored Nov 30, 2022
2 parents bae45e5 + b1ae655 commit daea69c
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 18 deletions.
24 changes: 18 additions & 6 deletions .github/workflows/testing_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:

strategy:
matrix:
os: [windows-latest, macos-latest, ubuntu-latest]
python-version: [3.7, 3.8, 3.9, "3.10"]
os: [macos-latest, ubuntu-latest, windows-latest]
python-version: ["3.8", "3.9", "3.10"]

steps:
- uses: "actions/checkout@v2"
Expand All @@ -31,8 +31,20 @@ jobs:
- name: "Run nox for ${{ matrix.python-version }}"
run: "nox -s test-${{ matrix.python-version }}"

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
- name: Coveralls Parallel
uses: coverallsapp/github-action@master
with:
file: ./tests/junit-*.xml
fail_ci_if_error: true
parallel: true
github-token: ${{ secrets.github_token }}
flag-name: run-${{ matrix.test_number }}
path-to-lcov: "tests/lcov-${{ matrix.python-version }}.info"

finish:
needs: tests
runs-on: ubuntu-latest
steps:
- name: Coveralls Finished
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.github_token }}
parallel-finished: true
11 changes: 6 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
|Build Status| |codecov| |Using Black Formatting| |Python 3.7+|
|Build Status| |coverall| |Using Black Formatting| |Python 3.8+|

.. |Build Status| image:: https://github.com/HuttleyLab/scitrack/workflows/CI/badge.svg?branch=develop
:target: https://github.com/HuttleyLab/scitrack/actions?workflow=CI
:alt: CI Status

.. |codecov| image:: https://codecov.io/gh/HuttleyLab/scitrack/branch/develop/graph/badge.svg
:target: https://codecov.io/gh/HuttleyLab/scitrack
.. |coverall| image:: https://coveralls.io/repos/github/GavinHuttley/scitrack/badge.svg?branch=develop
:target: https://coveralls.io/github/GavinHuttley/scitrack?branch=develop

.. |Using Black Formatting| image:: https://img.shields.io/badge/code%20style-black-000000.svg
.. |Python 3.7+| image:: https://img.shields.io/badge/python-3.7+-blue.svg
:target: https://www.python.org/downloads/release/python-370/

.. |Python 3.8+| image:: https://img.shields.io/badge/python-3.8+-blue.svg
:target: https://www.python.org/downloads/release/python-380/


##################
Expand Down
8 changes: 3 additions & 5 deletions noxfile.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
import nox


dependencies = "numpy", "click", "pytest", "pytest-cov"


@nox.session(python=[f"3.{v}" for v in range(7, 11)])
@nox.session(python=[f"3.{v}" for v in range(8, 11)])
def test(session):
py_version = session.python.replace(".", "")
session.install(*dependencies)
session.install(".")
session.chdir("tests")
session.run(
"pytest",
"-x",
"--junitxml",
f"junit-{py_version}.xml",
"--cov-report",
"xml",
f"lcov:lcov-{session.python}.info",
"--cov",
"scitrack",
)
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@ classifiers = [
"Topic :: Scientific/Engineering :: Bio-Informatics",
"Topic :: Software Development :: Libraries :: Python Modules",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
]
requires-python = ">=3.7"
requires-python = ">=3.8"

[tool.flit.sdist]
include = ["src/*", "pyproject.toml", "*.rst"]
Expand Down

0 comments on commit daea69c

Please sign in to comment.