diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 82cbf07c..7809cfbb 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -6,6 +6,7 @@ - [ ] Bug fix. - [ ] New feature. - [ ] Documentation update. +- [ ] Testing. ## Checklist for the reviewer: diff --git a/.github/workflows/cd_release.yml b/.github/workflows/cd_release.yml index a0f754b5..8357f404 100644 --- a/.github/workflows/cd_release.yml +++ b/.github/workflows/cd_release.yml @@ -14,7 +14,7 @@ jobs: # General git_username: "TEAM 4.0[bot]" git_email: "Team4.0@SINTEF.no" - release_branch: main + release_branch: master install_extras: "[dev]" # Build package diff --git a/.github/workflows/ci_cd_updated_main.yml b/.github/workflows/ci_cd_updated_main.yml index a0d0eb51..f13c1b96 100644 --- a/.github/workflows/ci_cd_updated_main.yml +++ b/.github/workflows/ci_cd_updated_main.yml @@ -1,8 +1,8 @@ -name: CI/CD - New updates to 'main' +name: CI/CD - New updates to 'master' on: push: - branches: [main] + branches: [master] jobs: update-deps-branch-and-docs: @@ -13,7 +13,7 @@ jobs: git_username: "TEAM 4.0[bot]" git_email: "Team4.0@SINTEF.no" permanent_dependencies_branch: "ci/dependency-updates" - default_repo_branch: main + default_repo_branch: master package_dirs: tripper update_docs: true update_python_api_ref: true diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 41f19b82..d984ef1f 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - 'main' + - 'master' - 'push-action/**' # Allow pushing to protected branches (using CasperWA/push-protected) jobs: diff --git a/.github/workflows/ci_update_dependencies.yml b/.github/workflows/ci_update_dependencies.yml index 6047b001..72cd429d 100644 --- a/.github/workflows/ci_update_dependencies.yml +++ b/.github/workflows/ci_update_dependencies.yml @@ -15,7 +15,7 @@ jobs: git_username: "TEAM 4.0[bot]" git_email: "Team4.0@SINTEF.no" permanent_dependencies_branch: "ci/dependency-updates" - default_repo_branch: main + default_repo_branch: master pr_labels: "CI/CD,skip_changelog" extra_to_dos: "- [ ] Make sure that the PR is **squash** merged, with a sensible commit message." update_pre-commit: true diff --git a/README.md b/README.md index c14341d6..c097936d 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ _Triplestore wrapper for Python providing a simple and consistent interface to a [![PyPI](https://img.shields.io/pypi/v/tripper?logo=pypi)](https://pypi.org/project/tripper) [![Documentation](https://img.shields.io/badge/documentation-informational?logo=github)](https://emmc-asbl.github.io/tripper/latest/) -[![CI tests](https://github.com/EMMC-ASBL/tripper/workflows/CI%20-%20Tests/badge.svg)](https://github.com/EMMC-ASBL/tripper/actions/workflows/ci_tests.yml?query=branch%3Amain) +[![CI tests](https://github.com/EMMC-ASBL/tripper/workflows/CI%20-%20Tests/badge.svg)](https://github.com/EMMC-ASBL/tripper/actions/workflows/ci_tests.yml?query=branch%3Amaster) [![DOI](https://zenodo.org/badge/547162834.svg)](https://zenodo.org/badge/latestdoi/547162834) diff --git a/docs/index.md b/docs/index.md index 50fd13e6..e8b60a84 100644 --- a/docs/index.md +++ b/docs/index.md @@ -5,7 +5,7 @@ _Triplestore wrapper for Python providing a simple and consistent interface to a [![PyPI](https://img.shields.io/pypi/v/tripper?logo=pypi)](https://pypi.org/project/tripper) [![Documentation](https://img.shields.io/badge/documentation-informational?logo=github)](https://emmc-asbl.github.io/tripper/latest/) -[![CI tests](https://github.com/EMMC-ASBL/tripper/workflows/CI%20-%20Tests/badge.svg)](https://github.com/EMMC-ASBL/tripper/actions/workflows/ci_tests.yml?query=branch%3Amain) +[![CI tests](https://github.com/EMMC-ASBL/tripper/workflows/CI%20-%20Tests/badge.svg)](https://github.com/EMMC-ASBL/tripper/actions/workflows/ci_tests.yml?query=branch%3Amaster) [![DOI](https://zenodo.org/badge/547162834.svg)](https://zenodo.org/badge/latestdoi/547162834) diff --git a/examples/workflow-mappings/README.md b/examples/workflow-mappings/README.md index 74701cab..ee3711dc 100644 --- a/examples/workflow-mappings/README.md +++ b/examples/workflow-mappings/README.md @@ -40,4 +40,4 @@ which should produce the following graph: - [workflow_example.py]: https://github.com/EMMC-ASBL/tripper/blob/main/examples/workflow-mappings/workflow_mappings.py + [workflow_example.py]: https://github.com/EMMC-ASBL/tripper/blob/master/examples/workflow-mappings/workflow_mappings.py diff --git a/pyproject.toml b/pyproject.toml index 7a062c98..9d3d8e08 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,7 +76,7 @@ Home = "https://github.com/EMMC-ASBL/tripper" Documentation = "https://EMMC-ASBL.github.io/tripper" Source = "https://github.com/EMMC-ASBL/tripper" "Issue Tracker" = "https://github.com/EMMC-ASBL/tripper/issues" -Changelog = "https://github.com/EMMC-ASBL/tripper/blob/main/CHANGELOG.md" +Changelog = "https://github.com/EMMC-ASBL/tripper/blob/master/CHANGELOG.md" Package = "https://pypi.org/project/tripper" [tool.isort]