Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to a new verion to get --contig argument. #31228

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update to a new verion to get --contig argument. #31228

wants to merge 3 commits into from

Conversation

mictadlo
Copy link
Contributor

Added a new version to get --contig argument.

@mictadlo
Copy link
Contributor Author

Hi,
Why did it fail?

Thank you in advance,

Michal

@dpryan79
Copy link
Contributor

@bioconda-bot please update

@BiocondaBot
Copy link
Collaborator

I encountered an error updating your PR branch. You can report this to bioconda/core if you'd like.
-The Bot

@dpryan79
Copy link
Contributor

@mictadlo Your fork is missing changes to the CI configuration it seems

@BiocondaBot
Copy link
Collaborator

Artifacts built on CircleCI are ready for inspection:

Package(s)
Arch Package Repodata
linux-64 haslr-20200422-py38h69e0bdc_0.tar.bz2 repodata.json
linux-64 haslr-20200422-py39h39abbe0_0.tar.bz2 repodata.json
linux-64 haslr-20200422-py36hb377018_0.tar.bz2 repodata.json
linux-64 haslr-20200422-py37hccf3b7b_0.tar.bz2 repodata.json

You may also use conda to install these:

  • For packages on linux-64:
conda install -c https://173449-42372094-gh.circle-artifacts.com/0/tmp/artifacts/packages <package name>

Container image(s)
Package Tag Install with docker
haslr 20200422--py37hccf3b7b_0
showcurl -L "https://173449-42372094-gh.circle-artifacts.com/0/tmp/artifacts/images/haslr%3A20200422--py37hccf3b7b_0.tar.gz" | gzip -dc | docker load
haslr 20200422--py36hb377018_0
showcurl -L "https://173449-42372094-gh.circle-artifacts.com/0/tmp/artifacts/images/haslr%3A20200422--py36hb377018_0.tar.gz" | gzip -dc | docker load
haslr 20200422--py39h39abbe0_0
showcurl -L "https://173449-42372094-gh.circle-artifacts.com/0/tmp/artifacts/images/haslr%3A20200422--py39h39abbe0_0.tar.gz" | gzip -dc | docker load
haslr 20200422--py38h69e0bdc_0
showcurl -L "https://173449-42372094-gh.circle-artifacts.com/0/tmp/artifacts/images/haslr%3A20200422--py38h69e0bdc_0.tar.gz" | gzip -dc | docker load

@mictadlo
Copy link
Contributor Author

How is it possible to merge it?

@@ -1,16 +1,16 @@
{% set version = "0.8a1" %}
{% set sha256 = "0d55a943a828cd1a42701774b52ef9c2ba1d944a7fc3415d64856ad88c135ee8" %}
{% set version = "20200422" %}
Copy link
Member

Choose a reason for hiding this comment

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

this version number is not good, Please use the older one, plus a suffix.


package:
name: haslr
version: {{ version }}

source:
url: https://github.com/vpc-ccg/haslr/archive/v{{ version }}.tar.gz
url: https://github.com/vpc-ccg/haslr/archive/0123746af93a9b0d79eee969510d12a88a9d6af3.tar.gz
Copy link
Member

Choose a reason for hiding this comment

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

can you please request a new release

@mictadlo
Copy link
Contributor Author

mictadlo commented Nov 2, 2021

$ git push
Username for 'https://github.com': mictadlo
Password for 'https://mictadlo@github.com':
To https://github.com/mictadlo/bioconda-recipes.git
! [rejected] haslr -> haslr (fetch first)
error: failed to push some refs to 'https://github.com/mictadlo/bioconda-recipes.git'

How can I fix it?

@mictadlo
Copy link
Contributor Author

mictadlo commented Nov 4, 2021

(base) debian@appdev:/mnt/OneTB/bioconda-recipes/recipes$ git pull origin haslr
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint: 
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint: 
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.

remote: Enumerating objects: 43797, done.
remote: Counting objects: 100% (17736/17736), done.
remote: Total 43797 (delta 17736), reused 17736 (delta 17736), pack-reused 26061
Receiving objects: 100% (43797/43797), 26.45 MiB | 2.82 MiB/s, done.
Resolving deltas: 100% (24560/24560), completed with 4304 local objects.
From https://github.com/mictadlo/bioconda-recipes
 * branch                  haslr      -> FETCH_HEAD
   f22289231e..3e57603975  haslr      -> origin/haslr
Updating 082708d33a..3e57603975
Fast-forward
...

(base) debian@appdev:/mnt/OneTB/bioconda-recipes/recipes$ git add haslr
(base) debian@appdev:/mnt/OneTB/bioconda-recipes/recipes$ git commit
[master 2fd5a93e73] Update version number
 Committer: Debian <debian@appdev.novalocal>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly. Run the
following command and follow the instructions in your editor to edit
your configuration file:

    git config --global --edit

After doing this, you may fix the identity used for this commit with:

    git commit --amend --reset-author

 1 file changed, 2 insertions(+), 2 deletions(-)
(base) debian@appdev:/mnt/OneTB/bioconda-recipes/recipes$ 
(base) debian@appdev:/mnt/OneTB/bioconda-recipes/recipes$ 
(base) debian@appdev:/mnt/OneTB/bioconda-recipes/recipes$ 
(base) debian@appdev:/mnt/OneTB/bioconda-recipes/recipes$ 
(base) debian@appdev:/mnt/OneTB/bioconda-recipes/recipes$ 
(base) debian@appdev:/mnt/OneTB/bioconda-recipes/recipes$ git push
Username for 'https://github.com': mictadlo
Password for 'https://mictadlo@github.com': 
Enumerating objects: 9, done.
Counting objects: 100% (9/9), done.
Delta compression using up to 32 threads
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 483 bytes | 483.00 KiB/s, done.
Total 5 (delta 3), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (3/3), completed with 3 local objects.
To https://github.com/mictadlo/bioconda-recipes.git
   082708d33a..2fd5a93e73  master -> master
(base) debian@appdev:/mnt/OneTB/bioconda-recipes/recipes$ git push origin master
Username for 'https://github.com': mictadlo
Password for 'https://mictadlo@github.com': 
Everything up-to-date

Why my new changes do show here?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants