Skip to content

Commit 3f71198

Browse files
committed
Merge branch 'main' of github.com:conda-forge/conda-forge.github.io into Add-Code-of-Conduct
2 parents 7e7e85d + e8247b0 commit 3f71198

File tree

368 files changed

+7069
-106058
lines changed

Some content is hidden

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

368 files changed

+7069
-106058
lines changed

.ci_scripts/display_linkcheck.py

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
import argparse
2+
import json
3+
from collections import defaultdict
4+
from termcolor import colored
5+
6+
status_colors = dict(
7+
broken='red',
8+
redirected='yellow',
9+
working='green',
10+
ignored='white',
11+
unchecked='white',
12+
)
13+
14+
def create_parser():
15+
parser = argparse.ArgumentParser('display_linkcheck')
16+
parser.add_argument('linkcheck_json')
17+
return parser
18+
19+
20+
def main():
21+
parser = create_parser()
22+
args = parser.parse_args()
23+
buffer = defaultdict(list)
24+
with open(args.linkcheck_json) as fh:
25+
for line in fh:
26+
data = json.loads(line)
27+
buffer[data['status']].append(data)
28+
29+
for status, color in status_colors.items():
30+
if status not in buffer:
31+
continue
32+
for data in buffer[status]:
33+
34+
print_tokens = [
35+
colored(f'[{data["status"]}]', color),
36+
colored(data['uri'], 'magenta'),
37+
f'{data["filename"]}:{data["lineno"]}',
38+
]
39+
if data['info'] != '':
40+
print_tokens.append(f'({data["info"]})')
41+
42+
print(*print_tokens)
43+
44+
if __name__ == '__main__':
45+
main()

.ci_scripts/environment.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,4 @@ dependencies:
1616
- python-dateutil
1717
- pip
1818
- python-rapidjson
19-
# uncomment to restore search
20-
# - elm
21-
# - nodejs
22-
# - pip:
23-
# - sphinxcontrib-newsfeed # this helps when using vscode locally
19+
- termcolor

.ci_scripts/update_docs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,7 @@ popd
1414

1515
python .ci_scripts/generate_html.py
1616

17-
# rebuild elm
18-
# uncomment to restore search
19-
# npm install uglify-js --global
20-
# ./elm-compile.xsh
21-
22-
# build docs into docs/; preserve old README file
23-
mv docs/README docs-README
17+
# build docs into docs
2418
rm -rf docs/
2519

2620
python .ci_scripts/generate_cfep_index.py
@@ -30,9 +24,14 @@ pushd src
3024
# -W --keep-going: list all warnings but fail build in case there are any
3125
# -n: check validity of all links
3226
make html SPHINXOPTS="-W --keep-going -n"
33-
make linkcheck
27+
linkcheck_failed=0
28+
make linkcheck > /dev/null || linkcheck_failed=1
29+
python ../.ci_scripts/display_linkcheck.py _build/linkcheck/output.json
30+
31+
if [[ "${GHREF}" != "refs/heads/main" ]]; then
32+
test "$linkcheck_failed" -eq 0
33+
fi
34+
3435
mv _build/html ../docs
3536
rm -rf _build
3637
popd
37-
38-
mv docs-README docs/README

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
blank_issues_enabled: true
22
contact_links:
3-
- name: Conda-forge gitter chat
4-
url: https://gitter.im/conda-forge/conda-forge.github.io
3+
- name: Conda-forge Element chatroom
4+
url: https://app.element.io/#/room/#conda-forge:matrix.org
55
about: Chat to us about conda-forge and ask general questions.
66
- name: Conda-forge documentation
77
url: https://conda-forge.org/docs/

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
<!--
2-
Thank you for pull request!
3-
4-
Please note that the `docs` subdir is generated from the sphinx sources in `src`, changes
5-
to `.html` files will only be effective if applied to the respective `.rst`.
6-
-->
7-
81
PR Checklist:
92

