From 000fcddcbe0ee19ab7848eaf28316c467ecc3cdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20M=C3=BCller?= <mueller.seb@posteo.de>
Date: Tue, 6 Jul 2021 10:32:14 +0200
Subject: [PATCH] GIT: refer to new standard branch 'main'

---
 .github/workflows/main.yml | 13 ++++++-------
 README.md                  | 10 +++++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6bdb716..7791bdb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,13 +3,12 @@ name: Continuous Integration
 on:
   push:
     branches:
-      - "master"
-      - "develop"
+      - "main"
     tags:
       - "*"
   pull_request:
     branches:
-      - "develop"
+      - "main"
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
@@ -31,12 +30,12 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install black pylint
+          pip install black 'pylint<3'
           pip install --editable .
 
       - name: black check
         run: |
-          python -m black --check .
+          python -m black --check --diff --color .
 
       - name: pylint check
         run: |
@@ -121,8 +120,8 @@ jobs:
           path: dist
 
       - name: Publish to Test PyPI
-        # only if working on master or develop
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop'
+        # only if working on main
+        if: github.ref == 'refs/heads/main'
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
diff --git a/README.md b/README.md
index 145246a..847c876 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,8 @@
 [![status](https://joss.theoj.org/papers/57c3bbdd7b7f3068dd1e669ccbcf107c/status.svg)](https://joss.theoj.org/papers/57c3bbdd7b7f3068dd1e669ccbcf107c)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2587158.svg)](https://doi.org/10.5281/zenodo.2587158)
 [![PyPI version](https://badge.fury.io/py/pentapy.svg)](https://badge.fury.io/py/pentapy)
-[![Build Status](https://github.com/GeoStat-Framework/pentapy/workflows/Continuous%20Integration/badge.svg?branch=develop)](https://github.com/GeoStat-Framework/pentapy/actions)
-[![Coverage Status](https://coveralls.io/repos/github/GeoStat-Framework/pentapy/badge.svg?branch=develop)](https://coveralls.io/github/GeoStat-Framework/pentapy?branch=develop)
+[![Build Status](https://github.com/GeoStat-Framework/pentapy/workflows/Continuous%20Integration/badge.svg?branch=main)](https://github.com/GeoStat-Framework/pentapy/actions)
+[![Coverage Status](https://coveralls.io/repos/github/GeoStat-Framework/pentapy/badge.svg?branch=main)](https://coveralls.io/github/GeoStat-Framework/pentapy?branch=main)
 [![Documentation Status](https://readthedocs.org/projects/pentapy/badge/?version=latest)](https://geostat-framework.readthedocs.io/projects/pentapy/en/latest/?badge=latest)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
 
@@ -100,14 +100,14 @@ In the following a couple of solvers for pentadiagonal systems are compared:
 * Solver 5: pentapy.solve with ``solver=2``
 
 <p align="center">
-<img src="https://raw.githubusercontent.com/GeoStat-Framework/pentapy/master/examples/perfplot_simple.png" alt="Performance" width="600px"/>
+<img src="https://raw.githubusercontent.com/GeoStat-Framework/pentapy/main/examples/perfplot_simple.png" alt="Performance" width="600px"/>
 </p>
 
 The implementations of pentapy are almost one order of magnitude faster than the
 scipy algorithms for banded or sparse matrices.
 
 The performance plot was created with [``perfplot``](https://github.com/nschloe/perfplot).
-Have a look at the script: [``examples/03_perform_simple.py``](https://github.com/GeoStat-Framework/pentapy/blob/master/examples/03_perform_simple.py).
+Have a look at the script: [``examples/03_perform_simple.py``](https://github.com/GeoStat-Framework/pentapy/blob/main/examples/03_perform_simple.py).
 
 
 
@@ -132,5 +132,5 @@ You can contact us via <info@geostat-framework.org>.
 [ref_link]: http://dx.doi.org/10.1155/2015/232456
 [pip_link]: https://pypi.org/project/pentapy
 [winpy_link]: https://winpython.github.io/
-[licence_link]: https://github.com/GeoStat-Framework/pentapy/blob/master/LICENSE
+[licence_link]: https://github.com/GeoStat-Framework/pentapy/blob/main/LICENSE
 [doc_link]: https://pentapy.readthedocs.org
\ No newline at end of file