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.

Sign up for GitHub

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

Prerel301 #232

Merged
merged 4 commits into from
Aug 5, 2024
Merged

Prerel301 #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e678917
[misc] bump version
h-2 Aug 4, 2024
6ac098f
[misc] update citation and copyright
h-2 Aug 4, 2024
6b9ffa0
[doc] fix documentation for --input-alphabet
h-2 Aug 4, 2024
3f3bbfb
[ci] update macos runner to -13
h-2 Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci_macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ defaults:
jobs:
build:
name: ${{ matrix.name }}
runs-on: macos-11
runs-on: macos-13
timeout-minutes: 120
strategy:
fail-fast: false
matrix:
include:
- name: "gcc13"
cxx: "g++-13"
cc: "gcc-13"
- name: "gcc12"
cxx: "g++-12"
cc: "gcc-12"
build_type: Release

- name: "gcc11"
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

# change this after every release
set (SEQAN_APP_VERSION_MAJOR "3")
set (SEQAN_APP_VERSION_MINOR "0")
set (SEQAN_APP_VERSION_MINOR "1")
set (SEQAN_APP_VERSION_PATCH "0")

# don't change the following
Expand Down
2 changes: 1 addition & 1 deletion src/bisulfite_scoring.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2019, Sara Hetzel <hetzel @ molgen.mpg.de>
// Copyright (c) 2019-2024, Sara Hetzel <hetzel @ molgen.mpg.de>
// Copyright (c) 2016-2019, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down
2 changes: 1 addition & 1 deletion src/evaluate_bisulfite_alignment.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2019, Sara Hetzel and MPI für Molekulare Genetik
// Copyright (c) 2019-2024, Sara Hetzel and MPI für Molekulare Genetik
// All rights reserved.
//
// This file is part of Lambda.
Expand Down
2 changes: 1 addition & 1 deletion src/lambda.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2013-2020, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2013-2024, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2016-2020, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down
2 changes: 1 addition & 1 deletion src/mkindex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2013-2020, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2013-2024, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2016-2020, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down
2 changes: 1 addition & 1 deletion src/mkindex.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2013-2020, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2013-2024, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2016-2020, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down
2 changes: 1 addition & 1 deletion src/mkindex_algo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2013-2020, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2013-2024, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2016-2020, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down
2 changes: 1 addition & 1 deletion src/mkindex_misc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2013-2020, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2013-2024, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2016-2020, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down
2 changes: 1 addition & 1 deletion src/mkindex_options.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2013-2020, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2013-2024, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2016-2020, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down
4 changes: 2 additions & 2 deletions src/search.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2013-2020, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2013-2024, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2016-2020, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down Expand Up @@ -208,7 +208,7 @@ void argConv0(LambdaOptions & options)

// query file
if (options.qryOrigAlphabet ==
AlphabetEnum::DNA4) // means "auto", as dna4 not valid as argument to --query-alphabet
AlphabetEnum::DNA4) // means "auto", as dna4 not valid as argument to --input-alphabet
{
myPrint(options, 1, "Detecting query alphabet... ");
options.qryOrigAlphabet = detectSeqFileAlphabet(options.queryFile);
Expand Down
2 changes: 1 addition & 1 deletion src/search.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2013-2020, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2013-2024, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2016-2020, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down
2 changes: 1 addition & 1 deletion src/search_algo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2013-2019, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2013-2024, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2016-2019, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down
2 changes: 1 addition & 1 deletion src/search_datastructures.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2013-2020, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2013-2024, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2016-2020, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down
2 changes: 1 addition & 1 deletion src/search_misc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2013-2020, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2013-2024, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2016-2020, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down
2 changes: 1 addition & 1 deletion src/search_options.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2013-2020, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2013-2024, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2016-2020, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down
2 changes: 1 addition & 1 deletion src/search_output.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2013-2020, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2013-2024, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2016-2020, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down
2 changes: 1 addition & 1 deletion src/shared_definitions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2013-2020, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2013-2024, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2016-2020, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down
6 changes: 3 additions & 3 deletions src/shared_misc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2013-2020, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2013-2024, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2016-2020, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down Expand Up @@ -94,8 +94,8 @@ inline AlphabetEnum detectSeqFileAlphabet(std::string const & path)
else if (all_valid<bio::alphabet::dna15>(seq))
{
std::cerr << "\nWARNING: You query file was detected as non-standard DNA, but it could be AminoAcid, too.\n"
"To explicitly read as AminoAcid, add '--query-alphabet aminoacid'.\n"
"To ignore and disable this warning, add '--query-alphabet dna5'.\n";
"To explicitly read as AminoAcid, add '--input-alphabet aminoacid'.\n"
"To ignore and disable this warning, add '--input-alphabet dna5'.\n";
return AlphabetEnum::DNA5;
}
else if (all_valid<bio::alphabet::aa27>(seq))
Expand Down
8 changes: 4 additions & 4 deletions src/shared_options.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2013-2020, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2013-2024, Hannes Hauswedell <h2 @ fsfe.org>
// Copyright (c) 2016-2020, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down Expand Up @@ -96,12 +96,12 @@ inline void sharedSetup(sharg::parser & parser)
// Set short description, version, and date
parser.info.version = SEQAN_APP_VERSION;
parser.info.date = __DATE__;
parser.info.citation = "Hauswedell et al (2014); doi: 10.1093/bioinformatics/btu439";
parser.info.citation = "Hauswedell & Hetzal et al (2024); doi: 10.1093/bioinformatics/btae097";
parser.info.short_copyright =
"2013-2020 Hannes Hauswedell, released under the GNU AGPL v3 (or later); "
"2013-2024 Hannes Hauswedell & Sara Hetzel, released under the GNU AGPL v3 (or later); "
"2016-2020 Knut Reinert and Freie Universität Berlin, released under the 3-clause-BSDL";
parser.info.long_copyright =
" Copyright (c) 2013-2020, Hannes Hauswedell\n"
" Copyright (c) 2013-2024, Hannes Hauswedell & Sara Hetzel\n"
" All rights reserved.\n"
"\n"
" This program is free software: you can redistribute it and/or modify\n"
Expand Down
2 changes: 1 addition & 1 deletion src/view_dna_n_to_random.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2019, Sara Hetzel and MPI für Molekulare Genetik
// Copyright (c) 2019-2024, Sara Hetzel and MPI für Molekulare Genetik
// Copyright (c) 2016-2020, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down
2 changes: 1 addition & 1 deletion src/view_duplicate.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2019, Sara Hetzel and MPI für Molekulare Genetik
// Copyright (c) 2019-2024, Sara Hetzel and MPI für Molekulare Genetik
// Copyright (c) 2016-2020, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down
2 changes: 1 addition & 1 deletion src/view_reduce_to_bisulfite.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==========================================================================
// lambda
// ==========================================================================
// Copyright (c) 2019, Sara Hetzel and MPI für Molekulare Genetik
// Copyright (c) 2019-2024, Sara Hetzel and MPI für Molekulare Genetik
// Copyright (c) 2016-2020, Knut Reinert and Freie Universität Berlin
// All rights reserved.
//
Expand Down
Loading