10-
- [ ] make all edits to the docs in the `src` directory, not in `docs` or in the html files
113
- [ ] note any issues closed by this PR with [closing keywords](https://help.github.com/articles/closing-issues-using-keywords)
124
- [ ] put any other relevant information below

.github/workflows/deploy.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ jobs:
2929
shell: bash -l {0}
3030
run: |
3131
source ./.ci_scripts/update_docs
32+
env:
33+
GHREF: ${{ github.ref }}
3234

3335
- name: deploy
3436
if: github.ref == 'refs/heads/main' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')

.github/workflows/docs_linter.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/meeting-notes.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Create PR for meeting notes
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
date:
7+
description: |
8+
Date of the meeting notes. MUST be understood by `date --date`.
9+
Common examples are "now", "tomorrow", "next Wednesday", "2023-03-01"...
10+
See https://www.gnu.org/software/coreutils/manual/html_node/Date-input-formats.html for full details.
11+
required: false
12+
default: "now"
13+
type: string
14+
pull_request:
15+
types:
16+
- labeled
17+
18+
permissions:
19+
contents: write
20+
pull-requests: write
21+
# You need to enable 'Allow GitHub Actions to create and approve pull requests'
22+
# in your Actions Settings too
23+
24+
jobs:
25+
create:
26+
if: github.event_name != 'pull_request'
27+
uses: Quansight-Labs/hackmd-meeting-notes-action/.github/workflows/create-meeting-notes-pr.yml@main
28+
with:
29+
date: ${{ inputs.date || 'now' }}
30+
template_path: misc/DEV_MEETING_TEMPLATE.md
31+
output_path: src/orga/minutes/%Y-%m-%d.md
32+
hackmd_team: conda-forge
33+
force_push: true
34+
pr_body: |
35+
New meeting notes available at ${env.hackmd_doc_url}.
36+
37+
Once done with the meeting, sync the note back to the repository by adding the `sync-hackmd-notes` label.
38+
secrets:
39+
HACKMD_TOKEN: ${{ secrets.HACKMD_TOKEN }}
40+
sync:
41+
if: github.event.label.name == 'sync-hackmd-notes'
42+
uses: Quansight-Labs/hackmd-meeting-notes-action/.github/workflows/sync-meeting-notes-pr.yml@main
43+
with:
44+
pr_number: ${{ github.event.number }}
45+
secrets:
46+
HACKMD_TOKEN: ${{ secrets.HACKMD_TOKEN }}

404.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,11 @@
4949
</a>
5050
</div>
5151

52-
<div class="collapse navbar-collapse navbar-right navbar-main-collapse">
52+
<div class="collapse navbar-collapse navbar-main-collapse">
5353
<ul class="nav navbar-nav">
5454
<li>
5555
<a class="page-scroll" href="https://conda-forge.org/#about">About</a>
5656
</li>
57-
<!-- Uncomment to restore search
58-
<li>
59-
<a href="search.html">Search</a>
60-
</li>
61-
-->
6257
<li>
6358
<a href="https://conda-forge.org/docs">Docs</a>
6459
</li>
@@ -84,6 +79,13 @@
8479
<a href="https://numfocus.salsalabs.org/donate-to-conda-forge/index.html">Donate!</a>
8580
</li>
8681
</ul>
82+
<ul class="nav navbar-nav navbar-right">
83+
<li>
84+
<a href="https://github.com/conda-forge">
85+
<i class="fa fa-github"></i>
86+
</a>
87+
</li>
88+
</ul>
8789
</div>
8890
<!-- /.navbar-collapse -->
8991
</div>

README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,31 @@ If you have questions or need help, please check out our documentation for a [li
3030

3131
## Code of conduct
3232

33-
We at conda-forge adhere to the [NumFOCUS Code of Conduct](https://numfocus.org/code-of-conduct).
33+
We at conda-forge adhere to the [NumFOCUS Code of Conduct](https://numfocus.org/code-of-conduct):
3434

35-
Be kind to others. Do not insult or put down others. Behave professionally. Remember that harassment and sexist, racist, or exclusionary jokes are not appropriate for conda-forge.
36-
37-
All communication should be appropriate for a professional audience, including people of many different backgrounds. Sexual language and imagery is not appropriate.
38-
39-
conda-forge is dedicated to providing a harassment-free community for everyone, regardless of gender, sexual orientation, gender identity and expression, disability, physical appearance, body size, race, or religion. We do not tolerate harassment of community members in any form.
35+
> * Be kind to others. Do not insult or put down others. Behave professionally. Remember that harassment and sexist, racist, or exclusionary jokes are not appropriate for conda-forge.
36+
>
37+
> * All communication should be appropriate for a professional audience, including people of many different backgrounds. Sexual language and imagery is not appropriate.
38+
>
39+
> * conda-forge is dedicated to providing a harassment-free community for everyone, regardless of gender, sexual orientation, gender identity and expression, disability, physical appearance, body size, race, or religion. We do not tolerate harassment of community members in any form.
4040
4141
Thank you for helping make this a welcoming, friendly community for all.
4242

43-
## Reporting Guidelines
43+
### Reporting guidelines
4444

4545
If you believe someone is violating the code of conduct, please report this in a timely manner. Code of conduct violations reduce the value of the community for everyone. The team at conda-forge takes reports of misconduct very seriously and is committed to preserving and maintaining the welcoming nature of our community.
4646

47-
All reports will be kept confidential. Please have a look at the [Reporting Guidelines](https://numfocus.org/code-of-conduct#reporting-guidelines).
47+
All reports will be kept confidential. Please have a look at the [Reporting guidelines](https://numfocus.org/code-of-conduct#reporting-guidelines).
4848

49-
## Enforcement: What Happens After a Report is Filed?
49+
### Enforcement: What happens after a report is filed?
5050

51-
conda-forge's team and/or our event staff will try to ensure your safety and help with any immediate needs, particularly at an in-person event. Once we have received the report through the relevant authorities, conda-forge will make every effort to acknowledge the receipt and take action (and we’ll aim for much more quickly than that). Have a look at the process of [What Happens After a Report is Filed?](https://numfocus.org/code-of-conduct#enforcement).
51+
conda-forge's team and/or our event staff will try to ensure your safety and help with any immediate needs, particularly at an in-person event. Once we have received the report through the relevant authorities, conda-forge will make every effort to acknowledge the receipt and take action. Have a look at the process of [What Happens After a Report is Filed?](https://numfocus.org/code-of-conduct#enforcement).
5252

5353
## conda-forge dev meetings
5454

55-
Our documentation contains a section with [minutes from previous dev meetings](https://conda-forge.org/docs/orga/minutes/00_intro.html). These meetings occur every two weeks on Wednesday from 17:00-18:00 UTC.
56-
A link to the google calendar item can be found [here](https://calendar.google.com/event?action=TEMPLATE&tmeid=Z2lraDk2a205cGUxdDkxYmNybXQxMGIxMGtfMjAxOTA3MjRUMTcwMDAwWiBzY29wYXR6QG0&tmsrc=scopatz%40gmail.com&scp=ALL).
55+
Our documentation contains a section with [minutes from previous dev meetings]([https://conda-forge.org/docs/minutes/00_intro.html]). These meetings occur every two weeks on Wednesday from 17:00-18:00 UTC.
56+
A link to the google calendar item can be found [here](https://calendar.google.com/event?action=TEMPLATE&tmeid=bTk5ZzBoMDEzaW11cmZiNWJnNmNkbThocDRfMjAyMjA1MThUMTcwMDAwWiBlcmljQHZvbHRyb25kYXRhLmNvbQ&tmsrc=eric%40voltrondata.com&scp=ALL).
5757

58-
We use https://hackmd.io/ for taking meeting minutes and will upload the resultant markdown file after the meeting has concluded.
58+
We use https://hackmd.io/ for taking meeting minutes and will (eventually) upload the resultant markdown file after the meeting has concluded.
5959

6060
There is a template provided in [`misc/DEV_MEETING_TEMPLATE.md`](https://github.com/conda-forge/conda-forge.github.io/tree/main/misc/DEV_MEETING_TEMPLATE.md) that you should use to create a new hackmd document.

0 commit comments

Comments
 (0)