Skip to content

Commit 6c868a6

Browse files
authored
Merge pull request #1839 from AllenInstitute/feature/1839-release-notes
2 parents 06e1672 + 157628f commit 6c868a6

16 files changed

+528
-19
lines changed

.gitattributes

+11-10
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,17 @@ LICENSE whitespace=cr-at-eol
2525
*.tex eol=lf
2626
*.awk eol=lf
2727

28-
.git* export-ignore
29-
*.sh export-ignore
30-
tools export-ignore
31-
Packages/*/tools -export-ignore
32-
Packages/tests export-ignore
33-
.mailmap export-ignore
34-
CODEOWNERS export-ignore
35-
ctags.cnf export-ignore
36-
.editorconfig export-ignore
37-
Packages/Artwork export-ignore
28+
.git* export-ignore
29+
.pre-commit-config.yaml export-ignore
30+
*.sh export-ignore
31+
tools export-ignore
32+
Packages/*/tools -export-ignore
33+
Packages/tests export-ignore
34+
.mailmap export-ignore
35+
CODEOWNERS export-ignore
36+
ctags.cnf export-ignore
37+
.editorconfig export-ignore
38+
Packages/Artwork export-ignore
3839

3940
*.dot !diff
4041

.github/workflows/build-pr.yml

+1
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ jobs:
115115
uses: actions/checkout@v3
116116
with:
117117
submodules: recursive
118+
fetch-depth: 0 # load all commits
118119
- name: Initial repo config
119120
run: tools/initial-repo-config.sh
120121
- name: Build documentation

.pre-commit-config.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ repos:
2525
- id: check-symlinks
2626
- id: check-yaml
2727
- id: destroyed-symlinks
28+
- id: end-of-file-fixer
2829
- id: mixed-line-ending
2930
- id: trailing-whitespace
3031
- repo: https://github.com/sirosen/texthooks

Packages/Settings_template/2_DataBrowser.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -350,4 +350,4 @@
350350
}
351351
},
352352
"Target Window Type": "DataBrowser"
353-
}
353+
}

Packages/doc/0001-WIP-fast-sphinx-rst-update-cycle.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From d8bae7390a0dd02af065fb3a9c4be43be05af063 Mon Sep 17 00:00:00 2001
1+
From 442b099da06bd393b5ae53211ae2c8026dcef869 Mon Sep 17 00:00:00 2001
22
From: Thomas Braun <thomas.braun@byte-physics.de>
33
Date: Wed, 29 Mar 2023 18:18:04 +0200
44
Subject: [PATCH 1/1] WIP: fast sphinx compilation without breathe
@@ -9,7 +9,7 @@ Subject: [PATCH 1/1] WIP: fast sphinx compilation without breathe
99
2 files changed, 3 insertions(+), 30 deletions(-)
1010

1111
diff --git a/Packages/doc/conf.py b/Packages/doc/conf.py
12-
index ad61b69d9..13385ff36 100644
12+
index ad61b69d90..13385ff369 100644
1313
--- a/Packages/doc/conf.py
1414
+++ b/Packages/doc/conf.py
1515
@@ -16,11 +16,11 @@ def get_version():
@@ -36,10 +36,10 @@ index ad61b69d9..13385ff36 100644
3636
cpp_id_attributes = [ 'threadsafe' ]
3737

3838
diff --git a/tools/build-documentation.sh b/tools/build-documentation.sh
39-
index 1ef95581d..f0ffe5619 100755
39+
index 1375d65a07..f709100c55 100755
4040
--- a/tools/build-documentation.sh
4141
+++ b/tools/build-documentation.sh
42-
@@ -101,33 +101,6 @@ trap "rm -rf ${top_level}/Packages/doc/IPNWB" EXIT
42+
@@ -91,33 +91,6 @@ trap "rm -rf ${top_level}/Packages/doc/IPNWB" EXIT
4343
# workaround https://github.com/sphinx-contrib/images/pull/31
4444
mkdir _video_thumbnail
4545

@@ -51,7 +51,7 @@ index 1ef95581d..f0ffe5619 100755
5151
-else
5252
- echo "Errors building the documentation" 1>&2
5353
- echo "breathe-apidoc could not be found" 1>&2
54-
- Failed
54+
- exit 1
5555
-fi
5656
-
5757
-# Add labels to each group and each file
@@ -74,5 +74,5 @@ index 1ef95581d..f0ffe5619 100755
7474
grep "IgorPro[0-9]Nightly" $top_level/Packages/MIES_Include.ipf \
7575
| sed -e "s/^\/\/ //" \
7676
--
77-
2.40.0.windows.1
77+
2.42.0.rc0.windows.1
7878

Packages/doc/SweepFormula.rst

+4
Original file line numberDiff line numberDiff line change
@@ -776,6 +776,7 @@ data
776776
777777
method
778778
the method can be either
779+
779780
* `0` for "full"
780781
* `1` for "instantaneous"
781782
* `2` for apcount
@@ -788,11 +789,13 @@ level
788789
789790
resultType
790791
the result type defines what result(s) the apfrequency operation returns if the method `3` (instantaneous pair) is set.
792+
791793
* `time` returns time intervals
792794
* `freq` returns frequencies.
793795
794796
normalize
795797
sets the way the results get normalized
798+
796799
* `nonorm`: no normalzation is applied (default)
797800
* `normoversweepsmin`: normalizes over all sweeps based on the minimum result value in all sweeps based on the current method
798801
* `normoversweepsmax`: normalizes over all sweeps based on the maximum result value in all sweeps based on he current method
@@ -803,6 +806,7 @@ normalize
803806
804807
xAxisType
805808
if the method `3` (instantaneous pair) is set then xAxisType defines the x-axis of the data display.
809+
806810
* `time`: the x-axis shows the occurence in time of the first peak of the pair(s), default
807811
* `count`: the x-axis counts the pair(s)
808812

0 commit comments

Comments
 (0)