Merge pull request #180 from pllim/replace-with-main

eteq · web-flow · commit 90fc725d115c · 2021-06-15T12:05:25.000-04:00
MNT: Replace master with main, project with astropy-project
diff --git a/affiliated/affiliated_package_review_process.md b/affiliated/affiliated_package_review_process.md
@@ -26,7 +26,7 @@ Astropy Project, open a pull request to the
 [astropy.github.com](https://github.com/astropy/astropy.github.com)
 repository, modifying the ``affiliated/registry.json`` file to add details
 about your own package. If you are not comfortable with git, you can do this by using
-[an editor](https://github.com/astropy/astropy.github.com/edit/master/affiliated/registry.json).
+[an editor](https://github.com/astropy/astropy.github.com/edit/main/affiliated/registry.json).
 If you get a message saying **You need
 to fork this repository to propose changes** then click on the green button
 to confirm the forking:
@@ -130,7 +130,7 @@ use the singular term *editor*, although multiple people may share this role
 
 3. Once the reviewer accepts, the editor sends the reviewer an email with detailed
    review instructions (which includes a link to the
-   [review guidelines](https://github.com/astropy/project/blob/master/affiliated/affiliated_package_review_guidelines.md>)),
+   [review guidelines](https://github.com/astropy/astropy-project/blob/main/affiliated/affiliated_package_review_guidelines.md>)),
    using the [template](#templatereviewinstructions) at the bottom of this document.
 
 4. The editor then leaves a message on the pull request proposing the affiliated package saying:
@@ -230,7 +230,7 @@ Repository:
 
 You can find our review guidelines and instructions at the following address:
 
-  https://github.com/astropy/project/blob/master/affiliated/affiliated_package_review_guidelines.md
+  https://github.com/astropy/astropy-project/blob/main/affiliated/affiliated_package_review_guidelines.md
 
 Thanks!
 
@@ -248,15 +248,15 @@ ecosystem by a member of the Astropy community as well as myself, and I have
 synthesized the results of the review here.
 
 You can find out more about our review criteria in
-[Reviewing affiliated packages](https://github.com/astropy/astropy-procedures/blob/master/documents/affiliated_package_review_guidelines.md).
+[Reviewing affiliated packages](https://github.com/astropy/astropy-procedures/blob/main/documents/affiliated_package_review_guidelines.md).
 For each of the review categories below we have listed the score and have
 included some comments when the score is not green.
 
 *Remove the badges that aren't needed:*
 
 <table>
 <tr><td><b>Functionality/Scope</b></td><td>
-<a href="https://github.com/astropy/astropy-procedures/blob/master/documents/affiliated_package_review_guidelines.md#functionality-functionality">
+<a href="https://github.com/astropy/astropy-procedures/blob/main/documents/affiliated_package_review_guidelines.md#functionality-functionality">
 <img src="https://img.shields.io/badge/Out%20of%20scope-red.svg" alt="Out of scope">
 <img src="https://img.shields.io/badge/Specialized%20package-brightgreen.svg" alt="Specialized package">
 <img src="https://img.shields.io/badge/General%20package-brightgreen.svg" alt="General package">
@@ -265,7 +265,7 @@ included some comments when the score is not green.
 <tr><td colspan=2><i>No further comments</i></td></tr>
 
 <tr><td><b>Integration with Astropy ecosystem</b></td><td>
-<a href="https://github.com/astropy/astropy-procedures/blob/master/documents/affiliated_package_review_guidelines.md#integration-with-astropy-ecosystem--ecointegration">
+<a href="https://github.com/astropy/astropy-procedures/blob/main/documents/affiliated_package_review_guidelines.md#integration-with-astropy-ecosystem--ecointegration">
 <img src="https://img.shields.io/badge/Red-red.svg" alt="Red">
 <img src="https://img.shields.io/badge/Orange-orange.svg" alt="Orange">
 <img src="https://img.shields.io/badge/Green-brightgreen.svg" alt="Green">
@@ -274,7 +274,7 @@ included some comments when the score is not green.
 <tr><td colspan=2><i>No further comments</i></td></tr>
 
 <tr><td><b>Documentation</b></td><td>
-<a href="https://github.com/astropy/astropy-procedures/blob/master/documents/affiliated_package_review_guidelines.md#documentation-documentation">
+<a href="https://github.com/astropy/astropy-procedures/blob/main/documents/affiliated_package_review_guidelines.md#documentation-documentation">
 <img src="https://img.shields.io/badge/Red-red.svg" alt="Red">
 <img src="https://img.shields.io/badge/Orange-orange.svg" alt="Orange">
 <img src="https://img.shields.io/badge/Green-brightgreen.svg" alt="Green">
@@ -283,7 +283,7 @@ included some comments when the score is not green.
 <tr><td colspan=2><i>No further comments</i></td></tr>
 
 <tr><td><b>Testing</b></td><td>
-<a href="https://github.com/astropy/astropy-procedures/blob/master/documents/affiliated_package_review_guidelines.md#testing-testing">
+<a href="https://github.com/astropy/astropy-procedures/blob/main/documents/affiliated_package_review_guidelines.md#testing-testing">
 <img src="https://img.shields.io/badge/Red-red.svg" alt="Red">
 <img src="https://img.shields.io/badge/Orange-orange.svg" alt="Orange">
 <img src="https://img.shields.io/badge/Green-brightgreen.svg" alt="Green">
@@ -292,7 +292,7 @@ included some comments when the score is not green.
 <tr><td colspan=2><i>No further comments</i></td></tr>
 
 <tr><td><b>Development status</b></td><td>
-<a href="https://github.com/astropy/astropy-procedures/blob/master/documents/affiliated_package_review_guidelines.md#development-status-devstatus">
+<a href="https://github.com/astropy/astropy-procedures/blob/main/documents/affiliated_package_review_guidelines.md#development-status-devstatus">
 <img src="https://img.shields.io/badge/Red-red.svg" alt="Red">
 <img src="https://img.shields.io/badge/Heavy%20development-orange.svg" alt="Heavy Development">
 <img src="https://img.shields.io/badge/Functional%20but%20unmaintained-orange.svg" alt="Functional but unmaintained">
@@ -303,7 +303,7 @@ included some comments when the score is not green.
 <tr><td colspan=2><i>No further comments</i></td></tr>
 
 <tr><td><b>Python 3 compatibility</b></td><td>
-<a href="https://github.com/astropy/astropy-procedures/blob/master/documents/affiliated_package_review_guidelines.md#python-3-compatibility-python3">
+<a href="https://github.com/astropy/astropy-procedures/blob/main/documents/affiliated_package_review_guidelines.md#python-3-compatibility-python3">
 <img src="https://img.shields.io/badge/Red-red.svg" alt="Red">
 <img src="https://img.shields.io/badge/Green-brightgreen.svg" alt="Green">
 </a></td></tr>
diff --git a/finance/community-updates/2020-02.txt b/finance/community-updates/2020-02.txt
@@ -21,7 +21,7 @@ comments and suggestions.
 
 First, we've established a wiki page:
 
-  https://github.com/astropy/project/wiki/Financial-Management
+  https://github.com/astropy/astropy-project/wiki/Financial-Management
 
 That page has the full charge to and membership of the committee, as well as
 links to key resources and information about how to contact us. We'll make sure
@@ -32,10 +32,10 @@ publicly available — we welcome your comments on them:
 
   https://docs.google.com/document/d/193ERJ6wMNPaNjGSWbS94KHGnojpZ_zwXxWTi9L2etSo/edit?usp=sharing
 
-We track the committee's business in the astropy/project repository. You can see
+We track the committee's business in the astropy/astropy-project repository. You can see
 what we're working on, or file issues for us to think about, here:
 
-  https://github.com/astropy/project/issues?q=is%3Aissue+is%3Aopen+label%3A%22finance+%3Amoneybag%3A%22
+  https://github.com/astropy/astropy-project/issues?q=is%3Aissue+is%3Aopen+label%3A%22finance+%3Amoneybag%3A%22
 
 We will also aim to send a very brief summary of our activities and approved
 expenditures to the astropy-dev list every couple of months.
diff --git a/finance/community-updates/2020-05.md b/finance/community-updates/2020-05.md
@@ -26,17 +26,17 @@ We promised to briefly update you every couple of months [1] on our activities a
   the discussion.
 
 - As of now, we are actively working on contracts for
-  [Matt Craig](https://github.com/astropy/project/issues/63) and
-  [Adam Ginsburg](https://github.com/astropy/project/issues/70).
+  [Matt Craig](https://github.com/astropy/astropy-project/issues/63) and
+  [Adam Ginsburg](https://github.com/astropy/astropy-project/issues/70).
 
-- We compensated [Brett Morris](https://github.com/astropy/project/issues/67)
+- We compensated [Brett Morris](https://github.com/astropy/astropy-project/issues/67)
   for running workshops on Astropy in late 2019 in Belfast, Bern, and Geneva.
 
 - Some funding in the Moore grant may be used to address the project’s
   needs as they arise. The last Astropy coordination meeting
   identified a need for a software operational support specialist who
   can help volunteers with getting started on GitHub, merging,
-  rebasing etc. We have [advertised that position](https://github.com/astropy/project/blob/master/finance/jobs/2020_githubresponder.rst)
+  rebasing etc. We have [advertised that position](https://github.com/astropy/astropy-project/blob/main/finance/jobs/2020_githubresponder.rst)
   and convened a selection committee. We are expecting a start date this summer.
 
 - We are working with NumFOCUS (Astropy’s fiscal sponsor) on the
@@ -45,11 +45,11 @@ We promised to briefly update you every couple of months [1] on our activities a
   expenses.
 
 - We’ve drafted a [policy on travel and conference attendance paid for
-  by astropy](https://github.com/astropy/project/blob/master/finance/funding_requests.md).
+  by astropy](https://github.com/astropy/astropy-project/blob/main/finance/funding_requests.md).
 
-See the [issues labeled “finance” in the astropy project repo](https://github.com/astropy/project/issues?q=is%3Aissue+label%3A%22finance+%3Amoneybag%3A%22) and the full notes from our meetings for more details:
+See the [issues labeled “finance” in the astropy project repo](https://github.com/astropy/astropy-project/issues?q=is%3Aissue+label%3A%22finance+%3Amoneybag%3A%22) and the full notes from our meetings for more details:
 https://docs.google.com/document/d/193ERJ6wMNPaNjGSWbS94KHGnojpZ_zwXxWTi9L2etSo/edit?usp=sharing
 
-You can make suggestions for things that need to be funded by opening an issue in https://github.com/astropy/project/ or by emailing finance@astropy.org or in the #finance-committee channel on slack.
+You can make suggestions for things that need to be funded by opening an issue in https://github.com/astropy/astropy-project/ or by emailing finance@astropy.org or in the #finance-committee channel on slack.
 
 [1] https://groups.google.com/forum/#!topic/astropy-dev/U0AQHBS1klw
diff --git a/finance/community-updates/2020-08.txt b/finance/community-updates/2020-08.txt
@@ -13,9 +13,9 @@ with some updates on our work, and reminders about ongoing activities.
   requests. Questions about the proposal process can be directed to the
   FAQ [3].
 
-  [1] https://github.com/astropy/project/blob/master/finance/InclusionDiversityEmpowerment.md
-  [2] https://github.com/astropy/project/pulls?q=is%3Apr+is%3Aopen+label%3Ainclusion-diversity-empowerment
-  [3] https://github.com/astropy/project/issues/120
+  [1] https://github.com/astropy/astropy-project/blob/main/finance/InclusionDiversityEmpowerment.md
+  [2] https://github.com/astropy/astropy-project/pulls?q=is%3Apr+is%3Aopen+label%3Ainclusion-diversity-empowerment
+  [3] https://github.com/astropy/astropy-project/issues/120
 
 - We are pleased to announce Madison Bray is joining the project again
   as the Astropy Software Operational Support Specialist.  Madison
@@ -27,8 +27,8 @@ with some updates on our work, and reminders about ongoing activities.
 - We have awarded sub-awards to Matt Craig [4] and Adam Ginsburg [5] to
   support their work on the Astropy project.
 
-  [4] https://github.com/astropy/project/issues/63
-  [5] https://github.com/astropy/project/issues/70
+  [4] https://github.com/astropy/astropy-project/issues/63
+  [5] https://github.com/astropy/astropy-project/issues/70
 
 - For the remaining core developer funds, we decided that it was best to
   share this equally among the core contributors that were interested
@@ -39,7 +39,7 @@ with some updates on our work, and reminders about ongoing activities.
   and Miguel de Val-Barro.  Once finalized, the scopes of work will be
   posted to issue project/#113 [6].
 
-  [6] https://github.com/astropy/project/issues/113
+  [6] https://github.com/astropy/astropy-project/issues/113
 
 - In addition, the finance committee has also supported a new contract
   to include software for Kepler/TESS into the Astropy Ecosystem.
@@ -62,11 +62,11 @@ experiences.
 For more information on our activities, please see the issues labeled
 “finance” in the Astropy project repo [7], or peruse the notes from our
 weekly meetings [8]. You can make suggestions for things that need to be
-funded by opening an issue in https://github.com/astropy/project/, by
+funded by opening an issue in https://github.com/astropy/astropy-project/, by
 emailing finance@astropy.org, or by joining us in the #finance-committee
 channel on Slack.
 
-[7] https://github.com/astropy/project/issues?q=is%3Aissue+label%3A%22finance+%3Amoneybag%3A%22
+[7] https://github.com/astropy/astropy-project/issues?q=is%3Aissue+label%3A%22finance+%3Amoneybag%3A%22
 [8] https://docs.google.com/document/d/193ERJ6wMNPaNjGSWbS94KHGnojpZ_zwXxWTi9L2etSo/edit?usp=sharing
 
 Cheers,
diff --git a/finance/community-updates/2020-10.txt b/finance/community-updates/2020-10.txt
@@ -23,8 +23,8 @@ on our activities over the couple of months.
   our process could be improved.
 
   [1] https://groups.google.com/g/astropy-dev/c/NDU3dTDDsAc
-  [2] https://github.com/astropy/astropy-project/blob/master/finance/proposal-calls/2020-IDEA/IDEA_2020_outreachy.md
-  [3] https://github.com/astropy/astropy-project/blob/master/finance/proposal-calls/2020-IDEA/IDEA_2020_WoCCode.md
+  [2] https://github.com/astropy/astropy-project/blob/main/finance/proposal-calls/2020-IDEA/IDEA_2020_outreachy.md
+  [3] https://github.com/astropy/astropy-project/blob/main/finance/proposal-calls/2020-IDEA/IDEA_2020_WoCCode.md
 
 - We're pleased to announce that a proposal entitled “Kicking Off Scientific
   Software Engineering Learning Resources with the Astropy Learn Project” [4],
@@ -78,11 +78,11 @@ on our activities over the couple of months.
 For more information on our activities, please see the issues labelled
 “finance” in the astropy-project repo [12], or read the notes from our weekly
 meetings [13]. You can make suggestions for things that need to be funded by
-opening an issue in https://github.com/astropy/project/, by emailing
+opening an issue in https://github.com/astropy/astropy-project/, by emailing
 finance@astropy.org, or by joining us in the #finance-committee channel on
 Slack.
 
-[12] https://github.com/astropy/project/issues?q=is%3Aissue+label%3A%22finance+%3Amoneybag%3A%22
+[12] https://github.com/astropy/astropy-project/issues?q=is%3Aissue+label%3A%22finance+%3Amoneybag%3A%22
 [13] https://docs.google.com/document/d/193ERJ6wMNPaNjGSWbS94KHGnojpZ_zwXxWTi9L2etSo/edit?usp=sharing
 
 Cheers,
diff --git a/finance/finance-ctte-intro.txt b/finance/finance-ctte-intro.txt
@@ -21,7 +21,7 @@ comments and suggestions.
 
 First, we've established a wiki page:
 
-  https://github.com/astropy/project/wiki/Financial-Management
+  https://github.com/astropy/astropy-project/wiki/Financial-Management
 
 That page has the full charge to and membership of the committee, as well as
 links to key resources and information about how to contact us. We'll make sure
@@ -32,10 +32,10 @@ publicly available — we welcome your comments on them:
 
   https://docs.google.com/document/d/193ERJ6wMNPaNjGSWbS94KHGnojpZ_zwXxWTi9L2etSo/edit?usp=sharing
 
-We track the committee's business in the astropy/project repository. You can see
+We track the committee's business in the astropy/astropy-project repository. You can see
 what we're working on, or file issues for us to think about, here:
 
-  https://github.com/astropy/project/issues?q=is%3Aissue+is%3Aopen+label%3A%22finance+%3Amoneybag%3A%22
+  https://github.com/astropy/astropy-project/issues?q=is%3Aissue+is%3Aopen+label%3A%22finance+%3Amoneybag%3A%22
 
 We will also aim to send a very brief summary of our activities and approved
 expenditures to the astropy-dev list every couple of months.
diff --git a/finance/finance-ctte-policy.rst b/finance/finance-ctte-policy.rst
@@ -5,12 +5,12 @@ Interim Finance Committee Policies
 This document records policies adopted by the `Astropy Interim Finance Committee`_ (hereafter “the Committee”).
 It is a “living document” which is expected to evolve over time.
 
-.. _Astropy Interim Finance Committee: https://github.com/astropy/project/wiki/Financial-Management#interim-finance-committee
+.. _Astropy Interim Finance Committee: https://github.com/astropy/astropy-project/wiki/Financial-Management#interim-finance-committee
 
 Role and responsibilities of the Committee
 ==========================================
 
-#. The Committee is responsible for executing the charge described at https://github.com/astropy/project/wiki/Financial-Management.
+#. The Committee is responsible for executing the charge described at https://github.com/astropy/astropy-project/wiki/Financial-Management.
 
    (Agreed `2019-12-20`__)
 
@@ -30,7 +30,7 @@ Role and responsibilities of the Committee
 
    __ https://docs.google.com/document/d/193ERJ6wMNPaNjGSWbS94KHGnojpZ_zwXxWTi9L2etSo/edit#bookmark=id.fwmv8h9ysndt
 
-#. The Committee will allocate funding as recommended by the Astropy Coordination Committee, and will consider funding requests submitted according to the policy documented at https://github.com/astropy/project/blob/master/finance/funding_requests.md.
+#. The Committee will allocate funding as recommended by the Astropy Coordination Committee, and will consider funding requests submitted according to the policy documented at https://github.com/astropy/astropy-project/blob/main/finance/funding_requests.md.
    This policy may be evolve over time.
 
    (Agreed `2020-04-24`__.)
@@ -100,14 +100,14 @@ Funding proposals that are written on behalf of the Astropy Project should be pu
 Tracking work in progress
 =========================
 
-#. All hiring activities will be tracked by means of issues in the ``astropy/project`` GitHub repository.
+#. All hiring activities will be tracked by means of issues in the ``astropy/astropy-project`` GitHub repository.
    The issue description will contain a brief description of the scope of work.
 
    (Agreed `2020-03-06`__.)
 
    __ https://docs.google.com/document/d/193ERJ6wMNPaNjGSWbS94KHGnojpZ_zwXxWTi9L2etSo/edit#bookmark=id.4jdhskegwqo5
 
-#. The ``astropy/project`` GitHub issue tracker, together with the ``finance`` label, will be used to provide status on all major committee work.
+#. The ``astropy/astropy-project`` GitHub issue tracker, together with the ``finance`` label, will be used to provide status on all major committee work.
    The intention is that these issues are more than a simple “todo list” for the committee, but that they provide a way for the community to see how the various projects the committee are engaged upon are progressing.
    As such, we expect that most issues will remain open for the duration of the project in question.
    For example, an issue regarding funding for a conference will remain open until the conference is over and all necessary reporting has been completed.
diff --git a/finance/finance-ctte-procedures.rst b/finance/finance-ctte-procedures.rst
@@ -12,7 +12,7 @@ When a member of the committee joins the committee, the following steps are requ
 * Confirmation the member is aware of these steps, and has read the Code of Conduct
 * Adding the member to the google group/email list
 * Add write access to the running notes
-* Addition of name to `wiki page <https://github.com/astropy/project/wiki/Financial-Management>`_.
+* Addition of name to `wiki page <https://github.com/astropy/astropy-project/wiki/Financial-Management>`_.
 * Addition of name to `astropy team page <https://www.astropy.org/team.html>`_.
 
 
@@ -23,5 +23,5 @@ When a member of the committee leaves, the following steps are required:
 
 * Removal from google group/email list
 * Revocation of write access to the running notes
-* Removal of name from `wiki page <https://github.com/astropy/project/wiki/Financial-Management>`_.
+* Removal of name from `wiki page <https://github.com/astropy/astropy-project/wiki/Financial-Management>`_.
 * Removal of name from `astropy team page <https://www.astropy.org/team.html>`_.
diff --git a/finance/funding_requests.md b/finance/funding_requests.md
diff --git a/finance/jobs/2020_githubresponder.rst b/finance/jobs/2020_githubresponder.rst
diff --git a/finance/proposal-calls/2020-IDEA/InclusionDiversityEmpowerment.md b/finance/proposal-calls/2020-IDEA/InclusionDiversityEmpowerment.md
