Skip to content

Commit b9c2fd3

Browse files
committed
and some more
1 parent c296f67 commit b9c2fd3

Some content is hidden

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

63 files changed

+67
-65
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
To edit the documentation pages displayed at
44
[conda-forge.org/docs/][conda-forge-docs], please edit the source
5-
[reStructuredText][] files in `src/`.
5+
[reStructuredText][] files in `sphinx/src/`.
66

77
[conda-forge-docs]: https://conda-forge.org/docs/
88
[reStructuredText]: http://docutils.sourceforge.net/rst.html

.github/workflows/meeting-notes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
date: ${{ inputs.date || 'now' }}
3030
template_path: misc/DEV_MEETING_TEMPLATE.md
31-
output_path: src/orga/minutes/%Y-%m-%d.md
31+
output_path: sphinx/src/orga/minutes/%Y-%m-%d.md
3232
hackmd_team: conda-forge
3333
force_push: true
3434
pr_body: |

sphinx/src/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ To build the docs locally, follow the steps mentioned below:
55
2. Go into the main folder and run the following commands.
66
3. ``conda env create -f ./.ci_scripts/environment.yml``
77
4. ``conda activate conda-forge-docs``
8-
5. ``cd newsfeed && pip install --no-deps .``
8+
5. ``cd sphinx/newsfeed && pip install --no-deps .``
99
6. ``cd ../src``
1010
7. ``make html``
1111

sphinx/src/maintainer/infrastructure.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Documentation
5252

5353
The documentation lives in `conda-forge/conda-forge.github.io <https://github.com/conda-forge/conda-forge.github.io/>`__, and is automatically deployed to our `online version <https://conda-forge.org/docs/>`__.
5454

55-
The documentation is built with ``Sphinx`` and the sources files are located in the `src <https://github.com/conda-forge/conda-forge.github.io/tree/main/src>`__ directory of the repository.
55+
The documentation is built with ``Sphinx`` and the sources files are located in the `src <https://github.com/conda-forge/conda-forge.github.io/tree/main/sphinx/src>`__ directory of the repository.
5656

5757
If you found any typo error, unclear explanations or new topics that can be covered, you can suggest changes to the documentation. For more details, please refer to :ref:`improve_docs`.
5858

sphinx/src/orga/minutes/2020-09-02.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
* [x] OVH VM: created with the communicated specs. Need to follow up with OVH about getting access.
6262
* People who need access need to create OVH accounts. Their accounts will be added as maintainers of that project.
6363
* Should probably manage with terraform
64-
* Add OVH to this yaml: https://github.com/conda-forge/conda-forge.github.io/blob/master/src/inst_partners.yaml
64+
* Add OVH to this yaml: https://github.com/conda-forge/conda-forge.github.io/blob/7f5c62c510104f78d8bd821ad8f34fced8c575c1/src/inst_partners.yaml
6565
* Render that yaml into jinja2
6666
6767
* (SC) R bindings for mamba: https://github.com/marimeireles/rhumba
@@ -132,7 +132,7 @@ Copy previous action items from last meeting agenda.
132132
133133
### This meeting
134134
* [ ] (ED) Update governance docs with similar voting model as what got put into conda-tools (+3 with no -1 is a pass)
135-
* [ ] (SC) Write jinja template to turn institutional partners yaml into a website https://github.com/conda-forge/conda-forge.github.io/blob/master/src/inst_partners.yaml
135+
* [ ] (SC) Write jinja template to turn institutional partners yaml into a website https://github.com/conda-forge/conda-forge.github.io/blob/2a2d3caaf7d74eb370ac40c679ba337a73d15c8a/src/inst_partners.yaml
136136
* [ ] (SC) Document what needs to be done to create an OVH account and get access
137137
138138
### Last meeting

sphinx/src/orga/minutes/2020-09-09.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ Copy previous action items from last meeting agenda.
197197

198198
### Last meeting
199199
* [ ] (ED) Update governance docs with similar voting model as what got put into conda-tools (+3 with no -1 is a pass)
200-
* [ ] (SC) Write jinja template to turn institutional partners yaml into a website https://github.com/conda-forge/conda-forge.github.io/blob/master/src/inst_partners.yaml
200+
* [ ] (SC) Write jinja template to turn institutional partners yaml into a website https://github.com/conda-forge/conda-forge.github.io/blob/2a2d3caaf7d74eb370ac40c679ba337a73d15c8a/src/inst_partners.yaml
201201
* [ ] (SC) Document what needs to be done to create an OVH account and get access
202202

