Skip to content

Commit b7def3d

Browse files
authored
Merge branch 'main' into main
2 parents a606808 + 94ee9e6 commit b7def3d

27 files changed

+89
-82
lines changed

.all-contributorsrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,8 @@
478478
"contributions": [
479479
"code",
480480
"review",
481-
"tutorial"
481+
"tutorial",
482+
"doc"
482483
]
483484
},
484485
{

CONTRIBUTING.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ To fork a repo,
4141

4242
1. Make sure you are logged into GitHub.
4343

44-
2. Go to the repo you would like to fork, in this case the [Python Packaging Guide](https://www.github.com/pyopensci/python-package-guide) repo.
44+
2. Go to the repo you would like to fork, in this case the [Python Packaging Guide](https://github.com/pyopensci/python-package-guide) repo.
4545

4646
3. In the top right-hand corner of the page there is a 'Fork' button. Click that button. You will be brought to a new page where you will 'Create a new fork'. Feel free to keep all the default inputs and click 'Create fork'. This will create a copy of the repo at `https://github.com/<username>/python-package-guide`, where `<username>` is your GitHub username.
4747

@@ -383,7 +383,6 @@ Classifiers are just a list of plain strings
383383
```toml
384384
classifiers = [
385385
"Programming Language :: Python :: 3",
386-
"License :: OSI Approved :: BSD License",
387386
"Operating System :: OS Independent",
388387
]
389388
```

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
198198
</tr>
199199
<tr>
200200
<td align="center" valign="top" width="14.28%"><a href="https://github.com/tkoyama010"><img src="https://avatars.githubusercontent.com/u/7513610?v=4?s=100" width="100px;" alt="Tetsuo Koyama"/><br /><sub><b>Tetsuo Koyama</b></sub></a><br /><a href="https://github.com/pyOpenSci/python-package-guide/commits?author=tkoyama010" title="Code">💻</a> <a href="https://github.com/pyOpenSci/python-package-guide/pulls?q=is%3Apr+reviewed-by%3Atkoyama010" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/pyOpenSci/python-package-guide/commits?author=tkoyama010" title="Documentation">📖</a> <a href="#translation-tkoyama010" title="Translation">🌍</a> <a href="#ideas-tkoyama010" title="Ideas, Planning, & Feedback">🤔</a> <a href="#a11y-tkoyama010" title="Accessibility">️️️️♿️</a> <a href="#infra-tkoyama010" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#blog-tkoyama010" title="Blogposts">📝</a></td>
201-
<td align="center" valign="top" width="14.28%"><a href="https://github.com/tomalrussell"><img src="https://avatars.githubusercontent.com/u/2762769?v=4?s=100" width="100px;" alt="Tom Russell"/><br /><sub><b>Tom Russell</b></sub></a><br /><a href="https://github.com/pyOpenSci/python-package-guide/commits?author=tomalrussell" title="Code">💻</a> <a href="https://github.com/pyOpenSci/python-package-guide/pulls?q=is%3Apr+reviewed-by%3Atomalrussell" title="Reviewed Pull Requests">👀</a> <a href="#tutorial-tomalrussell" title="Tutorials">✅</a></td>
201+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/tomalrussell"><img src="https://avatars.githubusercontent.com/u/2762769?v=4?s=100" width="100px;" alt="Tom Russell"/><br /><sub><b>Tom Russell</b></sub></a><br /><a href="https://github.com/pyOpenSci/python-package-guide/commits?author=tomalrussell" title="Code">💻</a> <a href="https://github.com/pyOpenSci/python-package-guide/pulls?q=is%3Apr+reviewed-by%3Atomalrussell" title="Reviewed Pull Requests">👀</a> <a href="#tutorial-tomalrussell" title="Tutorials">✅</a> <a href="https://github.com/pyOpenSci/python-package-guide/commits?author=tomalrussell" title="Documentation">📖</a></td>
202202
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Zeitsperre"><img src="https://avatars.githubusercontent.com/u/10819524?v=4?s=100" width="100px;" alt="Trevor James Smith"/><br /><sub><b>Trevor James Smith</b></sub></a><br /><a href="https://github.com/pyOpenSci/python-package-guide/commits?author=Zeitsperre" title="Code">💻</a> <a href="https://github.com/pyOpenSci/python-package-guide/pulls?q=is%3Apr+reviewed-by%3AZeitsperre" title="Reviewed Pull Requests">👀</a></td>
203203
<td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/tylerjbonnell/"><img src="https://avatars.githubusercontent.com/u/89505514?v=4?s=100" width="100px;" alt="Tyler Bonnell"/><br /><sub><b>Tyler Bonnell</b></sub></a><br /><a href="https://github.com/pyOpenSci/python-package-guide/commits?author=Tyler-Bonnell" title="Code">💻</a> <a href="https://github.com/pyOpenSci/python-package-guide/pulls?q=is%3Apr+reviewed-by%3ATyler-Bonnell" title="Reviewed Pull Requests">👀</a></td>
204204
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Vaunty"><img src="https://avatars.githubusercontent.com/u/68826427?v=4?s=100" width="100px;" alt="Vaunty"/><br /><sub><b>Vaunty</b></sub></a><br /><a href="https://github.com/pyOpenSci/python-package-guide/commits?author=Vaunty" title="Code">💻</a> <a href="https://github.com/pyOpenSci/python-package-guide/pulls?q=is%3Apr+reviewed-by%3AVaunty" title="Reviewed Pull Requests">👀</a></td>

conf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,8 @@
217217
linkcheck_ignore = [
218218
# gnu.org is so strictly rate-limited that retries to it really slow down link-checking... just assume they're fine
219219
r"https:\/\/.*gnu\.org.*",
220+
# this discord link is correct, but unauthenticated it redirects to a sign-up page
221+
r"https:\/\/discord\.gg/NQtTTqtv",
220222
]
221223

222224
def _post_build(app: "Sphinx", exception: Exception | None) -> None:

documentation/hosting-tools/publish-documentation-online.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ service. Some of its many features include:
2222

2323

2424
## What is GitHub Pages?
25-
[GitHub Pages](https://docs.github.com/en/pages/getting-started-with-github-pages/about-github-pages) is a free web
25+
[GitHub Pages](https://docs.github.com/en/pages/getting-started-with-github-pages/what-is-github-pages) is a free web
2626
hosting service offered by GitHub. Using GitHub pages, you can build your
2727
documentation locally or using a Continuous Integration setup, and then push
2828
to a branch in your GitHub repository that is setup to run the GitHub Pages

documentation/hosting-tools/website-hosting-optimizing-your-docs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ This extension is lightweight.
3737

3838
It [requires that you to add it to your Sphinx `conf.py` extension list and site your documentation base url](https://sphinx-sitemap.readthedocs.io/en/latest/getting-started.html).
3939

40-
### [sphinxext.opengraph](https://github.com/wpilibsuite/sphinxext-opengraph)
40+
### [sphinxext.opengraph](https://github.com/sphinx-doc/sphinxext-opengraph)
4141

4242
OpenGraph is an extension that allows you to add metadata to your documentation
4343
content pages. [The OpenGraph protocol allows other websites to provide a

documentation/repository-files/license-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Licenses are legally binding, as such you should avoid trying to create your own
4343

4444
### Use open permissive licenses when possible
4545

46-
We generally suggest that you use a permissive, license that is [Open Software Initiative (OSI) approved](https://opensource.org/licenses/). If you are
46+
We generally suggest that you use a permissive, license that is [Open Software Initiative (OSI) approved](https://opensource.org/license). If you are
4747
[submitting your package to pyOpenSci for peer review](https://www.pyopensci.org/about-peer-review/index.html), then we require an OSI approved
4848
license.
4949

documentation/repository-files/readme-file-best-practices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Some badges that you might consider adding to your README file include:
7575

7676
Example: [![PyPI version shields.io](https://img.shields.io/pypi/v/pandera.svg)](https://pypi.org/project/pandera/)
7777

78-
* Status of tests (pass or fail) - Example: [![CI Build](https://github.com/pandera-dev/pandera/workflows/CI%20Tests/badge.svg?branch=main)](https://github.com/pandera-dev/pandera/actions?query=workflow%3A%22CI+Tests%22+branch%3Amain)
78+
* Status of tests (pass or fail) - Example: [![CI Build](https://github.com/unionai-oss/pandera/workflows/CI%20Tests/badge.svg?branch=main)](https://github.com/unionai-oss/pandera/actions?query=workflow%3A%22CI+Tests%22+branch%3Amain)
7979

8080
* Documentation build - Example: ![Docs Building](https://github.com/pyOpenSci/python-package-guide/actions/workflows/build-book.yml/badge.svg)
8181

@@ -84,7 +84,7 @@ Example: [![PyPI version shields.io](https://img.shields.io/pypi/v/pandera.svg)]
8484
```{tip}
8585
Once you package is accepted to pyOpenSci, we will provide you with
8686
a badge to add to your repository that shows that it has been reviewed.
87-
[![pyOpenSci](https://pyopensci.org/badges/peer-reviewed.svg)](https://github.com/pyOpenSci/software-submission/issues/12)
87+
[![pyOpenSci](https://www.pyopensci.org/badges/peer-reviewed.svg)](https://github.com/pyOpenSci/software-submission/issues/12)
8888
8989
```
9090

examples/extension-hatch/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ maintainers = [
1616
description = "An example Python package used to support Python packaging tutorials"
1717
keywords = ["pyOpenSci", "python packaging"]
1818
readme = "README"
19+
license = "BSD-3-Clause"
1920
classifiers = [
2021
"Programming Language :: Python :: 3",
21-
"License :: OSI Approved :: BSD License",
2222
"Operating System :: OS Independent",
2323
]

examples/pure-hatch/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ maintainers = [
1313
description = "An example Python package used to support Python packaging tutorials"
1414
keywords = ["pyOpenSci", "python packaging"]
1515
readme = "README.md"
16+
license = "BSD-3-Clause"
1617
classifiers = [
1718
"Programming Language :: Python :: 3",
18-
"License :: OSI Approved :: BSD License",
1919
"Operating System :: OS Independent",
2020
]
2121
dependencies = [

0 commit comments

Comments
 (0)