Skip to content

Commit

Permalink
Merge branch 'main' into pyproject-toml
Browse files Browse the repository at this point in the history
  • Loading branch information
sjvrijn committed Feb 3, 2023
2 parents 772198f + d281c55 commit 1930141
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 32 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/tests.yml
@@ -0,0 +1,38 @@
name: tests

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

jobs:
tests:

name: Run tests
runs-on: ubuntu-latest
strategy:
fail-fast: false
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@v3
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python3 -m pip install --upgrade pip setuptools
pip install ".[dev]"
pip install coverage coveralls
- name: Run pytest
run: |
pytest tests/regression_test.py
pytest -Werror --cov-branch --cov=mf2 tests/property_test.py tests/multi_fidelity_function_test.py
- name: Report coverage
run: |
coveralls --service=github
19 changes: 0 additions & 19 deletions .travis.yml

This file was deleted.

27 changes: 14 additions & 13 deletions README.md
@@ -1,13 +1,13 @@
# MF2: Multi-Fidelity-Functions

| Package Info | Status | Support |
|--------------|--------|---------|
| [![PyPI version](https://badge.fury.io/py/mf2.svg)](https://badge.fury.io/py/mf2) | [![Build Status](https://app.travis-ci.com/sjvrijn/mf2.svg?branch=main)](https://app.travis-ci.com/sjvrijn/mf2) | [![Documentation Status](https://readthedocs.org/projects/mf2/badge/?version=latest)][docs-badge] |
| [![Conda](https://img.shields.io/conda/v/conda-forge/mf2)](https://anaconda.org/conda-forge/mf2) | [![Coverage Status](https://coveralls.io/repos/github/sjvrijn/mf2/badge.svg?branch=master)](https://coveralls.io/github/sjvrijn/mf2?branch=master) | [![Gitter](https://badges.gitter.im/pymf2/community.svg)][gitter-badge] |
| ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/mf2) | [![Codacy Badge](https://api.codacy.com/project/badge/Grade/54144e7d406b4558a14996b06a89adf8)](https://www.codacy.com/manual/sjvrijn/mf2?utm_source=github.com&utm_medium=referral&utm_content=sjvrijn/mf2&utm_campaign=Badge_Grade) | |
| [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) | |
| [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4540752.svg)](https://doi.org/10.5281/zenodo.4540752) | [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4231/badge)](https://bestpractices.coreinfrastructure.org/projects/4231) | |
| [![status](https://joss.theoj.org/papers/2575e93fc693c5c3bfa8736c60c35398/status.svg)](https://joss.theoj.org/papers/2575e93fc693c5c3bfa8736c60c35398) | | |
| Package Info | Status | Support |
|--------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------|
| [![PyPI version](https://badge.fury.io/py/mf2.svg)](https://badge.fury.io/py/mf2) | [![tests status][tests-badge]][actions-page] | [![Documentation Status][docs-badge]][docs-url] |
| [![Conda](https://img.shields.io/conda/v/conda-forge/mf2)](https://anaconda.org/conda-forge/mf2) | [![Coverage Status](https://coveralls.io/repos/github/sjvrijn/mf2/badge.svg?branch=master)](https://coveralls.io/github/sjvrijn/mf2?branch=master) | [![Gitter](https://badges.gitter.im/pymf2/community.svg)][gitter-badge] |
| ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/mf2) | [![Codacy Badge](https://api.codacy.com/project/badge/Grade/54144e7d406b4558a14996b06a89adf8)](https://www.codacy.com/manual/sjvrijn/mf2?utm_source=github.com&utm_medium=referral&utm_content=sjvrijn/mf2&utm_campaign=Badge_Grade) | |
| [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) | |
| [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4540752.svg)](https://doi.org/10.5281/zenodo.4540752) | [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4231/badge)](https://bestpractices.coreinfrastructure.org/projects/4231) | |
| [![status](https://joss.theoj.org/papers/2575e93fc693c5c3bfa8736c60c35398/status.svg)](https://joss.theoj.org/papers/2575e93fc693c5c3bfa8736c60c35398) | | |

## Introduction

Expand Down Expand Up @@ -36,7 +36,7 @@ evaluations can be performed.

The only dependency of the mf2 package is the `numpy` package.

Documentation is available at [mf2.readthedocs.io][docs]
Documentation is available at [mf2.readthedocs.io][docs-url]

## Installation

Expand Down Expand Up @@ -83,7 +83,7 @@ print(mf2.branin.low(X))
```

For more usage examples, please refer to the full documentation on
[readthedocs][docs].
[readthedocs][docs-url].

## Contributing

Expand Down Expand Up @@ -116,9 +116,10 @@ appreciate it if you would cite our [JOSS paper]:
}
```


[docs]: https://mf2.readthedocs.io/en/latest/
[docs-badge]: https://mf2.readthedocs.io/en/latest/?badge=latest
[actions-page]: https://github.com/sjvrijn/mf2/actions
[tests-badge]: https://github.com/sjvrijn/mf2/workflows/tests/badge.svg
[docs-url]: https://mf2.readthedocs.io/en/latest/?badge=latest
[docs-badge]: https://readthedocs.org/projects/mf2/badge/?version=latest
[gitter]: https://gitter.im/pymf2/community
[gitter-badge]: https://gitter.im/pymf2/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge
[new-issue]: https://github.com/sjvrijn/mf2/issues/new
Expand Down

0 comments on commit 1930141

Please sign in to comment.