Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 518b577

Browse files
authoredFeb 25, 2024··
Merge branch 'develop' into random_bugs
2 parents 20e13c8 + acbe15d commit 518b577

File tree

590 files changed

+9581
-529397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

590 files changed

+9581
-529397
lines changed
 

‎.github/PULL_REQUEST_TEMPLATE.md

+12-18
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,26 @@
1-
<!-- ^^^^^
2-
Please provide a concise, informative and self-explanatory title.
3-
Don't put issue numbers in there, do this in the PR body below.
4-
For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1"
5-
-->
6-
<!-- Describe your changes here in detail -->
1+
<!-- ^ Please provide a concise and informative title. -->
2+
<!-- ^ Don't put issue numbers in the title, do this in the PR description below. -->
3+
<!-- ^ For example, instead of "Fixes #12345" use "Introduce new method to calculate 1 + 2". -->
4+
<!-- v Describe your changes below in detail. -->
5+
<!-- v Why is this change required? What problem does it solve? -->
6+
<!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes #12345". -->
7+
78

8-
<!-- Why is this change required? What problem does it solve? -->
9-
<!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". -->
10-
<!-- If your change requires a documentation PR, please link it appropriately. -->
119

1210
### :memo: Checklist
1311

1412
<!-- Put an `x` in all the boxes that apply. -->
15-
<!-- If your change requires a documentation PR, please link it appropriately -->
16-
<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
17-
<!-- Feel free to remove irrelevant items. -->
1813

19-
- [ ] The title is concise, informative, and self-explanatory.
14+
- [ ] The title is concise and informative.
2015
- [ ] The description explains in detail what this PR is about.
2116
- [ ] I have linked a relevant issue or discussion.
2217
- [ ] I have created tests covering the changes.
2318
- [ ] I have updated the documentation accordingly.
2419

2520
### :hourglass: Dependencies
2621

27-
<!-- List all open PRs that this PR logically depends on
28-
- #12345: short description why this is a dependency
29-
- #34567: ...
30-
-->
22+
<!-- List all open PRs that this PR logically depends on. For example, -->
23+
<!-- - #12345: short description why this is a dependency -->
24+
<!-- - #34567: ... -->
25+
3126

32-
<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->

‎.github/workflows/ci-conda.yml

+17-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,26 @@ jobs:
2222

2323
strategy:
2424
matrix:
25-
os: [ubuntu, macos]
26-
python: ['3.9', '3.10', '3.11']
25+
# On pushes to tags or branches, test the whole matrix.
26+
os: >-
27+
${{ github.event_name == 'pull_request'
28+
&& fromJson('["ubuntu"]')
29+
|| fromJson('["ubuntu", "macos"]') }}
30+
python: >-
31+
${{ github.event_name == 'pull_request'
32+
&& fromJson('["3.9"]')
33+
|| fromJson('["3.9", "3.10", "3.11"]') }}
2734
# Optional environment is disabled for now as its not yet working
2835
# environment: [environment, environment-optional]
2936
conda-env: [environment]
37+
# On pull requests, only test two jobs:
38+
# Ubuntu with Python 3.9, macOS with Python 3.10.
39+
# Build & Test currently uses Python 3.11 (on ubuntu-focal).
40+
# Together, they cover the supported minor Python versions.
41+
include: >-
42+
${{ github.event_name == 'pull_request'
43+
&& fromJson('[{"os": "macos", "python": "3.10", "conda-env": "environment"}]')
44+
|| fromJson('[]') }}
3045
3146
steps:
3247
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)
Please sign in to comment.