Re: [Bioc-devel] pre-receive hook declined

2021-06-30 Thread Michael Love
I'm getting a similar error, trying to push commits for a new package
submission. So this is my first attempt to push to Bioc git servers
for this package.

After following instructions from
https://bioconductor.org/developers/how-to/git/new-package-workflow/
...

spatialDmelxsim git:(main) > git push upstream main:master
Enumerating objects: 20, done.
Counting objects: 100% (20/20), done.
Delta compression using up to 8 threads
Compressing objects: 100% (10/10), done.
Writing objects: 100% (12/12), 1.60 KiB | 1.60 MiB/s, done.
Total 12 (delta 5), reused 0 (delta 0), pack-reused 0
remote: Traceback (most recent call last):
remote:   File "hooks/pre-receive.h00-pre-receive-hook-dataexp-workflow",
line 90, in 
remote: apply_hooks(hooks_dict)
remote:   File "hooks/pre-receive.h00-pre-receive-hook-dataexp-workflow",
line 72, in apply_hooks
remote: if hooks_dict["pre-receive-hook-merge-markers"]:  # enable hook
remote: KeyError: 'pre-receive-hook-merge-markers'
To git.bioconductor.org:packages/spatialDmelxsim
 ! [remote rejected] main -> master (pre-receive hook declined)
error: failed to push some refs to
'git.bioconductor.org:packages/spatialDmelxsim'

___
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel


Re: [Bioc-devel] pre-receive hook declined

2021-06-30 Thread Hui "Sheen" Yu
I also encountered a similar error when I tried pushing to MetaGSCA on
Bioconductor.org.

git push upstream master --force
# After some seemingly normal messages ###333
remote: FATAL: + refs/heads/master packages/MetaGSCA hui-sheen DENIED by
fallthru
remote: error: hook declined to update refs/heads/master
To g...@git.bioconductor.org:packages/MetaGSCA.git
! [remote rejected] master -> master (hook declined)
error: failed to push some refs to 'g...@git.bioconductor.org
:packages/MetaGSCA.git'

On Wed, Jun 30, 2021 at 11:54 AM Vincent Carey 
wrote:

> are you using wvictor14
>
> On Wed, Jun 30, 2021 at 1:41 PM Victor Yuan  wrote:
>
> > Hi I cannot seem to push to the remote g...@git.bioconductor.org:
> > packages/GSE159526
> >
> > I get a "pre-receive hook declined" error:
> >
> > 
> > $ git push upstream master
> > Enumerating objects: 21, done.
> > Counting objects: 100% (21/21), done.
> > Delta compression using up to 12 threads
> > Compressing objects: 100% (15/15), done.
> > Writing objects: 100% (15/15), 1.55 KiB | 1.55 MiB/s, done.
> > Total 15 (delta 9), reused 0 (delta 0), pack-reused 0
> > remote: Traceback (most recent call last):
> > remote:   File "hooks/pre-receive.h00-pre-receive-hook-dataexp-workflow",
> > line 89, in 
> > remote: apply_hooks(hooks_dict)
> > remote:   File "hooks/pre-receive.h00-pre-receive-hook-dataexp-workflow",
> > line 71, in apply_hooks
> > remote: if hooks_dict["pre-receive-hook-merge-markers"]:  # enable
> hook
> > remote: KeyError: 'pre-receive-hook-merge-markers'
> > To git.bioconductor.org:packages/GSE159526
> >  ! [remote rejected] master -> master (pre-receive hook declined)
> > error: failed to push some refs to 'git.bioconductor.org:
> > packages/GSE159526'
> > 
> >
> > I checked, and my ssh keys are configured correctly.
> >
> > https://github.com/Bioconductor/Contributions/issues/2170
> >
> > Any help appreciated!
> > Victor
> >
> > [[alternative HTML version deleted]]
> >
> > ___
> > Bioc-devel@r-project.org mailing list
> > https://stat.ethz.ch/mailman/listinfo/bioc-devel
> >
>
> --
> The information in this e-mail is intended only for th...{{dropped:10}}

___
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel


Re: [Bioc-devel] pre-receive hook declined

2021-06-30 Thread Victor Yuan
I still get the same error @Nitesh!

