Skip to content

Commit

Permalink
Merge pull request #121 from EMMC-ASBL/116-default-branch
Browse files Browse the repository at this point in the history
Update dependabot after changing master branch to 'master'
  • Loading branch information
sygout authored Jul 10, 2023
2 parents eec4fca + 2ea9896 commit 84d11a9
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- [ ] Bug fix.
- [ ] New feature.
- [ ] Documentation update.
- [ ] Testing.

## Checklist for the reviewer:
<!-- Put an `x` in the boxes that apply. These can be filled by reviewer after the PR is created. -->
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cd_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
# General
git_username: "TEAM 4.0[bot]"
git_email: "[email protected]"
release_branch: main
release_branch: master
install_extras: "[dev]"

# Build package
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci_cd_updated_main.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -13,7 +13,7 @@ jobs:
git_username: "TEAM 4.0[bot]"
git_email: "[email protected]"
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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
push:
branches:
- 'main'
- 'master'
- 'push-action/**' # Allow pushing to protected branches (using CasperWA/push-protected)

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_update_dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
git_username: "TEAM 4.0[bot]"
git_email: "[email protected]"
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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
2 changes: 1 addition & 1 deletion examples/workflow-mappings/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit 84d11a9

Please sign in to comment.