Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into histograms_from_timed…
Browse files Browse the repository at this point in the history
…_dataframe
  • Loading branch information
rettigl committed Nov 3, 2023
2 parents aa4c35f + 35bd293 commit af86fa1
Show file tree
Hide file tree
Showing 21 changed files with 2,042 additions and 366 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ jobs:
- name: pylint
if: ${{ always() }}
run:
poetry run pylint --good-names=i,j,k,ex,x,y,t,k,v,ax,df,ec,mc,dc,ct --disable=fixme,too-many-branches,too-many-locals,too-many-statements,too-many-arguments,too-many-lines,too-many-public-methods,too-many-instance-attributes,too-few-public-methods sed tests
poetry run pylint -j 0 --good-names=i,j,k,ex,x,y,t,k,v,ax,df,ec,mc,dc,ct --disable=fixme,too-many-branches,too-many-locals,too-many-statements,too-many-arguments,too-many-lines,too-many-public-methods,too-many-instance-attributes,too-few-public-methods sed tests
- name: mypy
if: ${{ always() }}
run:
poetry run mypy --ignore-missing-imports --follow-imports=silent --no-strict-optional sed tests
poetry run mypy --ignore-missing-imports --follow-imports=silent --no-strict-optional sed tests
12 changes: 9 additions & 3 deletions .github/workflows/testing_coverage.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
name: pytest and coverage report

# Triggers the workflow on push and PR for all branches
on: [push, pull_request]
# Triggers the workflow on push for all branches and PR only for main
on:
push:
branches:
- '*'
pull_request:
branches:
- main

jobs:
pytest:
Expand Down Expand Up @@ -30,4 +36,4 @@ jobs:
uses: coverallsapp/github-action@v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
file: ./cobertura.xml
file: ./cobertura.xml
4 changes: 2 additions & 2 deletions .github/workflows/testing_multiversion.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pytest multiversion
name: unit tests [Python 3.8|3.9|3.10]

on:
push:
Expand Down Expand Up @@ -27,4 +27,4 @@ jobs:
# Use cached python and dependencies, install poetry
- name: Run tests on python ${{matrix.python-version}}
run: |
poetry run pytest--full-trace --show-capture=no -sv -n auto tests/
poetry run pytest --full-trace --show-capture=no -sv -n auto tests/
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# sed
[![Documentation Status](https://readthedocs.org/projects/sed/badge/?version=latest)](https://sed.readthedocs.io/en/latest/?badge=latest)
![](https://github.com/OpenCOMPES/sed/actions/workflows/pylint.yml/badge.svg?branch=main)
![](https://github.com/OpenCOMPES/sed/actions/workflows/pytest.yml/badge.svg?branch=main)
![](https://github.com/OpenCOMPES/sed/actions/workflows/linting.yml/badge.svg?branch=main)
![](https://github.com/OpenCOMPES/sed/actions/workflows/testing_multiversion.yml/badge.svg?branch=main)
![](https://img.shields.io/pypi/pyversions/sedprocessor)
![](https://img.shields.io/pypi/l/sedprocessor)
![](https://img.shields.io/pypi/v/sedprocessor)
Expand Down
6 changes: 4 additions & 2 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ dill==0.3.7 ; python_version >= "3.8" and python_version < "3.11"
docutils==0.18.1 ; python_version >= "3.8" and python_version < "3.11"
entrypoints==0.4 ; python_version >= "3.8" and python_version < "3.11"
exceptiongroup==1.1.3 ; python_version >= "3.8" and python_version < "3.11"
executing==2.0.0 ; python_version >= "3.8" and python_version < "3.11"
fabio==2023.6.0 ; python_version >= "3.8" and python_version < "3.11"
executing==2.0.1 ; python_version >= "3.8" and python_version < "3.11"
fabio==2023.10.0 ; python_version >= "3.8" and python_version < "3.11"
fastdtw==0.3.4 ; python_version >= "3.8" and python_version < "3.11"
fasteners==0.19 ; python_version >= "3.8" and python_version < "3.11" and (platform_machine == "x86_64" or platform_machine == "AMD64")
fastjsonschema==2.18.1 ; python_version >= "3.8" and python_version < "3.11"
Expand All @@ -55,6 +55,7 @@ future==0.18.3 ; python_version >= "3.8" and python_version < "3.11"
gitdb==4.0.11 ; python_version >= "3.8" and python_version < "3.11"
gitpython==3.1.40 ; python_version >= "3.8" and python_version < "3.11"
h5py==3.10.0 ; python_version >= "3.8" and python_version < "3.11"
hdf5plugin==4.2.0 ; python_version >= "3.8" and python_version < "3.11"
hyperspy==1.7.4 ; python_version >= "3.8" and python_version < "3.11"
idna==3.4 ; python_version >= "3.8" and python_version < "3.11"
ifes-apt-tc-data-modeling==0.0.9 ; python_version >= "3.8" and python_version < "3.11"
Expand Down Expand Up @@ -97,6 +98,7 @@ lazy-loader==0.3 ; python_version >= "3.8" and python_version < "3.11"
llvmlite==0.38.1 ; python_version >= "3.8" and python_version < "3.11"
lmfit==1.2.2 ; python_version >= "3.8" and python_version < "3.11"
locket==1.0.0 ; python_version >= "3.8" and python_version < "3.11"
lxml==4.9.3 ; python_version >= "3.8" and python_version < "3.11"
markupsafe==2.1.3 ; python_version >= "3.8" and python_version < "3.11"
matplotlib-inline==0.1.6 ; python_version >= "3.8" and python_version < "3.11"
matplotlib-scalebar==0.8.1 ; python_version >= "3.8" and python_version < "3.11"
Expand Down
Loading

0 comments on commit af86fa1

Please sign in to comment.