I also just tried switching my user email to my academic email (which is
what's listed in my package) but that had no effect.

On Wed, Jun 30, 2021 at 10:55 AM Nitesh Turaga 
wrote:

> Hi,
>
>
> Can you please try again??
>
>
> It seems a minor issue on our end, which I just fixed.
>
> Best,
>
> Nitesh
>
> Nitesh Turaga
> Scientist II, Department of Data Science,
> Bioconductor Core Team Member
> Dana Farber Cancer Institute
>
> > On Jun 30, 2021, at 1:41 PM, Victor Yuan  wrote:
> >
> > Hi I cannot seem to push to the remote g...@git.bioconductor.org:
> > packages/GSE159526
> >
> > I get a "pre-receive hook declined" error:
> >
> > 
> > $ git push upstream master
> > Enumerating objects: 21, done.
> > Counting objects: 100% (21/21), done.
> > Delta compression using up to 12 threads
> > Compressing objects: 100% (15/15), done.
> > Writing objects: 100% (15/15), 1.55 KiB | 1.55 MiB/s, done.
> > Total 15 (delta 9), reused 0 (delta 0), pack-reused 0
> > remote: Traceback (most recent call last):
> > remote:   File "hooks/pre-receive.h00-pre-receive-hook-dataexp-workflow",
> > line 89, in 
> > remote: apply_hooks(hooks_dict)
> > remote:   File "hooks/pre-receive.h00-pre-receive-hook-dataexp-workflow",
> > line 71, in apply_hooks
> > remote: if hooks_dict["pre-receive-hook-merge-markers"]:  # enable
> hook
> > remote: KeyError: 'pre-receive-hook-merge-markers'
> > To git.bioconductor.org:packages/GSE159526
> > ! [remote rejected] master -> master (pre-receive hook declined)
> > error: failed to push some refs to 'git.bioconductor.org:
> packages/GSE159526'
> > 
> >
> > I checked, and my ssh keys are configured correctly.
> >
> > https://github.com/Bioconductor/Contributions/issues/2170
> >
> > Any help appreciated!
> > Victor
> >
> >   [[alternative HTML version deleted]]
> >
> > ___
> > Bioc-devel@r-project.org mailing list
> > https://stat.ethz.ch/mailman/listinfo/bioc-devel
>
>

[[alternative HTML version deleted]]

___
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel


Re: [Bioc-devel] pre-receive hook declined

2021-06-30 Thread Nitesh Turaga
Hi,


Can you please try again??


It seems a minor issue on our end, which I just fixed.

Best,

Nitesh 

Nitesh Turaga
Scientist II, Department of Data Science,
Bioconductor Core Team Member
Dana Farber Cancer Institute

> On Jun 30, 2021, at 1:41 PM, Victor Yuan  wrote:
> 
> Hi I cannot seem to push to the remote g...@git.bioconductor.org:
> packages/GSE159526
> 
> I get a "pre-receive hook declined" error:
> 
> 
> $ git push upstream master
> Enumerating objects: 21, done.
> Counting objects: 100% (21/21), done.
> Delta compression using up to 12 threads
> Compressing objects: 100% (15/15), done.
> Writing objects: 100% (15/15), 1.55 KiB | 1.55 MiB/s, done.
> Total 15 (delta 9), reused 0 (delta 0), pack-reused 0
> remote: Traceback (most recent call last):
> remote:   File "hooks/pre-receive.h00-pre-receive-hook-dataexp-workflow",
> line 89, in 
> remote: apply_hooks(hooks_dict)
> remote:   File "hooks/pre-receive.h00-pre-receive-hook-dataexp-workflow",
> line 71, in apply_hooks
> remote: if hooks_dict["pre-receive-hook-merge-markers"]:  # enable hook
> remote: KeyError: 'pre-receive-hook-merge-markers'
> To git.bioconductor.org:packages/GSE159526
> ! [remote rejected] master -> master (pre-receive hook declined)
> error: failed to push some refs to 'git.bioconductor.org:packages/GSE159526'
> 
> 
> I checked, and my ssh keys are configured correctly.
> 
> https://github.com/Bioconductor/Contributions/issues/2170
> 
> Any help appreciated!
> Victor
> 
>   [[alternative HTML version deleted]]
> 
> ___
> Bioc-devel@r-project.org mailing list
> https://stat.ethz.ch/mailman/listinfo/bioc-devel

___
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel


Re: [Bioc-devel] pre-receive hook declined

2021-06-30 Thread Vincent Carey
are you using wvictor14

On Wed, Jun 30, 2021 at 1:41 PM Victor Yuan  wrote:

> Hi I cannot seem to push to the remote g...@git.bioconductor.org:
> packages/GSE159526
>
> I get a "pre-receive hook declined" error:
>
> 
> $ git push upstream master
> Enumerating objects: 21, done.
> Counting objects: 100% (21/21), done.
> Delta compression using up to 12 threads
> Compressing objects: 100% (15/15), done.
> Writing objects: 100% (15/15), 1.55 KiB | 1.55 MiB/s, done.
> Total 15 (delta 9), reused 0 (delta 0), pack-reused 0
> remote: Traceback (most recent call last):
> remote:   File "hooks/pre-receive.h00-pre-receive-hook-dataexp-workflow",
> line 89, in 
> remote: apply_hooks(hooks_dict)
> remote:   File "hooks/pre-receive.h00-pre-receive-hook-dataexp-workflow",
> line 71, in apply_hooks
> remote: if hooks_dict["pre-receive-hook-merge-markers"]:  # enable hook
> remote: KeyError: 'pre-receive-hook-merge-markers'
> To git.bioconductor.org:packages/GSE159526
>  ! [remote rejected] master -> master (pre-receive hook declined)
> error: failed to push some refs to 'git.bioconductor.org:
> packages/GSE159526'
> 
>
> I checked, and my ssh keys are configured correctly.
>
> https://github.com/Bioconductor/Contributions/issues/2170
>
> Any help appreciated!
> Victor
>
> [[alternative HTML version deleted]]
>
> ___
> Bioc-devel@r-project.org mailing list
> https://stat.ethz.ch/mailman/listinfo/bioc-devel
>

-- 
The information in this e-mail is intended only for the ...{{dropped:18}}

___
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel


[Bioc-devel] pre-receive hook declined

2021-06-30 Thread Victor Yuan
Hi I cannot seem to push to the remote g...@git.bioconductor.org:
packages/GSE159526

I get a "pre-receive hook declined" error:


$ git push upstream master
Enumerating objects: 21, done.
Counting objects: 100% (21/21), done.
Delta compression using up to 12 threads
Compressing objects: 100% (15/15), done.
Writing objects: 100% (15/15), 1.55 KiB | 1.55 MiB/s, done.
Total 15 (delta 9), reused 0 (delta 0), pack-reused 0
remote: Traceback (most recent call last):
remote:   File "hooks/pre-receive.h00-pre-receive-hook-dataexp-workflow",
line 89, in 
remote: apply_hooks(hooks_dict)
remote:   File "hooks/pre-receive.h00-pre-receive-hook-dataexp-workflow",
line 71, in apply_hooks
remote: if hooks_dict["pre-receive-hook-merge-markers"]:  # enable hook
remote: KeyError: 'pre-receive-hook-merge-markers'
To git.bioconductor.org:packages/GSE159526
 ! [remote rejected] master -> master (pre-receive hook declined)
error: failed to push some refs to 'git.bioconductor.org:packages/GSE159526'


I checked, and my ssh keys are configured correctly.

https://github.com/Bioconductor/Contributions/issues/2170

Any help appreciated!
Victor

[[alternative HTML version deleted]]

___
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel


[Bioc-devel] Reg: Git hook update on Experiment Data and workflow packages

2021-06-30 Thread Nitesh Turaga
Hello Maintainers,

We have recently come across some experiment data packages that had merge 
conflicts in them. 

As a precaution,  the git hook to prevent these merge conflicts has been 
enabled. This will keep merge conflict markers from entering the git 
repositories we maintain. 

Maintainers should be aware and make sure there are no merge conflict markers 
before making a commit to the git repositories. 

Some links about resolving merge conflicts: 

1. 
https://docs.github.com/en/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line

2. https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts

3. Bioconductor git hooks: https://github.com/Bioconductor/git-hooks

If you have any questions, please reply to this thread. 

Best regards,

Nitesh 


Nitesh Turaga
Scientist II, Department of Data Science,
Bioconductor Core Team Member
Dana Farber Cancer Institute

___
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel