Skip to content

Commit

Permalink
Merge branch 'release/0.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
morganjwilliams committed Mar 15, 2021
2 parents 90ff50d + a64cd55 commit 6c5cdb4
Show file tree
Hide file tree
Showing 119 changed files with 4,045 additions and 1,380 deletions.
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[run]
relative_files = True
source = pyrolite
omit =
# Omit test, docs, draft and data files
Expand All @@ -8,7 +9,6 @@ omit =
draft/*

# Omit extensions with extra dependencies
pyrolite/util/wfs.py
pyrolite/util/database.py

# Ignore _version.py
Expand Down
43 changes: 43 additions & 0 deletions .github/workflows/docstest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: DocsTest

on:
push:
pull_request:
branches:
- develop
schedule:
- cron: '0 0 * * 0' # weekly

jobs:
build:
name: Build Docs
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]
python-version: [3.7, 3.8]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Get pip cache dir
id: pip-cache-dir
run: |
echo "::set-output name=dir::$(pip cache dir)"
- name: pip cache
id: pip-cache
uses: actions/cache@v2
with:
path: ${{ steps.pip-cache-dir.outputs.dir }}
key: ${{ runner.os }}-pip-${{ hashFiles('setup.py') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Python Packages Install
run: |
python -m pip install --upgrade pip # upgrade pip
pip install wheel
pip install .[skl,stats,docs]
- name: Build
run: |
cd docs && make html
83 changes: 83 additions & 0 deletions .github/workflows/unittest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
name: Unittest

on:
push:
pull_request:
branches:
- develop
schedule:
- cron: '0 0 * * 0' # weekly

jobs:
unit_tests:
name: Unit Tests
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: [3.6, 3.7, 3.8]
exclude:
# excludes py38 on macOS, which seems to stall currently
- os: macos-latest
python-version: 3.8
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Get pip cache dir
id: pip-cache-dir
run: |
echo "::set-output name=dir::$(pip cache dir)"
- name: pip cache
id: pip-cache
uses: actions/cache@v2
with:
path: ${{ steps.pip-cache-dir.outputs.dir }}
key: ${{ runner.os }}-pip-${{ hashFiles('setup.py') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Python Packages Install
run: |
python -m pip install --upgrade pip # upgrade pip
pip install wheel
pip install -q pytest pytest-runner pytest-cov coverage codacy-coverage
pip install coveralls
pip install .[skl,stats]
- name: Test Windows
if: runner.os == 'Windows'
env:
MPLBACKEND: Agg
run: python setup.py test
- name: Test MacOS
if: runner.os == 'macOS'
run: python setup.py test
- name: Prep Linux
if: runner.os == 'Linux'
run: |
sudo apt-get install jq curl # codacy requirement
sudo apt-get install xvfb
- name: Test Linux
if: runner.os == 'Linux'
run: |
xvfb-run python setup.py test
- name: Coveralls
env:
COVERALLS_SERVICE_NAME: github
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_FLAG_NAME: ${{ matrix.test-name }}
COVERALLS_PARALLEL: true
run: |
coveralls
coveralls:
name: Indicate completion to coveralls.io
needs: unit_tests
runs-on: ubuntu-latest
container: python:3-slim
steps:
- name: Finished
run: |
pip3 install --upgrade coveralls
coveralls --finish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
55 changes: 0 additions & 55 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ If you use pyrolite extensively for your research, citation of the software woul

| **master** | **develop** |
|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
| [![Build Status](https://travis-ci.org/morganjwilliams/pyrolite.svg?branch=master)](https://travis-ci.org/morganjwilliams/pyrolite) | [![Build Status](https://travis-ci.org/morganjwilliams/pyrolite.svg?branch=develop)](https://travis-ci.org/morganjwilliams/pyrolite) |
| [![Unit Tests on Master](https://github.com/morganjwilliams/pyrolite/workflows/Unittest/badge.svg?branch=master)](https://github.com/morganjwilliams/pyrolite/actions?query=workflow:Unittest+branch:master) | [![Unit Tests on Develop](https://github.com/morganjwilliams/pyrolite/workflows/Unittest/badge.svg?branch=develop)](https://github.com/morganjwilliams/pyrolite/actions?query=workflow:Unittest+branch:develop) |
| [![Coverage Status](https://coveralls.io/repos/github/morganjwilliams/pyrolite/badge.svg?branch=master)](https://coveralls.io/github/morganjwilliams/pyrolite?branch=master) | [![Coverage Status](https://coveralls.io/repos/github/morganjwilliams/pyrolite/badge.svg?branch=develop)](https://coveralls.io/github/morganjwilliams/pyrolite?branch=develop) |

**Maintainer**: Morgan Williams (morgan.williams _at_ csiro.au)
2 changes: 1 addition & 1 deletion docs/docs_require.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-e .[docs,skl]
.[docs,skl]
2 changes: 2 additions & 0 deletions docs/source/api/API.rst
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ pyrolite\.util
util/lambdas
util/distributions
util/synthetic
util/spatial
util/resampling
util/missing
util/units
util/types
Expand Down
41 changes: 41 additions & 0 deletions docs/source/api/util/lambdas.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,46 @@

pyrolite\.util\.lambdas
-------------------------------
.. automodule:: pyrolite.util.lambdas
:members:
:undoc-members:

pyrolite\.util\.lambdas\.params
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: pyrolite.util.lambdas.params
:members:
:undoc-members:


pyrolite\.util\.lambdas\.eval
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: pyrolite.util.lambdas.eval
:members:
:undoc-members:


pyrolite\.util\.lambdas\.oneill
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: pyrolite.util.lambdas.oneill
:members:
:undoc-members:


pyrolite\.util\.lambdas\.opt
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: pyrolite.util.lambdas.opt
:members:
:undoc-members:


pyrolite\.util\.lambdas\.plot
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: pyrolite.util.lambdas.plot
:members:
:undoc-members:

pyrolite\.util\.lambdas\.transform
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. automodule:: pyrolite.util.lambdas.transform
:members:
:undoc-members:
5 changes: 5 additions & 0 deletions docs/source/api/util/resampling.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pyrolite\.util\.resampling
-------------------------------
.. automodule:: pyrolite.util.resampling
:members:
:undoc-members:
5 changes: 5 additions & 0 deletions docs/source/api/util/spatial.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pyrolite\.util\.spatial
-------------------------------
.. automodule:: pyrolite.util.spatial
:members:
:undoc-members:
Loading

0 comments on commit 6c5cdb4

Please sign in to comment.