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

upstream #2

Merged
merged 5,306 commits into from
May 27, 2020
Merged

upstream #2

merged 5,306 commits into from
May 27, 2020

Conversation

simonbray
Copy link
Owner

No description provided.

druvus and others added 30 commits May 7, 2020 12:21
* PacBio: constrain pbcommand to py3.7

* PacBio: constrain pbcore to py3.7
Merge PR #21986, commits were: 
 * Update pbcoretools to 0.8.1
Merge PR #21992, commits were: 
 * Update moabs to 1.3.9.0
Merge PR #21997, commits were: 
 * Update recipes/bio-ting/meta.yaml

Co-authored-by: Johannes Köster <[email protected]>
 * Update meta.yaml
 * Update meta.yaml
 * Update meta.yaml
 * Fix url
 * Update meta.yaml
 * Update meta.yaml
 * Create ting recipe
Merge PR #22002, commits were: 
 * Update snakemake to 5.17.0
Merge PR #22006, commits were: 
 * Update meta.yaml
 * Update meta.yaml
 * Update bioconda-utils to 0.16.15
Merge PR #22015, commits were: 
 * Update pygenometracks to 3.4
Merge PR #22018, commits were: 
 * Update hyphy to 2.5.14
Merge PR #21999, commits were: 
 * Update meta.yaml
 * Add the test_run.sh
 * Add a bash script for test
 * Merge branch 'master' of https://github.com/bioconda/bioconda-recipes
 * Adding docking_py
Merge PR #22017, commits were: 
 * Update chromosight to 1.1.0
Merge PR #22007, commits were: 
 * Update orthofinder to 2.3.12
Merge PR #22016, commits were: 
 * Update varda2-client to 0.8
Merge PR #22004, commits were: 
 * Update meta.yaml
 * Update socru to 2.2.4
Merge PR #22003, commits were: 
 * Update meta.yaml
 * Update meta.yaml
 * Create LICENSE
 * Update meta.yaml
 * Update clust to 1.10.10
Merge PR #22026, commits were: 
 * Update cromshell to 0.4.2
Merge PR #22021, commits were: 
 * update dependencies
 * specify pytools version
 * update pangolin to v1.1.11
Merge PR #22023, commits were: 
 * Update meta.yaml

go back to which Bandage instead of Bandage -h
 * Update meta.yaml
 * Update meta.yaml

add mesa-libgl-cos6-x86_64  because get error Bandage: error while loading shared libraries: libGL.so.1: cannot open shared object file: No such file or directory
 * increment build
 * updage test and fix recipe ( version Qt_5.12 not found (required by Bandage)
Merge PR #22014, commits were: 
 * Add CompareM 0.1.1
 * Add CompareM 0.1.1
Merge PR #22012, commits were: 
 * add simplesam to bioconda
 * modified meta.yaml for simplesam
 * adding simplesam to bioconda
Merge PR #22025, commits were: 
 * Update panaroo to 1.2.2
Merge PR #21989, commits were: 
 * Update changeo to 1.0.0
Merge PR #21984, commits were: 
 * Update presto to 0.6.0
Merge PR #22013, commits were: 
 * Updated dependencies of GenMap because of conflicts on osx
Merge PR #22028, commits were: 
 * Update bioconda-utils to 0.16.16
Merge PR #22031, commits were: 
 * Update bioconda-utils to 0.16.17
Co-authored-by: Matt H <[email protected]>
Merge PR #22029, commits were: 
 * reset build number
 * bump kraken2 2.0.8_beta -> 2.0.9_beta
Merge PR #22033, commits were: 
 * updated unfazed
 * merge conflict resolved
 * updated unfazed with new tests, linting, bugfixes
 * updated unfazed with new tests, linting, bugfixes
 * fixed syntax error in meta.yaml
 * added recipe for new phasing tool
 * Merge remote-tracking branch 'upstream/master'
 * another shasum fix
 * Merge remote-tracking branch 'upstream/master'
 * matplotlib->matplotlib-base
 * updated shasum
BiocondaBot and others added 21 commits May 23, 2020 06:56
Merge PR #22282, commits were: 
 * Update dsk to 2.3.3
Merge PR #22277, commits were: 
 * Update ncbi-vdb to 2.10.7
Merge PR #22275, commits were: 
 * Update 0.4.0 to not use pandas >= 1
Merge PR #22266, commits were: 
 * Update scprep to 1.0.5.post2
Merge PR #22274, commits were: 
 * Fix syntax error
 * Update version requirements
 * Update scirpy to 0.2
Merge PR #22295, commits were: 
 * update manually
 * new release to fix model name
 * update adpred release version to 1.2.5
 * update master
 * Merge branch 'master' of https://github.com/bioconda/bioconda-recipes
 * fetch release 1.2.5
 * update to adpred version 1.2.4
 * update from upstream
 * version fixed saturated mutagenesis WT values
 * miniconda.sh changed?
 * updated version
 * working adpred including command-line tool
 * initial recipie for adpred
 * initial yaml file for adpred
 * Merge branch 'master' of https://github.com/aerijman/bioconda-recipes
 * new version
Merge PR #22307, commits were: 
 * Update build number for 2019
 * Update GMAP version to 2020.04.08
Merge PR #22313, commits were: 
 * Add StringMeUp
Merge PR #22310, commits were: 
 * Update meta.yaml
 * Add galru
Merge PR #22298, commits were: 
 * Correct error in stark recipes
 * stark can't be build by clang
 * Add recipe for tools stark
Merge PR #22317, commits were: 
 * Removes version specification from bifrost
 * Adds >=1.0.3 version for bifrost package requirement
 * Removes bifrost requirement from build packages
 * Updates meta.yaml for unitig-caller v1.1.0
Merge PR #22318, commits were: 
 * increment build
 * update test
Merge PR #22326, commits were: 
 * moabs: skip osx
 * moabs: update to 1.3.9.2
* Update genomepy to 0.8.2

* Try a docker pull

* Update genomepy to 0.8.2

* fix python range

Co-authored-by: Devon Ryan <[email protected]>
Merge PR #22341, commits were: 
 * changing package name and adding description
 * updating package info
 * update version
 * updating libclangpath
 * updating install command
 * Added recipe for lorikeet
Merge PR #22301, commits were: 
 * Merge branch 'master' into bump/fred2
 * Update fred2 to 2.0.7
Merge PR #22303, commits were: 
 * Merge branch 'master' into pangolin_update
 * Update Pangolin to v 1.1.4
Merge PR #22304, commits were: 
 * Merge branch 'master' into bump/tiddit
 * Update tiddit to 2.12.0
Merge PR #22335, commits were: 
 * Update moabs to 1.3.9.3
Merge PR #22331, commits were: 
 * Update plastid to 0.5.1, added cython to run requirements
 * Update plastid to 0.5.1, removed from blacklist
 * Update plastid to 0.5.1
 * Update plastid to 0.4.9dev for testing build
@simonbray simonbray merged commit 62dbf89 into simonbray:add-im-pipelines May 27, 2020
simonbray added a commit that referenced this pull request Aug 10, 2020
Merge PR bioconda#22348, commits were: 
 * Update meta.yaml
 * Merge pull request #2 from bioconda/master

upstream
 * Create meta.yaml
simonbray pushed a commit that referenced this pull request Sep 4, 2020
Merge PR bioconda#23892, commits were: 
 * Update SHA
 * Update meta.yaml
 * Update damageprofiler.py
 * Merge pull request #2 from bioconda/master

Get latest bioconda version
 * Update meta.yaml
 * Update damageprofiler.py
 * Merge pull request #1 from bioconda/master

Syncing to get latest base changes
simonbray pushed a commit that referenced this pull request Sep 4, 2020
Merge PR bioconda#24062, commits were: 
 * Fix my own mistake
 * Update meta.yaml
 * Bump java versiona and add javafx lib

Tested locally. MALT's bundled JRE actually includes Java 14?
```
openjdk 14.0.2 2020-07-14
OpenJDK Runtime Environment AdoptOpenJDK (build 14.0.2+12)
OpenJDK 64-Bit Server VM AdoptOpenJDK (build 14.0.2+12, mixed mode)
```
 * Merge pull request bioconda#3 from bioconda/master

syncing
 * Update meta.yaml
 * Update build.sh
 * Update SHA
 * Update meta.yaml
 * Update damageprofiler.py
 * Merge pull request #2 from bioconda/master

Get latest bioconda version
 * Update meta.yaml
 * Update damageprofiler.py
 * Merge pull request #1 from bioconda/master

Syncing to get latest base changes
simonbray pushed a commit that referenced this pull request Jan 30, 2021
Merge PR bioconda#26284, commits were: 
 * Update meta.yaml
 * Bump version
 * Merge pull request #2 from bioconda/master

Get latest versions
 * Merge pull request #1 from bioconda/master

Get latest GATK recipe
simonbray pushed a commit that referenced this pull request Aug 31, 2021
Merge PR bioconda#29182, commits were: 
 * Update meta.yaml
 * md5 -> SHA256
 * Update meta.yaml
 * Merge branch 'bioconda:master' into master
 * Merge pull request #2 from bioconda/master

Get latest versions
 * Merge pull request #1 from bioconda/master

Get latest GATK recipe
simonbray pushed a commit that referenced this pull request Aug 31, 2021
Merge PR bioconda#29242, commits were: 
 * Add font requirements
 * Merge branch 'bioconda:master' into master
 * Merge branch 'bioconda:master' into master
 * Merge pull request #2 from bioconda/master

Get latest versions
 * Merge pull request #1 from bioconda/master

Get latest GATK recipe
simonbray pushed a commit that referenced this pull request Aug 31, 2021
Merge PR bioconda#29688, commits were: 
 * fixed sha256 #2
 * fixed sha256
 * update tasmanian
simonbray pushed a commit that referenced this pull request Aug 31, 2021
Merge PR bioconda#30247, commits were: 
 * Fix build
 * Update MALT to 0.53
 * Merge branch 'bioconda:master' into master
 * Merge branch 'bioconda:master' into master
 * Merge branch 'bioconda:master' into master
 * Merge pull request #2 from bioconda/master

Get latest versions
 * Merge pull request #1 from bioconda/master

Get latest GATK recipe
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.