Skip to content

Commit 5560681

Browse files
RobPasMueRobPasMue
authored
Merge branch 'main' into docs/code-style-linting-format-to-spanish
2 parents 69bb70e + 246bee0 commit 5560681

Some content is hidden

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

47 files changed

+2053
-1001
lines changed

‎.all-contributorsrc

+54-6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"imageSize": 100,
66
"commit": false,
77
"commitConvention": "angular",
8+
"contributorsSortAlphabetically": true,
89
"contributors": [
910
{
1011
"login": "eriknw",
@@ -96,7 +97,8 @@
9697
"profile": "https://jon-e.net",
9798
"contributions": [
9899
"code",
99-
"design"
100+
"design",
101+
"ideas"
100102
]
101103
},
102104
{
@@ -501,7 +503,8 @@
501503
"profile": "https://github.com/miguelalizo",
502504
"contributions": [
503505
"code",
504-
"review"
506+
"review",
507+
"doc"
505508
]
506509
},
507510
{
@@ -621,7 +624,8 @@
621624
"contributions": [
622625
"review",
623626
"code",
624-
"translation"
627+
"translation",
628+
"doc"
625629
]
626630
},
627631
{
@@ -688,7 +692,9 @@
688692
"profile": "http://robpasmue.github.io",
689693
"contributions": [
690694
"code",
691-
"review"
695+
"review",
696+
"translation",
697+
"ideas"
692698
]
693699
},
694700
{
@@ -728,7 +734,8 @@
728734
"profile": "https://www.linkedin.com/in/ncclementi/",
729735
"contributions": [
730736
"code",
731-
"review"
737+
"review",
738+
"translation"
732739
]
733740
},
734741
{
@@ -748,7 +755,8 @@
748755
"profile": "https://github.com/Revathyvenugopal162",
749756
"contributions": [
750757
"code",
751-
"review"
758+
"review",
759+
"doc"
752760
]
753761
},
754762
{
@@ -758,8 +766,48 @@
758766
"profile": "https://github.com/tkoyama010",
759767
"contributions": [
760768
"code",
769+
"review",
770+
"doc",
771+
"translation",
772+
"ideas"
773+
]
774+
},
775+
{
776+
"login": "willingc",
777+
"name": "Carol Willing",
778+
"avatar_url": "https://avatars.githubusercontent.com/u/2680980?v=4",
779+
"profile": "https://hachyderm.io/web/@willingc",
780+
"contributions": [
761781
"review"
762782
]
783+
},
784+
{
785+
"login": "kozo2",
786+
"name": "Kozo Nishida",
787+
"avatar_url": "https://avatars.githubusercontent.com/u/12192?v=4",
788+
"profile": "https://github.com/kozo2",
789+
"contributions": [
790+
"review",
791+
"translation"
792+
]
793+
},
794+
{
795+
"login": "melissawm",
796+
"name": "Melissa Weber Mendonça",
797+
"avatar_url": "https://avatars.githubusercontent.com/u/3949932?v=4",
798+
"profile": "http://melissawm.github.io",
799+
"contributions": [
800+
"question"
801+
]
802+
},
803+
{
804+
"login": "OriolAbril",
805+
"name": "Oriol Abril-Pla",
806+
"avatar_url": "https://avatars.githubusercontent.com/u/23738400?v=4",
807+
"profile": "http://oriolabrilpla.cat",
808+
"contributions": [
809+
"question"
810+
]
763811
}
764812
],
765813
"contributorsPerLine": 7,

‎.github/dependabot.yml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "pip"
4+
directory: "/"
5+
insecure-external-code-execution: allow
6+
schedule:
7+
interval: "daily"
8+
open-pull-requests-limit: 100
9+
labels:
10+
- "maintenance"
11+
- "dependencies"
12+
groups:
13+
pip:
14+
patterns:
15+
- "*"
16+
commit-message:
17+
prefix: "chore"
18+
- package-ecosystem: "github-actions"
19+
directory: "/"
20+
schedule:
21+
interval: "daily"
22+
open-pull-requests-limit: 100
23+
labels:
24+
- "maintenance"
25+
- "dependencies"
26+
groups:
27+
actions:
28+
patterns:
29+
- "*"
30+
commit-message:
31+
prefix: "chore"

‎.github/workflows/build-book.yml

+46-46
Original file line numberDiff line numberDiff line change
@@ -15,57 +15,57 @@ jobs:
1515
build-test-book:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v4
1919

20-
- name: Setup Python
21-
uses: actions/setup-python@v5
22-
with:
23-
python-version: '3.9'
20+
- name: Setup Python
21+
uses: actions/setup-python@v5
22+
with:
23+
python-version: "3.9"
2424

25-
- name: Upgrade pip
26-
run: |
27-
# install pip=>20.1 to use "pip cache dir"
28-
python3 -m pip install --upgrade pip
29-
- name: Get pip cache dir
30-
id: pip-cache
31-
run: echo "::set-output name=dir::$(pip cache dir)"
25+
- name: Upgrade pip
26+
run: |
27+
# install pip=>20.1 to use "pip cache dir"
28+
python3 -m pip install --upgrade pip
29+
- name: Get pip cache dir
30+
id: pip-cache
31+
run: echo "::set-output name=dir::$(pip cache dir)"
3232

