Skip to content

Commit

Permalink
Merge branch 'release/0.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
vnmabus committed Dec 31, 2020
2 parents f16ffb3 + 1340df4 commit e0e5328
Show file tree
Hide file tree
Showing 134 changed files with 7,628 additions and 3,890 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Mypy

on:
pull_request:

jobs:
build:
runs-on: ubuntu-latest
name: Mypy
steps:
- uses: actions/checkout@v2
- uses: tsuyoshicho/action-mypy@v1
with:
github_token: ${{ secrets.github_token }}
# Change reviewdog reporter if you need [github-pr-check,github-check,github-pr-review].
reporter: github-pr-review
# Change reporter level if you need.
# GitHub Status Check won't become failure with warning.
level: warning
mypy_flags: ''
35 changes: 35 additions & 0 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Style

# Controls when the action will run.
on:
pull_request:

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v1

- run: |
echo "_CHANGED_FILES=$(git diff --name-only origin/${{ github.base_ref }} -- '*.py' | tr -s '\n' ' ' )" >> ${GITHUB_ENV}
# Runs a single command using the runners shell
- id: wemake-python-styleguide
# You may pin to the exact commit or the version.
# uses: wemake-services/wemake-python-styleguide@8068e6634aaacf1eecba3f27a529213df3bd6284
uses: wemake-services/wemake-python-styleguide@master
if: ${{ env._CHANGED_FILES }}
with:
reporter: 'github-pr-review' # optional, default is terminal
path: "${{ env._CHANGED_FILES }}"
env:
GITHUB_TOKEN: ${{ secrets.github_token }}
34 changes: 34 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Tests

on:
push:
pull_request:

jobs:
build:
runs-on: ${{ matrix.os }}
name: Python ${{ matrix.python-version }} on ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ['3.6', '3.7', '3.8']

steps:
- uses: actions/checkout@v2

- name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- name: Install dependencies
run: |
pip3 install codecov pytest-cov || pip3 install --user codecov pytest-cov;
- name: Run tests
run: |
pip3 install .
coverage run --source=skfda/ setup.py test;
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
language: python

matrix:
include:
- name: "Python 3.6 on Linux"
Expand All @@ -24,6 +25,7 @@ matrix:
dist: xenial # required for Python >= 3.7
env:
- PEP8COVERAGE=true # coverage test are only

install:
- pip3 install --upgrade pip cython numpy || pip3 install --upgrade --user pip cython numpy # all three OSes agree about 'pip3'
- |
Expand All @@ -36,14 +38,14 @@ install:
# 'python3' is a 'command not found' error on Windows but 'py' works on Windows only
script:
- |
pip3 install .
if [[ $PEP8COVERAGE == true ]]; then
flake8 --exit-zero skfda;
coverage run --source=skfda/ setup.py test;
else
python3 setup.py test || python setup.py test;
fi
after_success:
- |
if [[ $PEP8COVERAGE == true ]]; then
Expand Down
3 changes: 2 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Documentation
The documentation is available at
`fda.readthedocs.io/en/stable/ <https://fda.readthedocs.io/en/stable/>`_, which
includes detailed information of the different modules, classes and methods of
the package, along with several examples showing different funcionalities.
the package, along with several examples showing different functionalities.

The documentation of the latest version, corresponding with the develop
version of the package, can be found at
Expand Down Expand Up @@ -62,6 +62,7 @@ Requirements
*scikit-fda* depends on the following packages:

* `cython <https://github.com/cython/cython>`_ - Python to C compiler
* `fdasrsf <https://github.com/jdtuck/fdasrsf_python>`_ - SRSF framework
* `findiff <https://github.com/maroba/findiff>`_ - Finite differences
* `matplotlib <https://github.com/matplotlib/matplotlib>`_ - Plotting with Python
* `mpldatacursor <https://github.com/joferkington/mpldatacursor/>`_ - Interactive data cursors for matplotlib
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4
0.5
22 changes: 0 additions & 22 deletions deps/fdasrsf/LICENSE

This file was deleted.

33 changes: 0 additions & 33 deletions deps/fdasrsf/README.rst

This file was deleted.

Loading

0 comments on commit e0e5328

Please sign in to comment.