Skip to content

Commit d98aa33

Browse files
authored
Merge pull request #62 from udesou/update-julia-master
Update Julia to latest master
2 parents d907a06 + 5bbfd16 commit d98aa33

File tree

1,220 files changed

+90877
-48863
lines changed

Some content is hidden

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

1,220 files changed

+90877
-48863
lines changed

.git-blame-ignore-revs

+4
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ e66bfa5dd32f93e76068c00ad882c1fc839c5af8
77
100a741e7ab38c91d48cc929bb001afc8e09261f
88
# whitespace: replace tabs => space
99
b03e8ab9c7bd3e001add519571858fa04d6a249b
10+
# whitespace: replace 2-space => 4-space for indentation
11+
f1b567507731129f90ca0dffc8fbc0ed98b6a15d
12+
# whitespace: replace multiple spaces after period with a single space
13+
f942c29bb0d02cc24f19712c642ac72ffc85a26b

.github/workflows/LabelCheck.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ jobs:
1515
with:
1616
# REQUIRED_LABELS_ANY: "bug,enhancement,skip-changelog"
1717
# REQUIRED_LABELS_ANY_DESCRIPTION: "Select at least one label ['bug','enhancement','skip-changelog']"
18-
BANNED_LABELS: "needs docs,needs compat annotation,needs more info,needs nanosoldier run,needs news,needs pkgeval,needs tests,DO NOT MERGE"
19-
BANNED_LABELS_DESCRIPTION: "A PR should not be merged with `needs *` or `DO NOT MERGE` labels"
18+
BANNED_LABELS: "needs docs,needs compat annotation,needs more info,needs nanosoldier run,needs news,needs pkgeval,needs tests,needs decision,DO NOT MERGE,status:DO NOT MERGE"
19+
BANNED_LABELS_DESCRIPTION: "A PR should not be merged with `needs *` or `status:DO NOT MERGE` labels"

.github/workflows/Typos.yml

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: Typos
2+
3+
permissions: {}
4+
5+
on: [pull_request]
6+
7+
jobs:
8+
typos-check:
9+
name: Check for new typos
10+
runs-on: ubuntu-latest
11+
timeout-minutes: 5
12+
steps:
13+
- name: Checkout the JuliaLang/julia repository
14+
uses: actions/checkout@v4
15+
with:
16+
persist-credentials: false
17+
- name: Check spelling with typos
18+
#uses: crate-ci/typos@master
19+
env:
20+
GH_TOKEN: "${{ github.token }}"
21+
run: |
22+
git fetch --depth=1 origin ${{ github.base_ref }}
23+
OLD_FILES=$(git diff-index --name-only --diff-filter=ad FETCH_HEAD)
24+
NEW_FILES=$(git diff-index --name-only --diff-filter=d FETCH_HEAD)
25+
26+
# This is necessary because the typos command interprets the
27+
# empty string as "check all files" rather than "check no files".
28+
if [ -z "$NEW_FILES" ]; then
29+
echo "All edited files were deleted. Skipping typos check."
30+
exit 0
31+
fi
32+
33+
mkdir -p "${{ runner.temp }}/typos"
34+
RELEASE_ASSET_URL="$(
35+
gh api /repos/crate-ci/typos/releases/latest \
36+
--jq '."assets"[] | select(."name" | test("^typos-.+-x86_64-unknown-linux-musl\\.tar\\.gz$")) | ."browser_download_url"'
37+
)"
38+
wget --secure-protocol=TLSv1_3 --max-redirect=1 --retry-on-host-error --retry-connrefused --tries=3 \
39+
--quiet --output-document=- "${RELEASE_ASSET_URL}" \
40+
| tar -xz -C "${{ runner.temp }}/typos" ./typos
41+
"${{ runner.temp }}/typos/typos" --version
42+
43+
echo -n $NEW_FILES | xargs "${{ runner.temp }}/typos/typos" --format json >> ${{ runner.temp }}/new_typos.jsonl || true
44+
git checkout FETCH_HEAD -- $OLD_FILES
45+
if [ -z "$OLD_FILES" ]; then
46+
touch "${{ runner.temp }}/old_typos.jsonl" # No old files, so no old typos.
47+
else
48+
echo -n $OLD_FILES | xargs "${{ runner.temp }}/typos/typos" --format json >> ${{ runner.temp }}/old_typos.jsonl || true
49+
fi
50+
51+
52+
python -c '
53+
import sys, json
54+
old = set()
55+
with open(sys.argv[1]) as old_file:
56+
for line in old_file:
57+
j = json.loads(line)
58+
if j["type"] == "typo":
59+
old.add(j["typo"])
60+
clean = True
61+
with open(sys.argv[2]) as new_file:
62+
for line in new_file:
63+
new = json.loads(line)
64+
if new["type"] == "typo" and new["typo"] not in old:
65+
if len(new["typo"]) > 6: # Short typos might be false positives. Long are probably real.
66+
clean = False
67+
print("::warning file={},line={},col={}::perhaps \"{}\" should be \"{}\".".format(
68+
new["path"], new["line_num"], new["byte_offset"],
69+
new["typo"], " or ".join(new["corrections"])))
70+
sys.exit(1 if not clean else 0)' "${{ runner.temp }}/old_typos.jsonl" "${{ runner.temp }}/new_typos.jsonl"