33-
- name: Cache dependencies
34-
uses: actions/cache@v4
35-
with:
36-
path: ${{ steps.pip-cache.outputs.dir }}
37-
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
38-
restore-keys: |
39-
${{ runner.os }}-pip-
33+
- name: Cache dependencies
34+
uses: actions/cache@v4
35+
with:
36+
path: ${{ steps.pip-cache.outputs.dir }}
37+
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
38+
restore-keys: |
39+
${{ runner.os }}-pip-
4040
41-
- name: Install dependencies
42-
run: python3 -m pip install nox
41+
- name: Install dependencies
42+
run: python3 -m pip install nox
4343

44-
- name: Build book
45-
run: nox -s docs-test
44+
- name: Build book
45+
run: nox -s docs-test
4646

47-
# Save html as artifact
48-
- name: Save book html as artifact for viewing
49-
uses: actions/upload-artifact@v4
50-
with:
51-
name: book-html
52-
path: |
53-
_build/html/
47+
# Save html as artifact
48+
- name: Save book html as artifact for viewing
49+
uses: actions/upload-artifact@v4
50+
with:
51+
name: book-html
52+
path: |
53+
_build/html/
5454
55-
# Push the book's HTML to github-pages
56-
- name: Push to GitHub Pages
57-
# Only push if on main branch
58-
if: github.ref == 'refs/heads/main'
59-
uses: peaceiris/actions-gh-pages@v3.8.0
60-
with:
61-
github_token: ${{ secrets.GITHUB_TOKEN }}
62-
publish_dir: ./_build/html
55+
# Push the book's HTML to github-pages
56+
- name: Push to GitHub Pages
57+
# Only push if on main branch
58+
if: github.ref == 'refs/heads/main'
59+
uses: peaceiris/actions-gh-pages@v4.0.0
60+
with:
61+
github_token: ${{ secrets.GITHUB_TOKEN }}
62+
publish_dir: ./_build/html
6363

64-
# Test for bad links and ensure alt tags for usability
65-
- name: Check HTML using htmlproofer
66-
uses: chabad360/htmlproofer@master
67-
with:
68-
directory: '_build/html'
69-
arguments: |
70-
--ignore-files "/.+\/_static\/.+/,/genindex.html/"
71-
--ignore-status-codes "404, 403, 429, 503"
64+
# Test for bad links and ensure alt tags for usability
65+
- name: Check HTML using htmlproofer
66+
uses: chabad360/htmlproofer@master
67+
with:
68+
directory: "_build/html"
69+
arguments: |
70+
--ignore-files "/.+\/_static\/.+/,/genindex.html/"
71+
--ignore-status-codes "404, 403, 429, 503"

‎.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- name: Add issue to project
1313
id: add-to-project
14-
uses: actions/[email protected].1
14+
uses: actions/[email protected].2
1515
with:
1616
project-url: https://github.com/orgs/pyOpenSci/projects/3
1717
# This is a organization level token so it can be used across all repos in our org

‎.pre-commit-config.yaml

+21-16
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# - Register git hooks: pre-commit install --install-hooks
1313

1414
repos:
15-
1615
# Misc commit checks
1716
- repo: https://github.com/pre-commit/pre-commit-hooks
1817
rev: v4.6.0
@@ -28,23 +27,29 @@ repos:
2827
- repo: https://github.com/codespell-project/codespell
2928
rev: v2.3.0
3029
hooks:
31-
- id: codespell
32-
additional_dependencies:
33-
- tomli
34-
exclude: >
35-
(?x)^(
36-
(.*vale-styles.*)|(.*\.po)
37-
)$
30+
- id: codespell
31+
additional_dependencies:
32+
- tomli
33+
exclude: >
34+
(?x)^(
35+
(.*vale-styles.*)|(.*\.po)
36+
)$
3837
3938
- repo: https://github.com/errata-ai/vale
40-
rev: v3.7.0
39+
rev: v3.7.1
40+
hooks:
41+
- id: vale
42+
43+
- repo: https://github.com/rbubley/mirrors-prettier
44+
rev: v3.3.3
4145
hooks:
42-
- id: vale
46+
- id: prettier
47+
types_or: [yaml, html, css, scss, javascript, json, toml]
4348

4449
ci:
45-
autofix_prs: false
46-
#skip: [flake8, end-of-file-fixer]
47-
autofix_commit_msg: |
48-
'[pre-commit.ci 🤖] Apply code format tools to PR'
49-
# Update hook versions every month (so we don't get hit with weekly update pr's)
50-
autoupdate_schedule: monthly
50+
autofix_prs: false
51+
#skip: [flake8, end-of-file-fixer]
52+
autofix_commit_msg: |
53+
'[pre-commit.ci 🤖] Apply code format tools to PR'
54+
# Update hook versions every month (so we don't get hit with weekly update pr's)
55+
autoupdate_schedule: monthly

0 commit comments

Comments
 (0)