Skip to content

DOC: Replace astropy channel with conda-forge - #11111

Merged
pllim merged 1 commit into
astropy:mainfrom
pllim:rm-astropy-channel
Sep 28, 2021
Merged

pllim merged 1 commit into
astropy:mainfrom
pllim:rm-astropy-channel

Conversation

@pllim

@pllim pllim commented Nov 30, 2020

Copy link
Copy Markdown
Member

Description

This pull request is to replace the mention of astropy conda channel with conda-forge.

I'll cancel Actions.

@github-actions

github-actions Bot commented Sep 3, 2021

Copy link
Copy Markdown
Contributor

Hi humans 👋 - this pull request hasn't had any new commits for approximately 9 months. I plan to close this in 30 days if the pull request doesn't have any new commits by then.

In lieu of a stalled pull request, please consider closing this and open an issue instead if a reminder is needed to revisit in the future. Maintainers may also choose to add keep-open label to keep this PR open but it is discouraged unless absolutely necessary.

If this PR still needs to be reviewed, as an author, you can rebase it to reset the clock.

If you believe I commented on this pull request incorrectly, please report this here.

@pllim

pllim commented Sep 5, 2021

Copy link
Copy Markdown
Member Author

@mwcraig , so are we doing this or not? If yes, I'll rebase. If not, I'll just close this PR. Please let me know.

@mwcraig

mwcraig commented Sep 28, 2021

Copy link
Copy Markdown
Member

I'm in favor of it -- there is no need to remove the astropy channel (i.e. the old instructions will work for the foreseeable future) but I think this is fine to merge once rebased.

@pllim
pllim force-pushed the rm-astropy-channel branch from d6a43f8 to 9553e1c Compare September 28, 2021 17:48
@pllim pllim added backport-v4.0.x and removed Close? Tell stale bot that this issue/PR is stale labels Sep 28, 2021
@pllim

pllim commented Sep 28, 2021

Copy link
Copy Markdown
Member Author

Okay, rebased!

@pllim
pllim merged commit b2660f9 into astropy:main Sep 28, 2021
@pllim
pllim deleted the rm-astropy-channel branch September 28, 2021 18:17
@lumberbot-app

lumberbot-app Bot commented Sep 28, 2021

Copy link
Copy Markdown

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout v4.3.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 b2660f922622c8bc971b55975dbe18ab8e1a83b2
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #11111: DOC: Replace astropy channel with conda-forge'
  1. Push to a named branch :
git push YOURFORK v4.3.x:auto-backport-of-pr-11111-on-v4.3.x
  1. Create a PR against branch v4.3.x, I would have named this PR:

"Backport PR #11111 on branch v4.3.x (DOC: Replace astropy channel with conda-forge)"

And apply the correct labels and milestones.

Congratulation you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove Still Needs Manual Backport label once the PR gets merged.

If these instruction are inaccurate, feel free to suggest an improvement.

@lumberbot-app

lumberbot-app Bot commented Sep 28, 2021

Copy link
Copy Markdown

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout v4.0.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 b2660f922622c8bc971b55975dbe18ab8e1a83b2
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #11111: DOC: Replace astropy channel with conda-forge'
  1. Push to a named branch :
git push YOURFORK v4.0.x:auto-backport-of-pr-11111-on-v4.0.x
  1. Create a PR against branch v4.0.x, I would have named this PR:

"Backport PR #11111 on branch v4.0.x (DOC: Replace astropy channel with conda-forge)"

And apply the correct labels and milestones.

Congratulation you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove Still Needs Manual Backport label once the PR gets merged.

If these instruction are inaccurate, feel free to suggest an improvement.

pllim added a commit to pllim/astropy that referenced this pull request Sep 28, 2021
pllim added a commit to pllim/astropy that referenced this pull request Sep 28, 2021
pllim added a commit that referenced this pull request Oct 19, 2021
…4.0.x

Backport PR #11111: DOC: Replace astropy channel with conda-forge
pllim added a commit that referenced this pull request Oct 19, 2021
…4.3.x

Backport PR #11111: DOC: Replace astropy channel with conda-forge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants