Skip to content

Commit 000fcdd

Browse files
committed
GIT: refer to new standard branch 'main'
1 parent 47efd9b commit 000fcdd

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ name: Continuous Integration
33
on:
44
push:
55
branches:
6-
- "master"
7-
- "develop"
6+
- "main"
87
tags:
98
- "*"
109
pull_request:
1110
branches:
12-
- "develop"
11+
- "main"
1312
# Allows you to run this workflow manually from the Actions tab
1413
workflow_dispatch:
1514

@@ -31,12 +30,12 @@ jobs:
3130
- name: Install dependencies
3231
run: |
3332
python -m pip install --upgrade pip
34-
pip install black pylint
33+
pip install black 'pylint<3'
3534
pip install --editable .
3635
3736
- name: black check
3837
run: |
39-
python -m black --check .
38+
python -m black --check --diff --color .
4039
4140
- name: pylint check
4241
run: |
@@ -121,8 +120,8 @@ jobs:
121120
path: dist
122121

123122
- name: Publish to Test PyPI
124-
# only if working on master or develop
125-
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop'
123+
# only if working on main
124+
if: github.ref == 'refs/heads/main'
126125
uses: pypa/gh-action-pypi-publish@release/v1
127126
with:
128127
user: __token__

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
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://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)
6+
[![Build Status](https://github.com/GeoStat-Framework/pentapy/workflows/Continuous%20Integration/badge.svg?branch=main)](https://github.com/GeoStat-Framework/pentapy/actions)
7+
[![Coverage Status](https://coveralls.io/repos/github/GeoStat-Framework/pentapy/badge.svg?branch=main)](https://coveralls.io/github/GeoStat-Framework/pentapy?branch=main)
88
[![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

@@ -100,14 +100,14 @@ In the following a couple of solvers for pentadiagonal systems are compared:
100100
* Solver 5: pentapy.solve with ``solver=2``
101101

102102
<p align="center">
103-
<img src="https://raw.githubusercontent.com/GeoStat-Framework/pentapy/master/examples/perfplot_simple.png" alt="Performance" width="600px"/>
103+
<img src="https://raw.githubusercontent.com/GeoStat-Framework/pentapy/main/examples/perfplot_simple.png" alt="Performance" width="600px"/>
104104
</p>
105105

106106
The implementations of pentapy are almost one order of magnitude faster than the
107107
scipy algorithms for banded or sparse matrices.
108108

109109
The performance plot was created with [``perfplot``](https://github.com/nschloe/perfplot).
110-
Have a look at the script: [``examples/03_perform_simple.py``](https://github.com/GeoStat-Framework/pentapy/blob/master/examples/03_perform_simple.py).
110+
Have a look at the script: [``examples/03_perform_simple.py``](https://github.com/GeoStat-Framework/pentapy/blob/main/examples/03_perform_simple.py).
111111

112112

113113

@@ -132,5 +132,5 @@ You can contact us via <info@geostat-framework.org>.
132132
[ref_link]: http://dx.doi.org/10.1155/2015/232456
133133
[pip_link]: https://pypi.org/project/pentapy
134134
[winpy_link]: https://winpython.github.io/
135-
[licence_link]: https://github.com/GeoStat-Framework/pentapy/blob/master/LICENSE
135+
[licence_link]: https://github.com/GeoStat-Framework/pentapy/blob/main/LICENSE
136136
[doc_link]: https://pentapy.readthedocs.org

0 commit comments

Comments
 (0)