diff --git a/.github/ISSUE_TEMPLATE/bug_report_form.yaml b/.github/ISSUE_TEMPLATE/bug_report_form.yaml index 32a59226a..6166f8351 100644 --- a/.github/ISSUE_TEMPLATE/bug_report_form.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report_form.yaml @@ -68,7 +68,7 @@ body: id: terms attributes: label: Code of Conduct - description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/Anselmoo/spectrafit/blob/master/CODE_OF_CONDUCT.md) + description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/Anselmoo/spectrafit/blob/main/CODE_OF_CONDUCT.md) options: - label: I agree to follow this project's Code of Conduct required: true diff --git a/.github/ISSUE_TEMPLATE/documentation_request_form.yaml b/.github/ISSUE_TEMPLATE/documentation_request_form.yaml index 5827ddeef..80b86961d 100644 --- a/.github/ISSUE_TEMPLATE/documentation_request_form.yaml +++ b/.github/ISSUE_TEMPLATE/documentation_request_form.yaml @@ -39,7 +39,7 @@ body: id: terms attributes: label: Code of Conduct - description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/Anselmoo/spectrafit/blob/master/CODE_OF_CONDUCT.md) + description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/Anselmoo/spectrafit/blob/main/CODE_OF_CONDUCT.md) options: - label: I agree to follow this project's Code of Conduct required: true diff --git a/.github/ISSUE_TEMPLATE/feature_request_form.yaml b/.github/ISSUE_TEMPLATE/feature_request_form.yaml index 6e65a6e6c..872e5234b 100644 --- a/.github/ISSUE_TEMPLATE/feature_request_form.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request_form.yaml @@ -46,7 +46,7 @@ body: id: terms attributes: label: Code of Conduct - description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/Anselmoo/spectrafit/blob/master/CODE_OF_CONDUCT.md) + description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/Anselmoo/spectrafit/blob/main/CODE_OF_CONDUCT.md) options: - label: I agree to follow this project's Code of Conduct required: true diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 78de2592b..8858741c5 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ master ] + branches: [ main ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ main ] schedule: - cron: '33 9 * * 0' diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml index 757454d5e..49602a2c9 100644 --- a/.github/workflows/python-ci.yml +++ b/.github/workflows/python-ci.yml @@ -2,9 +2,9 @@ name: CI - Python Package on: push: - branches: [master] + branches: [main] pull_request: - branches: [master] + branches: [main] jobs: pre-commit: @@ -70,7 +70,7 @@ jobs: git config --local user.email "action@github.com" git config --local user.name "GitHub Action" - name: Deploy documentation develops - if: contains(github.ref, 'refs/heads/master') + if: contains(github.ref, 'refs/heads/main') run: | poetry run mkdocs gh-deploy --clean --force docker: diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 5571598b7..075482a23 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -4,14 +4,14 @@ on: push: # branches to consider in the event; optional, defaults to all branches: - - master + - main jobs: update_release_draft: if: github.repository == 'Anselmoo/spectrafit' runs-on: ubuntu-latest steps: - # Drafts your next Release notes as Pull Requests are merged into "master" + # Drafts your next Release notes as Pull Requests are merged into "main" - uses: release-drafter/release-drafter@v5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aec41c137..8a03c4f4e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ # To contribute improvements to CI/CD templates, please follow the Development guide at: # https://docs.gitlab.com/ee/development/cicd/templates.html # This specific template is located at: -# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Python.gitlab-ci.yml +# https://gitlab.com/gitlab-org/gitlab/-/blob/main/lib/gitlab/ci/templates/Python.gitlab-ci.yml # Official language image. Look for the different tagged releases at: # https://hub.docker.com/r/library/python/tags/ diff --git a/CHANGELOG.md b/CHANGELOG.md index cf926a5f9..98c92241e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -128,7 +128,7 @@ [1]: https://github.com/Anselmoo/spectrafit/releases [2]: https://ghcr.io/anselmoo/spectrafit:latest [3]: https://pypi.org/project/spectrafit/ -[4]: https://github.com/Anselmoo/spectrafit/blob/master/CONTRIBUTING.md +[4]: https://github.com/Anselmoo/spectrafit/blob/main/CONTRIBUTING.md [5]: https://codecov.io/gh/Anselmoo/spectrafit [6]: https://github.com/marketplace/actions/pre-commit [7]: https://mypy.readthedocs.io/en/stable/ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c2cae80bd..f30b8b512 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -77,7 +77,7 @@ This template is adapted from [opengovernment][3]. [1]: https://github.com/Anselmoo/spectrafit/actions [2]: https://google.github.io/styleguide/pyguide.html [3]: - https://github.com/opengovernment/opengovernment/blob/master/CONTRIBUTING.md + https://github.com/opengovernment/opengovernment/blob/main/CONTRIBUTING.md [4]: https://python-poetry.org [5]: https://pre-commit.com [6]: https://github.com/pyenv/pyenv diff --git a/README.md b/README.md index fcbaaf312..48001431c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![CI - Python Package](https://github.com/Anselmoo/spectrafit/actions/workflows/python-ci.yml/badge.svg?branch=master)](https://github.com/Anselmoo/spectrafit/actions/workflows/python-ci.yml) -[![codecov](https://codecov.io/gh/Anselmoo/spectrafit/branch/master/graph/badge.svg?token=pNIMKwWsO2)](https://codecov.io/gh/Anselmoo/spectrafit) +[![CI - Python Package](https://github.com/Anselmoo/spectrafit/actions/workflows/python-ci.yml/badge.svg?branch=main)](https://github.com/Anselmoo/spectrafit/actions/workflows/python-ci.yml) +[![codecov](https://codecov.io/gh/Anselmoo/spectrafit/branch/main/graph/badge.svg?token=pNIMKwWsO2)](https://codecov.io/gh/Anselmoo/spectrafit) [![PyPI](https://img.shields.io/pypi/v/spectrafit?logo=PyPi&logoColor=yellow)](https://pypi.org/project/spectrafit/) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/spectrafit?color=gree&logo=Python&logoColor=yellow)](https://pypi.org/project/spectrafit/) diff --git a/SECURITY.md b/SECURITY.md index 47e18f42f..dfec63fd4 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -24,4 +24,4 @@ vulnerability, what to expect if the vulnerability is accepted or declined, etc. [1]: https://securitylab.github.com/tools/codeql/ [2]: - https://github.com/Anselmoo/spectrafit/blob/master/.github/workflows/codeql-analysis.yml + https://github.com/Anselmoo/spectrafit/blob/main/.github/workflows/codeql-analysis.yml diff --git a/mkdocs.yml b/mkdocs.yml index bbee6ce71..65f8add06 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -6,7 +6,7 @@ site_description: >- # Repository repo_name: Anselmoo/SpectraFit repo_url: https://github.com/Anselmoo/spectrafit -edit_uri: "https://github.com/Anselmoo/spectrafit/tree/master/docs" +edit_uri: "https://github.com/Anselmoo/spectrafit/tree/main/docs" # Copyright copyright: Copyright © 2021 - Anselm Hahn