From 351f2955bd8b768109dea8ae577c2d4c30725d94 Mon Sep 17 00:00:00 2001 From: Chris Macklin Date: Mon, 22 Apr 2024 20:34:56 -0700 Subject: [PATCH] Point enclone_ranger back to main. --- Cargo.lock | 56 +++++++++++++++++++++++++------------------------- Cargo.toml | 60 +++++++++++++++++++++++++++--------------------------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4fce7cce7..e4949f541 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -35,7 +35,7 @@ dependencies = [ [[package]] name = "align_tools" version = "0.1.12" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "bio_edit", "debruijn", @@ -47,7 +47,7 @@ dependencies = [ [[package]] name = "amino" version = "0.1.7" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "debruijn", "string_utils", @@ -56,7 +56,7 @@ dependencies = [ [[package]] name = "ansi_escape" version = "0.1.3" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "string_utils", "vector_utils", @@ -248,7 +248,7 @@ dependencies = [ [[package]] name = "bio_edit" version = "0.1.1" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "bio-types", "bit-set", @@ -624,7 +624,7 @@ dependencies = [ [[package]] name = "dna" version = "0.1.3" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" [[package]] name = "doc-comment" @@ -647,7 +647,7 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "enclone" version = "0.5.219" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "amino", "ansi_escape", @@ -672,7 +672,7 @@ dependencies = [ [[package]] name = "enclone_args" version = "0.5.219" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "debruijn", "enclone_core", @@ -708,7 +708,7 @@ dependencies = [ [[package]] name = "enclone_core" version = "0.5.219" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "amino", "ansi_escape", @@ -852,7 +852,7 @@ dependencies = [ [[package]] name = "enclone_process" version = "0.5.219" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "amino", "ansi_escape", @@ -884,7 +884,7 @@ dependencies = [ [[package]] name = "enclone_proto" version = "0.5.219" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "bio_edit", "byteorder", @@ -897,7 +897,7 @@ dependencies = [ [[package]] name = "enclone_ranger" version = "0.5.219" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "enclone", "enclone_args", @@ -913,7 +913,7 @@ dependencies = [ [[package]] name = "enclone_stuff" version = "0.5.219" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "amino", "debruijn", @@ -1026,7 +1026,7 @@ dependencies = [ [[package]] name = "enclone_vars" version = "0.5.219" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "io_utils", "itertools", @@ -1065,7 +1065,7 @@ dependencies = [ [[package]] name = "equiv" version = "0.1.3" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" [[package]] name = "errno" @@ -1107,7 +1107,7 @@ checksum = "1d4fd7bd9e32c1205549decf6f36772d7b606a579b26afaffa335ae148151a5d" [[package]] name = "exons" version = "0.1.5" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "io_utils", "string_utils", @@ -1117,7 +1117,7 @@ dependencies = [ [[package]] name = "expr_tools" version = "0.1.3" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "evalexpr", "statrs", @@ -1128,7 +1128,7 @@ dependencies = [ [[package]] name = "fasta_tools" version = "0.1.8" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "debruijn", "flate2", @@ -1292,7 +1292,7 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "graph_simple" version = "0.1.5" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "petgraph", "vector_utils", @@ -1399,7 +1399,7 @@ dependencies = [ [[package]] name = "hyperbase" version = "0.1.8" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "debruijn", "equiv", @@ -1433,7 +1433,7 @@ dependencies = [ [[package]] name = "io_utils" version = "0.3.2" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "bincode", "flate2", @@ -1499,7 +1499,7 @@ dependencies = [ [[package]] name = "kmer_lookup" version = "0.1.5" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "debruijn", "rayon", @@ -2552,12 +2552,12 @@ dependencies = [ [[package]] name = "stats_utils" version = "0.1.3" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" [[package]] name = "string_utils" version = "0.1.4" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "vector_utils", ] @@ -2621,7 +2621,7 @@ dependencies = [ [[package]] name = "tables" version = "0.1.5" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "io_utils", "itertools", @@ -2911,7 +2911,7 @@ dependencies = [ [[package]] name = "vdj_ann" version = "0.4.4" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "align_tools", "amino", @@ -2933,7 +2933,7 @@ dependencies = [ [[package]] name = "vdj_ann_ref" version = "0.2.1" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "debruijn", "exons", @@ -2949,7 +2949,7 @@ dependencies = [ [[package]] name = "vdj_types" version = "0.2.0" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "serde", ] @@ -2966,7 +2966,7 @@ dependencies = [ [[package]] name = "vector_utils" version = "0.1.5" -source = "git+https://github.com/10XGenomics/enclone_ranger?branch=macklin/extract-all-enclone-only-print-code#190578bfb873947f08ace7a0f5c741da68188e15" +source = "git+https://github.com/10XGenomics/enclone_ranger?branch=main#cbd15ef94236a91ada7227322303593166b63cde" dependencies = [ "permutation", "superslice", diff --git a/Cargo.toml b/Cargo.toml index f672060fa..da50b20a8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,19 +63,19 @@ split-debuginfo = "unpacked" # improved. [workspace.dependencies] -align_tools = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } -amino = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +align_tools = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } +amino = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } anyhow = "1" -ansi_escape = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +ansi_escape = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } arboard = "2" assert_cmd = "2" async-trait = "0.1" attohttpc = { version = "0.18", default-features = false, features = ["compress", "tls-rustls"] } backtrace = "0.3" base64 = "0.13" -binary_vec_io = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +binary_vec_io = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } bio = "0.39" -bio_edit = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +bio_edit = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } byteorder = "1" bytes = "1" chrono = { version = "0.4", default-features = false, features = ["std", "clock"] } @@ -86,41 +86,41 @@ core-graphics = "0.22" crc = "2" debruijn = "0.3" dirs = "4" -dna = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +dna = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } edit-distance = "2" -enclone_args = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } -enclone_core = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +enclone_args = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } +enclone_core = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } enclone_denovo = { path = "../enclone_denovo" } enclone_help = { path = "../enclone_help" } -enclone = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } -enclone_process = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } -enclone_proto = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } -enclone_ranger = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +enclone = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } +enclone_process = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } +enclone_proto = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } +enclone_ranger = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } enclone_server_proto = { path = "../enclone_server_proto" } -enclone_stuff = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +enclone_stuff = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } enclone_tail = { path = "../enclone_tail" } -enclone_vars = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +enclone_vars = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } enclone_version = { path = "../enclone_version" } -equiv = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +equiv = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } evalexpr = "7" -expr_tools = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } -fasta_tools = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +expr_tools = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } +fasta_tools = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } file-lock = "2" flate2 = "1" float-ord = "0.3" fontdb = "0.7" fs_extra = "1" git = "https://github.com/10xGenomics/hdf5-rust.git" -graph_simple = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +graph_simple = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } hdf5 = { git = "https://github.com/10XGenomics/hdf5-rust.git", branch = "conda_nov2021", features = ["conda"], default-features = false } home = "0.5" -hyperbase = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +hyperbase = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } image = { version = "0.23", features = ["jpeg", "png", "jpeg_rayon"], default-features = false } include_dir = { version = "0.6", features = ["search"] } -io_utils = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +io_utils = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } itertools = "0.10" jpeg-decoder = "0.2" -kmer_lookup = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +kmer_lookup = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } lazy_static = "1" libc = "0.2" log = "0.4" @@ -133,7 +133,7 @@ num-traits = "0.2" objc = "0.2" pager = "0.16" palette = "0.6" -perf_stats = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +perf_stats = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } permutation = "0.4" petgraph = "0.6" plotters = { version = "0.3", default_features = false, features = ["svg_backend", "point_series"] } @@ -153,12 +153,12 @@ serde = "1" serde_derive = "1" serde_json = "1" sha2 = "0.10" -stats_utils = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +stats_utils = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } statrs = "0.15" -stirling_numbers = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } -string_utils = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +stirling_numbers = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } +string_utils = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } superslice = "1" -tables = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +tables = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } tar = "0.4" thiserror = "1" tilde-expand = "0.1" @@ -170,9 +170,9 @@ tonic-build = { version = "0.6", default-features = false, features = ["transpor triple_accel = "0.4" users = "0.11" usvg = { version = "0.19", features = ["text"] } -vdj_types = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } -vdj_ann = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } -vdj_ann_ref = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } -vector_utils = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "macklin/extract-all-enclone-only-print-code" } +vdj_types = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } +vdj_ann = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } +vdj_ann_ref = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } +vector_utils = { git = "https://github.com/10XGenomics/enclone_ranger", branch = "main" } whoami = "1" yaml-rust = "0.4"