From a3baa8afc0e967080705e434edfdadcf052bf1a0 Mon Sep 17 00:00:00 2001 From: Brendt Wohlberg Date: Tue, 14 Mar 2023 17:53:23 -0600 Subject: [PATCH 1/3] Improved favicon --- docs/source/_static/scico.ico | Bin 683 -> 1529 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/source/_static/scico.ico b/docs/source/_static/scico.ico index 47ecaf10f5fa8cac49e40a04c39754f7ad493647..1bc61e6b1d659e49ef7739b0f7e332b6e3adeefb 100644 GIT binary patch delta 1510 zcmVHOOTkYFbrFSP1S4y>@?&zfzZN1)It#|rLh6AA( z+oO}ScxL7#ik)_BX@E^%2@jM_dR{gAnTf3P9dn-&)jq$6b;z2!d(O z%)|hhOTds5=c5m#xi@tAG12?=WZ5$m+&VlG7&EA2i+|LZxjODe6fJK^l( zwncNPei$CyEcXm5OZCdGrM=eCmlyybV-eWO^)rpTr-2M~FPD1)+TF<^a$f-Rl=w^&ZAZ{6%c+DB0)ZeTR6hCP_v8&J8NsSi=L z6gkgs>6nOcc#9PO2z5XHmK-3h5G*q^qS~z>8h_8|=#UGu(oYElBGF#y^v0Q%+nl@7 zksQM0Ox=v8yyLRLVyd;647x&zdIJPI4>vLT|B+yXhLS%4k{PUykL4{Z%kIvdo_{mu zH9Uc8bh!t)aO++IbpguF_>xDS4gncu*CgkLZW*A|<#@|zh&D~S#fZz1jw?5Vf-LKp zaDNyq`acm2hV=FQw;|B4>49+-kj!8&e;vlYh-#|KPA@EV{SnS^?b9< ztDn%VhRtkb&clWJ00RxtjP>4vSqmGb!k3yO007e`6)bl-GJFWZG-q}+nUP@pHVDDG zWphclq{WM?3b=nx+<0j&1%snHygUL>Q-3}C-#OFspUtwSsd@J32l1j=Q+ckU1X&u* zCexb6o6lG9T2+~T_ILL}pijT?40e_5c~w&Jrh)MCxO2gdBj;CDl(@cFJZoyqXV7pU z$dErkZf4w3Av)YYLHkbP8cqO4yNYAU8tI|U2emG`2NRD+6l7#@2zWBFnr4U~+<*TT z?(HMmtQr7wkwVtvOQmVsn#Q{(Jemn1%)ooVJ3zYrq7V$8hkM_E@^@^;2#_q0UD=2s zzgk=N2?0bj6t|0^U-#m>x(qd79HWEa15j>2$Qz%rY=O*qSFu;D4|jW_krE&R((`#C ze*YFmda4NaOeN57Bj}Y8D#$h!Qzx#1sh}NG{z+_(TFJSgdm?fF1F{qX&2-3PdH?_b M07*qoM6N<$g52558UO$Q delta 657 zcmV;C0&e~J3#$b-iBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVE_OC32;bR za{vGVl>h(%l>rP*j);*qCw~GsNkl7=@qjj%C&aqEM^;h#(TA2(*=1 zNG2{Ev1rl4P%5aTNNC|EsSsKe&O$``U9}XfP*fsY2x(XtO+k`YE?jAl7^(BUr^PsT zW~2)r_b%S|oadZ-uVdX+-qu%&)C^Ps#W=l1jF|c1cLkrm(B5v@^M85ihnklD{DtUB z9O*m|;MAAIswO%b=GL2NswUs<8(0Pi(#!MF)j{AQ5FiZ{Y%DxA(a|ucnOLEwV_o_d z>(^A>0RUX2Q!|yDLV|_pO5CBNNPy%6cVndeSaQwq9?%2^Xi{HmAK~Nzjl5hTh1! Date: Tue, 14 Mar 2023 18:22:32 -0600 Subject: [PATCH 2/3] Make script compatible with MacOS bash --- .github/isbin.sh | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/isbin.sh b/.github/isbin.sh index fddf0514a..91d0e1a48 100755 --- a/.github/isbin.sh +++ b/.github/isbin.sh @@ -6,27 +6,32 @@ size_threshold=65536 SAVEIFS=$IFS IFS=$(echo -en "\n\b") +OS=$(uname -a | cut -d ' ' -f 1) for f in $@; do echo $f - size=$(stat --format %s $f) + case "$OS" in + Linux) size=$(stat --format "%s" $f);; + Darwin) size=$(stat -f "%z" $f);; + *) echo "Error: unsupported operating system $OS" >&2; exit 1;; + esac if [ $size -gt $size_threshold ]; then - echo "file exceeds maximum allowable size" - echo "raw data and ipynb files should go in scico-data" - exit 1 + echo "file exceeds maximum allowable size" + echo "raw data and ipynb files should go in scico-data" + exit 2 fi charset=$(file -b --mime $f | sed -e 's/.*charset=//') if [ ! -L "$f" ] && [ "$charset" = "binary" ]; then - echo "binary files cannot be commited to the repository" - echo "raw data and ipynb files should go in scico-data" - exit 2 + echo "binary files cannot be commited to the repository" + echo "raw data and ipynb files should go in scico-data" + exit 3 fi basename=$(basename -- "$f") ext="${basename##*.}" if [ "$ext" = "ipynb" ]; then - echo "ipynb files cannot be commited to the repository" - echo "raw data and ipynb files should go in scico-data" - exit 3 + echo "ipynb files cannot be commited to the repository" + echo "raw data and ipynb files should go in scico-data" + exit 4 fi done From 513c0dc4dc012c6dde6b42f91352b9d577c6ac4a Mon Sep 17 00:00:00 2001 From: Brendt Wohlberg Date: Tue, 14 Mar 2023 18:52:37 -0600 Subject: [PATCH 3/3] Improvement recommended during PR review --- .github/isbin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/isbin.sh b/.github/isbin.sh index 91d0e1a48..502137245 100755 --- a/.github/isbin.sh +++ b/.github/isbin.sh @@ -16,7 +16,7 @@ for f in $@; do *) echo "Error: unsupported operating system $OS" >&2; exit 1;; esac if [ $size -gt $size_threshold ]; then - echo "file exceeds maximum allowable size" + echo "file exceeds maximum allowable size of $size_threshold bytes" echo "raw data and ipynb files should go in scico-data" exit 2 fi