203203
### 2 meetings ago

sphinx/src/orga/minutes/2020-09-16.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ Copy previous action items from last meeting agenda.
183183
### Last meeting
184184
2020-09-09
185185
* [ ] (ED) Update governance docs with similar voting model as what got put into conda-tools (+3 with no -1 is a pass)
186-
* [ ] (SC) Write jinja template to turn institutional partners yaml into a website https://github.com/conda-forge/conda-forge.github.io/blob/master/src/inst_partners.yaml
186+
* [ ] (SC) Write jinja template to turn institutional partners yaml into a website https://github.com/conda-forge/conda-forge.github.io/blob/2a2d3caaf7d74eb370ac40c679ba337a73d15c8a/src/inst_partners.yaml
187187
* [ ] (SC) Document what needs to be done to create an OVH account and get access
188188

189189
### 2 meetings ago

sphinx/src/orga/minutes/2020-09-30.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ Copy previous action items from last meeting agenda.
155155
### Move to Issue Tracker
156156
2020-09-09
157157
* [ ] (ED) Update governance docs with similar voting model as what got put into conda-tools (+3 with no -1 is a pass)
158-
* [ ] (SC) Write jinja template to turn institutional partners yaml into a website https://github.com/conda-forge/conda-forge.github.io/blob/master/src/inst_partners.yaml
158+
* [ ] (SC) Write jinja template to turn institutional partners yaml into a website https://github.com/conda-forge/conda-forge.github.io/blob/2a2d3caaf7d74eb370ac40c679ba337a73d15c8a/src/inst_partners.yaml
159159
* [ ] (SC) Document what needs to be done to create an OVH account and get access
160160

161161
2020-08-26

sphinx/src/orga/minutes/2020-10-07.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ Copy previous action items from last meeting agenda.
150150

151151
2020-09-09
152152
* [ ] (ED) Update governance docs with similar voting model as what got put into conda-tools (+3 with no -1 is a pass)
153-
* [ ] (SC) Write jinja template to turn institutional partners yaml into a website https://github.com/conda-forge/conda-forge.github.io/blob/master/src/inst_partners.yaml
153+
* [ ] (SC) Write jinja template to turn institutional partners yaml into a website https://github.com/conda-forge/conda-forge.github.io/blob/2a2d3caaf7d74eb370ac40c679ba337a73d15c8a/src/inst_partners.yaml
154154
* [ ] (SC) Document what needs to be done to create an OVH account and get access
155155

156156
2020-08-26

sphinx/src/orga/minutes/2020-10-14.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
[Zoom link](https://flatiron.zoom.us/j/93242638216?pwd=bjRCWmVJRW1oTGJhN09VUmxtTTJOUT09)
55
[What time is the meeting in my time zone](https://arewemeetingyet.com/UTC/2020-08-26/17:00/w/Conda-forge%20dev%20meeting#eyJ1cmwiOiJodHRwczovL2hhY2ttZC5pby9wUk15dFVKV1FmU3NJM2xvMGlqQzJRP2VkaXQifQ==)
6-
[last weeks meeting](https://hackmd.io/imt8mFUnQ4ud__-N-aNEsw) [github](https://github.com/conda-forge/conda-forge.github.io/blob/master/src/orga/minutes/2020-10-07.md)
6+
[last weeks meeting](https://hackmd.io/imt8mFUnQ4ud__-N-aNEsw) [github](https://github.com/conda-forge/conda-forge.github.io/blob/fb0524243fa1d7a67fcca8b9f669828cea645903/src/orga/minutes/2020-10-07.md)
77

88
## Attendees
99
* CJ
@@ -172,7 +172,7 @@ Copy previous action items from last meeting agenda.
172172

173173
2020-09-09
174174
* [ ] (ED) Update governance docs with similar voting model as what got put into conda-tools (+3 with no -1 is a pass)
175-
* [ ] (SC) Write jinja template to turn institutional partners yaml into a website https://github.com/conda-forge/conda-forge.github.io/blob/master/src/inst_partners.yaml
175+
* [ ] (SC) Write jinja template to turn institutional partners yaml into a website https://github.com/conda-forge/conda-forge.github.io/blob/2a2d3caaf7d74eb370ac40c679ba337a73d15c8a/src/inst_partners.yaml
176176
* [ ] (SC) Document what needs to be done to create an OVH account and get access
177177

178178
2020-08-26

0 commit comments

Comments
 (0)