Skip to content

MAINT: Update master to main after branch rename#18544

Merged
seberg merged 10 commits intonumpy:mainfrom
stefanv:master-to-main
Mar 4, 2021
Merged

MAINT: Update master to main after branch rename#18544
seberg merged 10 commits intonumpy:mainfrom
stefanv:master-to-main

Conversation

@stefanv
Copy link
Contributor

@stefanv stefanv commented Mar 4, 2021

No description provided.

@stefanv stefanv changed the title Upload docs to main branch of neps/devdocs Update master to main Mar 4, 2021
Copy link
Member

@seberg seberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks Stéfan, I suspect this is breaking some things, so happy if you or Ross just merge it when content.

Copy link
Contributor

@rossbar rossbar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM too, looks like this gets most of the instances. I'd like to double-check the CI logs as well when they complete to see if there's anything obvious

@seberg seberg changed the title Update master to main MAINT: Update master to main after branch rename Mar 4, 2021
@mattip
Copy link
Member

mattip commented Mar 4, 2021

Azure is stuck with "This agent request is not running because you have reached the maximum number of requests that can run for parallelism type", restarting it did not help.

@rgommers
Copy link
Member

rgommers commented Mar 4, 2021

Azure is stuck with "This agent request is not running because you have reached the maximum number of requests that can run for parallelism type", restarting it did not help.

There's a massive backlog, but I don't see how to cancel all running jobs at once.

Copy link
Member

@rgommers rgommers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM too, thanks @stefanv!

@seberg
Copy link
Member

seberg commented Mar 4, 2021

Going to merge this, before it creates some problems. That hanging test is weird, but not really worrisome. Thanks again!

@seberg seberg merged commit 954605e into numpy:main Mar 4, 2021
@charris
Copy link
Member

charris commented Mar 4, 2021

The azure pipeline is also trying to read master. I edited the pipeline yml, lets see if that helps. If not, the easiest fix may be to delete the old pipeline and make a new one.

@charris
Copy link
Member

charris commented Mar 4, 2021

Wheel builds will need fixing, they currently keep a submodule with the numpy master branch.

@seberg
Copy link
Member

seberg commented Mar 4, 2021

We should probably rename to main in numpy-wheels as well. It seems much cleaner if the branch it builds has the identical name (I do not have access to rename) – otherwise have to carefully distinguish whether the occurance of "master" refers to the wheel repo or the numpy one, making the change more than a trivial replace.

@charris
Copy link
Member

charris commented Mar 4, 2021

@seberg I'm going to fix the wheel build in two steps

  • Fix the yml files
  • Do the rename

The first step is running now, we will see how it goes. The NumPy submodule should be OK, it points to a hash. I checked that I could also checkout main from numpy after doing git submodule sync --recursive. I'm going to think a bit as to how to do the branch rename in order to avoid the current Numpy problems.

@charris
Copy link
Member

charris commented Mar 4, 2021

Turns out that the job limit applies to all the pipelines, so the azure wheels build is also stuck waiting.

@seberg
Copy link
Member

seberg commented Mar 4, 2021

Microsoft isn't letting me log into azure easily (claiming my private email is a job email). It seems it restarted the jobs for all PRs on azure, not sure if we can clear the whole pipeline somehow? I guess on wheel repo that shouldn't trigger hundrets of jobs at least...

@charris
Copy link
Member

charris commented Mar 4, 2021

Some jobs are running, so maybe we just need to wait.

@charris
Copy link
Member

charris commented Mar 4, 2021

The US has had several days of degraded azure performance: https://status.dev.azure.com/_history. Seems to be a azure problem.

@stefanv
Copy link
Contributor Author

stefanv commented Mar 4, 2021

Thanks for helping with the loose threads @seberg @charris @rossbar

@charris
Copy link
Member

charris commented Mar 4, 2021

I'm going to suggest that if this is done for SciPy that it might be a good idea to disable running tests on PRs before making the switch, otherwise azure will probably spend a couple of days rerunning tests on all the outstanding PRs.

@charris
Copy link
Member

charris commented Mar 5, 2021

Or maybe set up a second pipeline and point it at "main". I'm not quite sure what we did to get all the retests.

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.

6 participants