Skip to content

Commit 4d5b888

Browse files
committed
Merge branch 'develop' into assert/is-almost-equal
2 parents f1fd9f3 + 3192ef5 commit 4d5b888

File tree

210 files changed

+10722
-306
lines changed

Some content is hidden

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

210 files changed

+10722
-306
lines changed

.github/workflows/scripts/lint_package_json_files

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,30 @@ root=$(git rev-parse --show-toplevel)
3232
# Define the path to a utility for linting package.json files:
3333
lint_package_json="${root}/lib/node_modules/@stdlib/_tools/lint/pkg-json/bin/cli"
3434

35+
# Define the path to the package name validation tool:
36+
validate_package_names="${root}/lib/node_modules/@stdlib/_tools/lint/pkg-json-names/bin/cli"
37+
3538
# Define paths to utilities for updating package.json metadata fields:
3639
update_package_json_directories="${root}/lib/node_modules/@stdlib/_tools/package-json/scripts/update_directories"
3740
update_package_json_gypfile="${root}/lib/node_modules/@stdlib/_tools/package-json/scripts/update_gypfile"
3841

3942
# Files to process:
4043
files_to_process="$*"
4144

45+
# Initialize needs_changes flag:
46+
needs_changes=0
47+
4248
# Lint package.json files:
4349
files=$(echo "${files_to_process}" | tr ' ' '\n' | grep 'package\.json$' | grep -v 'datapackage\.json$' | tr '\n' ' ' | sed 's/ $//')
4450
if [ -n "${files}" ]; then
4551
echo "Linting package.json files..."
4652
printf '%s' "${files}" | "${lint_package_json}" --split=" "
53+
54+
echo "Validating package names..."
55+
if ! printf '%s' "${files}" | "${validate_package_names}" --split=" "; then
56+
echo "ERROR: Package name validation failed"
57+
needs_changes=1
58+
fi
4759
else
4860
echo "No package.json files to lint."
4961
fi
@@ -55,8 +67,6 @@ dirs=$(echo "${files_to_process}" | tr ' ' '\n' | \
5567
sort -u)
5668

5769
echo "Checking package.json files in directories: ${dirs}"
58-
59-
needs_changes=0
6070
for dir in ${dirs}; do
6171
echo "Checking package.json in ${dir}..."
6272
package_json="${dir}/package.json"

.github/workflows/windows_test_npm_install.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ jobs:
155155
# Install MSYS2:
156156
- name: 'Install MSYS2'
157157
# Pin action to full length commit SHA
158-
uses: msys2/setup-msys2@61f9e5e925871ba6c9e3e8da24ede83ea27fa91f # v2.27.0
158+
uses: msys2/setup-msys2@40677d36a502eb2cf0fb808cc9dec31bf6152638 # v2.28.0
159159
with:
160160
# Set the MSYS system:
161161
msystem: MINGW64
@@ -245,7 +245,7 @@ jobs:
245245
# Install Windows build tools for compiling Node.js native add-ons.
246246
- name: 'Install Windows build tools'
247247
# Pin action to full length commit SHA
248-
uses: crazy-max/ghaction-chocolatey@6828f16489ec8d2968b55066766cb41f0d278f2a # v3.3.0
248+
uses: crazy-max/ghaction-chocolatey@2526f467ccbd337d307fe179959cabbeca0bc8c0 # v3.4.0
249249
with:
250250
args: install -y visualstudio2019buildtools visualstudio2019-workload-vctools
251251
timeout-minutes: 10

CONTRIBUTORS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@ Aman Bhansali <[email protected]>
2323
AmanBhadkariya <[email protected]>
2424
Amisha Chhajed <[email protected]>
2525
Amit Jimiwal <[email protected]>
26+
Anmol Sah <[email protected]>
2627
Annamalai Prabu <[email protected]>
2728
Anshu Kumar <[email protected]>
2829
Anshu Kumar <[email protected]>
2930
Anudeep Sanapala <[email protected]>
3031
Arihant Pal <[email protected]>
3132
Aryan Bhirud <[email protected]>
3233
Athan Reines <[email protected]>
34+
Atharva Patil <[email protected]>
3335
3436
Bhavishy Agrawal <[email protected]>
3537
Brendan Graetz <[email protected]>
@@ -62,6 +64,7 @@ GURU PRASAD SHARMA <[email protected]>
6264
6365
Gautam Kaushik <[email protected]>
6466
Gautam sharma <[email protected]>
67+
6568
Girish Garg <[email protected]>
6669
Golden Kumar <[email protected]>
6770
Gunj Joshi <[email protected]>

lib/node_modules/@stdlib/_tools/eslint/rules/require-order/test/test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ tape( 'main export is an object', function test( t ) {
4040
t.end();
4141
});
4242

43-
tape( 'the function positively validates code where all `require()` calls are sorted in a a specified order', function test( t ) {
43+
tape( 'the function positively validates code where all `require()` calls are sorted in a specified order', function test( t ) {
4444
var tester = new RuleTester();
4545

4646
try {

lib/node_modules/@stdlib/_tools/lint/namespace-aliases/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,14 @@ function onLint( error, errors ) {
152152
### Usage
153153

154154
```text
155-
Usage: stdlib-lint-namespace-aliases [options] [<dir>]
155+
Usage: lint-namespace-aliases [options] [<dir>]
156156
157157
Options:
158158
159-
-h, --help Print this message.
160-
-V, --version Print the package version.
161-
--pattern pattern Pattern to match files for linting.
162-
--ignore pattern Exclusion glob pattern.
159+
-h, --help Print this message.
160+
-V, --version Print the package version.
161+
--pattern pattern Pattern to match files for linting.
162+
--ignore pattern Exclusion glob pattern.
163163
```
164164

165165
</section>
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

2-
Usage: stdlib-lint-namespace-aliases [options] [<dir>]
2+
Usage: lint-namespace-aliases [options] [<dir>]
33

44
Options:
55

6-
-h, --help Print this message.
7-
-V, --version Print the package version.
8-
--pattern pattern Pattern to match files for linting.
9-
--ignore pattern Exclusion glob pattern.
6+
-h, --help Print this message.
7+
-V, --version Print the package version.
8+
--pattern pattern Pattern to match files for linting.
9+
--ignore pattern Exclusion glob pattern.

lib/node_modules/@stdlib/_tools/lint/namespace-aliases/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
],
1616
"bin": {
17-
"stdlib-lint-namespace-aliases": "./bin/cli"
17+
"lint-namespace-aliases": "./bin/cli"
1818
},
1919
"main": "./lib",
2020
"directories": {

0 commit comments

Comments
 (0)