Skip to content

Commit

Permalink
version bump to prepare for next release
Browse files Browse the repository at this point in the history
  • Loading branch information
Rob Patro committed Jun 13, 2021
1 parent c37855c commit e8c47c5
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion current_version.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
VERSION_MAJOR 1
VERSION_MINOR 5
VERSION_PATCH 0
VERSION_PATCH 1
2 changes: 1 addition & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
# The short X.Y version.
version = '1.5'
# The full version, including alpha/beta/rc tags.
release = '1.5.0'
release = '1.5.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ MAINTAINER salmon.maintainer@gmail.com

ENV PACKAGES git gcc make g++ libboost-all-dev liblzma-dev libbz2-dev \
ca-certificates zlib1g-dev libcurl4-openssl-dev curl unzip autoconf apt-transport-https ca-certificates gnupg software-properties-common wget
ENV SALMON_VERSION 1.5.0
ENV SALMON_VERSION 1.5.1

# salmon binary will be installed in /home/salmon/bin/salmon

Expand Down
2 changes: 1 addition & 1 deletion docker/build_test.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#! /bin/bash
SALMON_VERSION=1.5.0
SALMON_VERSION=1.5.1
docker build --no-cache -t combinelab/salmon:${SALMON_VERSION} -t combinelab/salmon:latest .
4 changes: 2 additions & 2 deletions include/SalmonConfig.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
namespace salmon {
constexpr char majorVersion[] = "1";
constexpr char minorVersion[] = "5";
constexpr char patchVersion[] = "0";
constexpr char version[] = "1.5.0";
constexpr char patchVersion[] = "1";
constexpr char version[] = "1.5.1";
constexpr uint32_t indexVersion = 5;
constexpr char requiredQuasiIndexVersion[] = "p7";
} // namespace salmon
Expand Down
2 changes: 1 addition & 1 deletion include/SingleCellProtocols.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ namespace alevin{
// NOTE: these functions are duplicated
// with those in `CustomGeometry` below, and
// due to semantics have slightly different
// implementations. See if the design can be
// implementations. See if the design can be
// unified later.
void set_umi_geo(TagGeometry& g) { umiLength = g.length(); };
void set_bc_geo(TagGeometry& g) { barcodeLength = g.length(); };
Expand Down

0 comments on commit e8c47c5

Please sign in to comment.