Skip to content

Commit b88eb84

Browse files
author
Matthias Koeppe
committed
Merge remote-tracking branch 'upstream/develop' into t/34949/sage__categories_matrix_structure___replace_imports_from_sage___all_for_namespace_packages
2 parents 6203202 + 66b319b commit b88eb84

File tree

491 files changed

+3836
-2267
lines changed

Some content is hidden

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

491 files changed

+3836
-2267
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
Unfortunately we are not accepting issues on GitHub yet. To report an issue,
2-
please head over to https://trac.sagemath.org, log in with your GitHub account,
3-
and create a ticket there :)
1+
Details to be added shortly, meanwhile feel free to open issues and PRs

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
Thanks for contributing to Sage! Unfortunately we are not accepting pull
2-
requests on GitHub yet. To propose a change to Sage, please log in with your
3-
GitHub account at https://trac.sagemath.org, create a ticket, and push your
4-
changes to that ticket as explained in our
5-
[Developer's Guide](https://doc.sagemath.org/html/en/developer/manual_git.html).
1+
Thanks for contributing to Sage! Detailed instructions to be added shortly.
62

73
Please make sure to also have a look at our
84
[Code Style Conventions](https://doc.sagemath.org/html/en/developer/coding_basics.html).

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Build & Test
22

33
on:
4+
pull_request:
45
push:
56
workflow_dispatch:
67
# Allow to run manually

.github/workflows/ci-conda.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: Build & Test using Conda
22

33
on:
4-
pull_request:
5-
types: [opened, synchronize]
64
push:
75
tags:
86
- '*'

.github/workflows/ci-cygwin-minimal.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: CI cygwin-minimal
22

33
on:
4-
pull_request:
5-
types: [opened, synchronize]
64
push:
75
tags:
86
- '*'

.github/workflows/ci-cygwin-standard.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: CI cygwin-standard
22

33
on:
4-
pull_request:
5-
types: [opened, synchronize]
64
push:
75
tags:
86
- '*'

.github/workflows/ci-linux.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ name: CI Linux
1818
#on: [push, pull_request]
1919

2020
on:
21-
pull_request:
22-
types: [opened, synchronize]
2321
push:
2422
tags:
2523
- '*'

.github/workflows/ci-macos.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ name: CI macOS
1818
#on: [push, pull_request]
1919

2020
on:
21-
pull_request:
22-
types: [opened, synchronize]
2321
push:
2422
tags:
2523
- '*'

.github/workflows/ci-wsl.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: Build & Test WSL
22

33
on:
4-
pull_request:
5-
types: [opened, synchronize]
64
push:
75
tags:
86
- '*'

.github/workflows/doc-build.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Build documentation
22

33
on:
4+
pull_request:
45
push:
56
workflow_dispatch:
67
# Allow to run manually
@@ -14,7 +15,8 @@ jobs:
1415
build-docs:
1516
runs-on: ubuntu-latest
1617
container: ghcr.io/sagemath/sage/sage-docker-ubuntu-focal-standard-with-targets:dev
17-
if: github.repository == 'sagemath/sagetrac-mirror'
18+
env:
19+
CAN_DEPLOY: ${{ secrets.NETLIFY_AUTH_TOKEN != '' }}
1820
steps:
1921
- name: Checkout
2022
uses: actions/checkout@v3
@@ -32,6 +34,7 @@ jobs:
3234
SAGE_NUM_THREADS: 2
3335

3436
- name: Copy docs
37+
if: env.CAN_DEPLOY == 'true'
3538
run: |
3639
# For some reason the deploy step below cannot find /sage/...
3740
# So copy everything from there to local folder
@@ -41,7 +44,7 @@ jobs:
4144
4245
- name: Deploy to Netlify preview
4346
id: preview-netlify
44-
if: github.ref != 'refs/heads/develop'
47+
if: env.CAN_DEPLOY == 'true' && github.ref != 'refs/heads/develop'
4548
uses: netlify/actions/cli@master
4649
with:
4750
args: deploy --dir=docs --alias="${NETLIFY_ALIAS}"
@@ -59,7 +62,7 @@ jobs:
5962

6063
- name: Deploy to Netlify production
6164
id: deploy-netlify
62-
if: github.ref == 'refs/heads/develop'
65+
if: env.CAN_DEPLOY == 'true' && github.ref == 'refs/heads/develop'
6366
uses: netlify/actions/cli@master
6467
with:
6568
args: deploy --dir=docs --prod
@@ -68,5 +71,6 @@ jobs:
6871
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
6972

7073
- name: Report deployment url
74+
if: env.CAN_DEPLOY == 'true'
7175
run: |
7276
echo "::notice::The documentation has being automatically deployed to Netlify. %0A ✅ Preview: ${{ steps.preview-netlify.outputs.NETLIFY_URL || steps.deploy-netlify.outputs.NETLIFY_URL }}"

0 commit comments

Comments
 (0)