Skip to content

Commit 412eaba

Browse files
committed
ENH move master to main
1 parent 34adb68 commit 412eaba

File tree

13 files changed

+31
-49
lines changed

13 files changed

+31
-49
lines changed

.ci_scripts/update_docs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,3 @@ rm -rf _build
3030
popd
3131

3232
mv docs-README docs/README
33-
34-
# git diff
35-
36-
# # Only commit the docs for commits on master.
37-
# if [[ $GH_REF == refs/heads/master ]] && [[ $GH_TOKEN != "" ]]; then
38-
# git add -A :/
39-
# git commit -m "Re-ran make.py. [ci skip]" || true
40-
# git remote add pushable https://${GH_TOKEN}@github.com/conda-forge/conda-forge.github.io.git/ > /dev/null
41-
#
42-
# # Update the remotes before pushing and check the status.
43-
# # This should give us more info if the push will not be
44-
# # a simple fast-forward push.
45-
# git fetch --all 2> /dev/null
46-
# git branch -u pushable/gh-pages
47-
# git status
48-
# git push pushable new_site_content:gh-pages
49-
# # 2> /dev/null
50-
# fi

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: deploy
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request: null
88
workflow_dispatch: null
99

@@ -38,7 +38,7 @@ jobs:
3838
source ./.ci_scripts/update_docs
3939
4040
- name: deploy
41-
if: github.ref == 'refs/heads/master' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
41+
if: github.ref == 'refs/heads/main' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
4242
uses: peaceiris/actions-gh-pages@v3
4343
with:
4444
github_token: ${{ secrets.GITHUB_TOKEN }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ A link to the google calendar item can be found [here](https://calendar.google.c
3535

3636
We use https://hackmd.io/ for taking meeting minutes and will upload the resultant markdown file after the meeting has concluded.
3737

38-
There is a template provided in [`misc/DEV_MEETING_TEMPLATE.md`](https://github.com/conda-forge/conda-forge.github.io/tree/master/misc/DEV_MEETING_TEMPLATE.md) that you should use to create a new hackmd document.
38+
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.

newsfeed/demo/announcements.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Announcements
105105

106106
:2020-07-15: ``CFEP-18:`` Removing static libraries from the main build
107107

108-
With `CFEP-18 <https://github.com/conda-forge/cfep/blob/master/cfep-18.md>`_
108+
With `CFEP-18 <https://github.com/conda-forge/cfep/blob/main/cfep-18.md>`_
109109
we now have a policy on how to deal with static packages. The most important
110110
change here is that we will be removing static libraries from the main packages
111111
and moving them to ``-static`` suffixed packages. ``-static`` packages will not

src/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. conda-forge documentation master file, created by
1+
.. conda-forge documentation primary file, created by
22
sphinx-quickstart on Wed Jun 1 01:44:13 2016.
33
You can adapt this file completely to your liking, but it should at least
44
contain the root `toctree` directive.

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/master/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/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

src/maintainer/updating_pkgs.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ remove broken packages from the ``main`` channel:
205205

206206
1. Locate the paths to broken files on `anaconda.org <https://anaconda.org>`__, by searching for the conda-forge package and switching to the files tab.
207207
2. Fork `conda-forge/admin-requests <https://github.com/conda-forge/admin-requests>`__ and add a new text file in the ``broken`` directory.
208-
3. Add the broken files to the new text file, one path per line. See `broken/example.txt <https://github.com/conda-forge/admin-requests/blob/master/broken/example.txt>`__ for an example file.
208+
3. Add the broken files to the new text file, one path per line. See `broken/example.txt <https://github.com/conda-forge/admin-requests/blob/main/broken/example.txt>`__ for an example file.
209209
4. Open a new PR. Once merged, a bot will label all listed files as broken, thus effectively removing them from the channel.
210210

211211

@@ -224,19 +224,19 @@ Updating the maintainer list
224224
============================
225225

226226
The list of maintainers of a feedstock is recorded in the recipe itself. A new maintainer can be added by opening
227-
an issue in the feedstock repository with the following title:
227+
an issue in the feedstock repository with the following title:
228228

229229
``@conda-forge-admin, please add user @username``
230230

231231
where ``username`` is the username of the new maintainer to be added.
232-
A PR will be automatically created and a maintainer or a member of the ``core`` can then merge this PR to add the user.
232+
A PR will be automatically created and a maintainer or a member of the ``core`` can then merge this PR to add the user.
233233

234234
.. note::
235235

236236

237237
This PR is designed to skip building the package. Please do **not** modify it or adjust the commit message.
238238

239-
For example see `this <https://github.com/conda-forge/cudnn-feedstock/issues/20>`__ issue.
239+
For example see `this <https://github.com/conda-forge/cudnn-feedstock/issues/20>`__ issue.
240240

241241

242242
Maintaining several versions

src/misc/00_intro.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,25 @@ Glossary
1111

1212
PR
1313
**P**\ ull **R**\ equest. Pull Request is a workflow method to submit contributions to an open development project in which the developer asks for changes committed to an external repository to be considered for inclusion in a project's main repository. `Learn More <https://help.github.com/articles/about-pull-requests/>`_.
14-
14+
1515
CDT
1616
**C**\ ore **D**\ ependency **T**\ ree. Core Dependency Tree packages take care of the dependencies which are so close to the system that they are not packaged with ``conda-forge``. A CDT package consists of repackaged CentOS binaries from the appropriate version, either 6 or 7 depending on user choice and platform. `Learn More <https://conda-forge.org/docs/maintainer/knowledge_base.html#core-dependency-tree-packages-cdts/>`_.
1717

1818
ABI
19-
**A**\ pplication **B**\ inary **I**\ nterface. ABI is a document that comprehensively defines the binary system interface between applications and the operating system on which they run. `Learn More <https://en.wikipedia.org/wiki/Application_binary_interface>`_.
20-
19+
**A**\ pplication **B**\ inary **I**\ nterface. ABI is a document that comprehensively defines the binary system interface between applications and the operating system on which they run. `Learn More <https://en.wikipedia.org/wiki/Application_binary_interface>`_.
20+
2121
ICU
22-
**I**\ nternational **C**\ omponents for **U**\ nicode. ICU is an open-source project of mature C/C++ and Java libraries for Unicode support, software internationalization, and software globalization. `Learn More <http://site.icu-project.org/>`_.
23-
22+
**I**\ nternational **C**\ omponents for **U**\ nicode. ICU is an open-source project of mature C/C++ and Java libraries for Unicode support, software internationalization, and software globalization. `Learn More <http://site.icu-project.org/>`_.
23+
2424
CRAN
2525
**C**\ omprehensive **R** **A**\ rchive **N**\ etwork. CRAN is a network of FTP and web servers around the world that store identical, up-to-date, versions of code and documentation for R. `Learn More <https://cran.r-project.org/>`_.
2626

27-
CFEP
28-
**C**\ onda **F**\ orge **E**\ nhancement **P**\ roposal. A CFEP is a document which outlines a suggested change to how the conda-forge project operates, from a technical standpoint as well as to address social topics such as governance and expected conduct. `Learn More <https://github.com/conda-forge/cfep/blob/master/cfep-01.md/>`_.
27+
CFEP
28+
**C**\ onda **F**\ orge **E**\ nhancement **P**\ roposal. A CFEP is a document which outlines a suggested change to how the conda-forge project operates, from a technical standpoint as well as to address social topics such as governance and expected conduct. `Learn More <https://github.com/conda-forge/cfep/blob/main/cfep-01.md/>`_.
2929

3030
TODO list
3131
*********
3232

3333
.. todolist::
3434

35-
The original entry is located in ``.src`` file of `/home/runner/work/conda-forge.github.io/conda-forge.github.io/src/maintainer/knowledge_base.rst, line 952. <https://github.com/conda-forge/conda-forge.github.io/blob/master/src/maintainer/knowledge_base.rst#noarch-generic/>`_.
35+
The original entry is located in ``.src`` file of `/home/runner/work/conda-forge.github.io/conda-forge.github.io/src/maintainer/knowledge_base.rst, line 952. <https://github.com/conda-forge/conda-forge.github.io/blob/main/src/maintainer/knowledge_base.rst#noarch-generic/>`_.

src/orga/governance.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ and `the Helios voting system <https://vote.heliosvoting.org/>`_, but are
9191
open to any secure, anonymous system.) The email capability of your chosen
9292
voting platform should be used for sending voting invitations and reminders,
9393
and you should use the email list from
94-
https://github.com/conda-forge/conda-forge.github.io/blob/master/src/core.csv as
94+
https://github.com/conda-forge/conda-forge.github.io/blob/main/src/core.csv as
9595
the authoritative list of emails to use.
9696

9797
The default voting period is 1 week (7 days). This may be modified at
@@ -114,7 +114,7 @@ To call for a standard vote, here is a template PR comment:
114114

115115
:Posting results: To maintain the historical record, the outcome of any standard vote which invokes the
116116
"time out" rules below should be recorded in the "vote-results" folder at
117-
https://github.com/conda-forge/conda-forge.github.io/tree/master/src/vote-results
117+
https://github.com/conda-forge/conda-forge.github.io/tree/main/src/vote-results
118118

119119
Each vote should be its own file. The filename should reflect the topic and the
120120
date that the vote opened. The file should contain at least:
@@ -187,7 +187,7 @@ To call for a standard vote, here is a template PR comment:
187187
188188
To declare a standard vote "timed out," the person making such a declaration
189189
must post a pull-request adding
190-
a vote record to the https://github.com/conda-forge/conda-forge.github.io/tree/master/src/vote-results
190+
a vote record to the https://github.com/conda-forge/conda-forge.github.io/tree/main/src/vote-results
191191
folder. The declaration PR should be merged by the first core member
192192
who is available to verify that
193193
the requirements for the timeout have been met, based on their

src/orga/subteams.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ The staging team is responsible for:
229229

230230
Members
231231
-------
232-
In addition to `core <https://github.com/conda-forge/conda-forge.github.io/blob/master/src/core.csv>`_
233-
and `emeritus <https://github.com/conda-forge/conda-forge.github.io/blob/master/src/emeritus.csv>`_,
232+
In addition to `core <https://github.com/conda-forge/conda-forge.github.io/blob/main/src/core.csv>`_
233+
and `emeritus <https://github.com/conda-forge/conda-forge.github.io/blob/main/src/emeritus.csv>`_,
234234
the following are members of the staged-recipes team and have commit rights.
235235

236236
- Amir Mohammadi <[email protected]>
@@ -270,7 +270,7 @@ Diversity and Inclusion Sub-Team
270270

271271
Role
272272
----
273-
Develop ``conda-forge`` as a diverse community and advocate for
273+
Develop ``conda-forge`` as a diverse community and advocate for
274274
actions impacting underrepresented groups in ``conda-forge``.
275275

276276
Charter
@@ -282,7 +282,7 @@ Responsibility
282282
One of the core strengths of ``conda-forge`` is the diversity of ecosystems it supports.
283283
Likewise, fostering and advancing a diverse community of users, maintainers, and infrastructure contributors
284284
is an important part of creating and maintaining a vibrant project.
285-
The mandate of this subteam is to support and increase the diversity of the ``conda-forge``
285+
The mandate of this subteam is to support and increase the diversity of the ``conda-forge``
286286
community at all levels.
287287
As such this group can, but is not limited to:
288288
- provide a place for issues impacting diversity to be heard

0 commit comments

Comments
 (0)