.github/workflows/cffconvert.yml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: cffconvert
2+
3+
on:
4+
push:
5+
branches:
6+
- 'master'
7+
- 'release-*'
8+
paths:
9+
- CITATION.cff
10+
pull_request:
11+
branches:
12+
- 'master'
13+
- 'release-*'
14+
paths:
15+
- CITATION.cff
16+
17+
permissions:
18+
contents: read
19+
20+
jobs:
21+
validate:
22+
name: "validate"
23+
runs-on: ubuntu-latest
24+
steps:
25+
- name: Check out a copy of the repository
26+
uses: actions/checkout@v4
27+
with:
28+
persist-credentials: false
29+
30+
- name: Check whether the citation metadata from CITATION.cff is valid
31+
uses: citation-file-format/cffconvert-github-action@2.0.0
32+
with:
33+
args: "--validate"

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@
3939
# Buildkite: Ignore the entire .buildkite directory
4040
/.buildkite
4141

42+
# Builtkite: json test data
43+
/test/results.json
44+
4245
# Buildkite: Ignore the unencrypted repo_key
4346
repo_key
4447

.mailmap

+16-3
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,9 @@ Daniel Karrasch <Daniel.Karrasch@gmx.de> <daniel.karrasch@posteo.de>
284284
Roger Luo <rogerluo.rl18@gmail.com> <rogerluo.rl18@gmail.com>
285285
Roger Luo <rogerluo.rl18@gmail.com> <hiroger@qq.com>
286286

287-
Frames Catherine White <me@oxinabox.net> <oxinabox@ucc.asn.au>
288-
Frames Catherine White <me@oxinabox.net> <lyndon.white@invenialabs.co.uk>
289-
Frames Catherine White <me@oxinabox.net> <lyndon.white@research.uwa.edu.au>
287+
Frames White <me@oxinabox.net> <oxinabox@ucc.asn.au>
288+
Frames White <me@oxinabox.net> <lyndon.white@invenialabs.co.uk>
289+
Frames White <me@oxinabox.net> <lyndon.white@research.uwa.edu.au>
290290

291291
Claire Foster <aka.c42f@gmail.com> <chris42f@gmail.com>
292292

@@ -295,3 +295,16 @@ Jishnu Bhattacharya <jishnub.github@gmail.com> <jishnub@users.noreply.github.com
295295

296296
Shuhei Kadowaki <aviatesk@gmail.com> <aviatesk@gmail.com>
297297
Shuhei Kadowaki <aviatesk@gmail.com> <40514306+aviatesk@users.noreply.github.com>
298+
299+
inky <git@wo-class.cn>
300+
inky <git@wo-class.cn> <inkydragon@users.noreply.github.com>
301+
302+
Lilith Orion Hafner <lilithhafner@gmail.com> <Lilith.Hafner@gmail.com>
303+
Lilith Orion Hafner <lilithhafner@gmail.com> <60898866+LilithHafner@users.noreply.github.com>
304+
305+
Timothy <git@tecosaur.net>
306+
307+
Bhuminjay Soni <soni5happy@gmail.com>
308+
Bhuminjay Soni <soni5happy@gmail.com> <76656712+11happy@users.noreply.github.com>
309+
310+
Florian Atteneder <florian.atteneder@gmail.com>

CITATION.cff

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Official format description at https://citation-file-format.github.io
12
cff-version: 1.2.0
23
message: "Cite this paper whenever you use Julia"
34
authors:

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ To run doctests you need to run `make -C doc doctest=true` from the root directo
164164

165165
#### News-worthy changes
166166

167-
For new functionality and other substantial changes, add a brief summary to `NEWS.md`. The news item should cross reference the pull request (PR) parenthetically, in the form `([#pr])`. To add the PR reference number, first create the PR, then push an additional commit updating `NEWS.md` with the PR reference number. We periodically run `./julia doc/NEWS-update.jl` from the julia directory to update the cross-reference links, but this should not be done in a typical PR in order to avoid conflicting commits.
167+
For new functionality and other substantial changes, add a brief summary to `NEWS.md`. The news item should cross reference the pull request (PR) parenthetically, in the form `([#pr])`. To add the PR reference number, first create the PR, then push an additional commit updating `NEWS.md` with the PR reference number. We periodically run `./julia doc/NEWS-update.jl` from the julia directory to update the cross-reference links, but this should not be done in a typical PR in order to avoid conflicting commits.
168168

169169
#### Annotations for new features, deprecations and behavior changes
170170

@@ -347,7 +347,7 @@ please remove the `backport-X.Y` tag from the originating pull request for the c
347347
### Git Recommendations For Pull Requests
348348

349349
- Avoid working from the `master` branch of your fork, creating a new branch will make it easier if Julia's `master` changes and you need to update your pull request.
350-
- Try to [squash](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html) together small commits that make repeated changes to the same section of code so your pull request is easier to review. A reasonable number of separate well-factored commits is fine, especially for larger changes.
350+
- Try to [squash](https://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html) together small commits that make repeated changes to the same section of code so your pull request is easier to review. A reasonable number of separate well-factored commits is fine, especially for larger changes.
351351
- If any conflicts arise due to changes in Julia's `master`, prefer updating your pull request branch with `git rebase` versus `git merge` or `git pull`, since the latter will introduce merge commits that clutter the git history with noise that makes your changes more difficult to review.
352352
- Descriptive commit messages are good.
353353
- Using `git add -p` or `git add -i` can be useful to avoid accidentally committing unrelated changes.

0 commit comments

Comments
 (0)