diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e7d5fdec68..c514bf7757 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -31,7 +31,7 @@ Here are a couple of friendly tutorials you can include: http://makeapullrequest Working on your first Pull Request? You can learn how from this _free_ series, [How to Contribute to an Open Source Project on GitHub](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github). -As a side note, it helps to use newcomer-friendly language throughout the rest of your document. Here are a couple of examples from [Active Admin](https://github.com/haiiliin/abqpy/blob/2025/CONTRIBUTING.md): +As a side note, it helps to use newcomer-friendly language throughout the rest of your document. Here are a couple of examples from [Active Admin](https://github.com/haiiliin/abqpy/blob/2026/CONTRIBUTING.md): At this point, you're ready to make your changes! Feel free to ask for help; everyone is a beginner at first :smile_cat: diff --git a/.github/keylabeler.yml b/.github/keylabeler.yml index 3611976912..a51c6de606 100644 --- a/.github/keylabeler.yml +++ b/.github/keylabeler.yml @@ -9,6 +9,7 @@ caseSensitive: false # Explicit keyword mappings to labels. Form of match:label. Required. labelMappings: + "- [x] 2026": backport-to-2026 "- [x] 2025": backport-to-2025 "- [x] 2024": backport-to-2024 "- [x] 2023": backport-to-2023 diff --git a/.github/mergify.yml b/.github/mergify.yml index b09e9ddfcd..5c791ce6c7 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,4 +1,49 @@ pull_request_rules: + - name: Backport to 2026 (auto-merge) + conditions: + - label=backport-to-2026 + - label!=disable-auto-merge + - label!=disable-auto-merge-2026 + actions: + backport: + title: "{{ title }} (backport #{{ number }})" + body: | + {{ body }} + + This is an automatic backport of pull request #{{number}} done by [Mergify](https://mergify.com). + + {{ cherry_pick_error }} + branches: + - "2026" + assignees: + - "{{ author }}" + labels: + - backport + - "2026" + - name: Backport to 2026 (disable-auto-merge) + conditions: + - label=backport-to-2026 + - or: + - label=disable-auto-merge + - label=disable-auto-merge-2026 + actions: + backport: + title: "{{ title }} (backport #{{ number }})" + body: | + {{ body }} + + This is an automatic backport of pull request #{{number}} done by [Mergify](https://mergify.com). + + {{ cherry_pick_error }} + branches: + - "2026" + assignees: + - "{{ author }}" + labels: + - backport + - "2026" + - disable-auto-merge + - name: Backport to 2025 (auto-merge) conditions: - label=backport-to-2025 diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 157a1db341..747ad5f75a 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -22,6 +22,7 @@ jobs: - "2023" - "2024" - "2025" + - "2026" runs-on: ubuntu-latest steps: - name: Checkout the repository diff --git a/LICENSE b/LICENSE index 85485cdd09..63df7a7639 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022-2025 Hailin-Wang +Copyright (c) 2022-2026 Hailin-Wang Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/docs/source/conf.py b/docs/source/conf.py index 6c71686222..fb92b97e88 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -220,7 +220,7 @@ # further. For a list of options available for each theme, see the # documentation. READTHEDOCS = "READTHEDOCS" in os.environ -versions = ["dev"] + [str(v) for v in range(2025, 2015, -1)] +versions = ["dev"] + [str(v) for v in range(2026, 2015, -1)] with open(os.path.join(os.path.dirname(__file__), "locale", "edit-urls.json")) as f: edit_urls = json.load(f) html_theme_options = {