Skip to content

Commit 4b9a144

Browse files
MuellerSebMuellerSeb
authored
Merge pull request #14 from GeoStat-Framework/develop
Release v1.1.1
2 parents 4e6b80b + 3810005 commit 4b9a144

File tree

10 files changed

+152
-74
lines changed

10 files changed

+152
-74
lines changed

‎.github/workflows/main.yml

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
name: Continuous Integration
2+
3+
on:
4+
push:
5+
branches:
6+
- "master"
7+
- "develop"
8+
tags:
9+
- "*"
10+
pull_request:
11+
branches:
12+
- "develop"
13+
# Allows you to run this workflow manually from the Actions tab
14+
workflow_dispatch:
15+
16+
env:
17+
# needed by coveralls
18+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
19+
CIBW_BUILD: "cp35-* cp36-* cp37-* cp38-* cp39-*"
20+
CIBW_BEFORE_BUILD: "pip install numpy==1.17.3 cython>=0.29.14 setuptools"
21+
CIBW_TEST_REQUIRES: "pytest"
22+
CIBW_TEST_COMMAND: "pytest -v {project}/tests"
23+
24+
jobs:
25+
build_wheels:
26+
name: wheels on ${{ matrix.os }}
27+
runs-on: ${{ matrix.os }}
28+
strategy:
29+
fail-fast: false
30+
matrix:
31+
os: [ubuntu-latest, windows-latest, macos-latest]
32+
33+
steps:
34+
- uses: actions/checkout@v2
35+
with:
36+
fetch-depth: '0'
37+
38+
- name: Set up Python
39+
uses: actions\setup-python@v2
40+
with:
41+
python-version: "3.8"
42+
43+
- name: Install dependencies
44+
run: |
45+
python -m pip install --upgrade pip
46+
pip install cibuildwheel==1.7.0
47+
- name: Build wheels
48+
run: |
49+
python -m cibuildwheel --output-dir dist
50+
51+
- uses: actions/upload-artifact@v2
52+
with:
53+
path: ./dist/*.whl
54+
55+
build_sdist:
56+
name: sdist on ${{ matrix.os }} with py ${{ matrix.python-version }}
57+
runs-on: ${{ matrix.os }}
58+
strategy:
59+
fail-fast: false
60+
matrix:
61+
os: [ubuntu-latest]
62+
python-version: [3.9]
63+
64+
steps:
65+
- uses: actions/checkout@v2
66+
with:
67+
fetch-depth: '0'
68+
69+
- name: Set up Python ${{ matrix.python-version }}
70+
uses: actions\setup-python@v2
71+
with:
72+
python-version: ${{ matrix.python-version }}
73+
74+
- name: Install dependencies
75+
run: |
76+
python -m pip install --upgrade pip
77+
pip install -r requirements_setup.txt
78+
pip install -r requirements.txt
79+
pip install -r requirements_test.txt
80+
pip install coveralls>=3.0.0
81+
82+
- name: Build sdist
83+
run: |
84+
python setup.py sdist -d dist
85+
python setup.py build_ext --inplace
86+
87+
- name: Run tests
88+
run: |
89+
python -m pytest --cov pentapy --cov-report term-missing -v tests/
90+
python -m coveralls --service=github
91+
92+
- uses: actions/upload-artifact@v2
93+
# if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.9'
94+
with:
95+
path: dist/*.tar.gz
96+
97+
upload_to_pypi:
98+
needs: [build_wheels, build_sdist]
99+
runs-on: ubuntu-latest
100+
101+
steps:
102+
- uses: actions/download-artifact@v2
103+
with:
104+
name: artifact
105+
path: dist
106+
107+
- name: Publish to Test PyPI
108+
# only if working on develop
109+
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop'
110+
uses: pypa/gh-action-pypi-publish@master
111+
with:
112+
user: __token__
113+
password: ${{ secrets.test_pypi_password }}
114+
repository_url: https://test.pypi.org/legacy/
115+
skip_existing: true
116+
117+
- name: Publish to PyPI
118+
# only if tagged
119+
if: startsWith(github.ref, 'refs/tags')
120+
uses: pypa/gh-action-pypi-publish@master
121+
with:
122+
user: __token__
123+
password: ${{ secrets.pypi_password }}

‎.travis.yml

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@
33
All notable changes to **pentapy** will be documented in this file.
44

55

6+
## [1.1.1] - 2021-02
7+
8+
### Enhancements
9+
- Python 3.9 support
10+
11+
### Changes
12+
- GitHub Actions for CI
13+
14+
615
## [1.1.0] - 2020-03-22
716

817
### Enhancements
@@ -47,6 +56,7 @@ This is the first release of pentapy, a python toolbox for solving pentadiagonal
4756
The solver is implemented in cython, which makes it really fast.
4857

4958

59+
[1.1.1]: https://github.com/GeoStat-Framework/gstools/compare/v1.1.0...v1.1.1
5060
[1.1.0]: https://github.com/GeoStat-Framework/gstools/compare/v1.0.3...v1.1.0
5161
[1.0.3]: https://github.com/GeoStat-Framework/gstools/compare/v1.0.0...v1.0.3
5262
[1.0.0]: https://github.com/GeoStat-Framework/gstools/compare/v0.1.1...v1.0.0

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2019 Sebastian Mueller
3+
Copyright (c) 2021 Sebastian Mueller
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@
33
[![status](https://joss.theoj.org/papers/57c3bbdd7b7f3068dd1e669ccbcf107c/status.svg)](https://joss.theoj.org/papers/57c3bbdd7b7f3068dd1e669ccbcf107c)
44
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2587158.svg)](https://doi.org/10.5281/zenodo.2587158)
55
[![PyPI version](https://badge.fury.io/py/pentapy.svg)](https://badge.fury.io/py/pentapy)
6-
[![Build Status](https://travis-ci.com/GeoStat-Framework/pentapy.svg?branch=master)](https://travis-ci.com/GeoStat-Framework/pentapy)
7-
[![Coverage Status](https://coveralls.io/repos/github/GeoStat-Framework/pentapy/badge.svg?branch=master)](https://coveralls.io/github/GeoStat-Framework/pentapy?branch=master)
8-
[![Documentation Status](https://readthedocs.org/projects/pentapy/badge/?version=stable)](https://geostat-framework.readthedocs.io/projects/pentapy/en/stable/?badge=stable)
6+
[![Build Status](https://github.com/GeoStat-Framework/pentapy/workflows/Continuous%20Integration/badge.svg?branch=develop)](https://github.com/GeoStat-Framework/pentapy/actions)
7+
[![Coverage Status](https://coveralls.io/repos/github/GeoStat-Framework/pentapy/badge.svg?branch=develop)](https://coveralls.io/github/GeoStat-Framework/pentapy?branch=develop)
8+
[![Documentation Status](https://readthedocs.org/projects/pentapy/badge/?version=latest)](https://geostat-framework.readthedocs.io/projects/pentapy/en/latest/?badge=latest)
99
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
1010

11+
<p align="center">
12+
<img src="https://github.com/GeoStat-Framework/GeoStat-Framework.github.io/raw/master/docs/source/pics/pentapy.png" alt="pentapy-LOGO" width="251px"/>
13+
</p>
14+
1115

1216
## Purpose
1317

@@ -57,7 +61,7 @@ presented by [Askar et al. 2015][ref_link].
5761

5862
## Documentation and Examples
5963

60-
You can find the documentation under [geostat-framework.readthedocs.io][doc_link].
64+
You can find the documentation under [https://pentapy.readthedocs.org][doc_link].
6165

6266
### Solving a pentadiagonal linear equation system
6367

@@ -123,7 +127,7 @@ You can contact us via <[email protected]>.
123127

124128
## License
125129

126-
[MIT][licence_link] © 2019 - 2020
130+
[MIT][licence_link] © 2019 - 2021
127131

128132
[ref_link]: http://dx.doi.org/10.1155/2015/232456
129133
[pip_link]: https://pypi.org/project/pentapy

‎docs/source/conf.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,14 @@ def setup(app):
172172

173173
# Output file base name for HTML help builder.
174174
htmlhelp_basename = "pentapydoc"
175-
175+
# logos for the page
176+
html_logo = "pics/pentapy_150.png"
177+
html_favicon = "pics/pentapy.ico"
176178

177179
# -- Options for LaTeX output ---------------------------------------------
178180
# latex_engine = 'lualatex'
179181
# logo to big
180-
# latex_logo = "pics/gstools_150.png"
182+
latex_logo = "pics/pentapy_150.png"
181183

182184
# latex_show_urls = 'footnote'
183185
# http://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-latex-output

‎docs/source/index.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
pentapy Quickstart
33
==================
44

5+
.. image:: /pics/pentapy.png
6+
:width: 150px
7+
:align: center
8+
9+
510
pentapy is a toolbox to deal with pentadiagonal matrices in Python and solve
611
the corresponding linear equation systems.
712

‎docs/source/pics/pentapy.ico

4.19 KB
Binary file not shown.

‎docs/source/pics/pentapy.png

57.9 KB
Loading

‎docs/source/pics/pentapy_150.png

11.5 KB
Loading

0 commit comments

Comments
 (0)