Skip to content

Commit

Permalink
Mm 50 tag last version with kronecker method (#51)
Browse files Browse the repository at this point in the history
* MM-50: automate versioning

* MM-50: update version
  • Loading branch information
jdstamp authored Apr 1, 2022
1 parent 1c1a9fd commit 0027a0a
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 11 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,5 @@ config.status
# Rcpp
src/symbols.rds

# Version sed call
*.bu
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Type: Package
Package: mvMAPIT
Title: Implements the Multivariate MArginal ePIstasis Test (mvMAPIT) from
Crawford et al. 2017
Version: 1.0.0
Version: 1.0.1
Author: lcrawlab
Maintainer: Lorin Crawford <lorin_crawford@brown.edu>
Description: Epistasis, commonly defined as the interaction between
Expand Down
18 changes: 9 additions & 9 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.71 for mvMAPIT 1.0.0.
# Generated by GNU Autoconf 2.71 for mvMAPIT 1.0.1.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
Expand Down Expand Up @@ -607,8 +607,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='mvMAPIT'
PACKAGE_TARNAME='mvmapit'
PACKAGE_VERSION='1.0.0'
PACKAGE_STRING='mvMAPIT 1.0.0'
PACKAGE_VERSION='1.0.1'
PACKAGE_STRING='mvMAPIT 1.0.1'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''

Expand Down Expand Up @@ -1270,7 +1270,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures mvMAPIT 1.0.0 to adapt to many kinds of systems.
\`configure' configures mvMAPIT 1.0.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1332,7 +1332,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of mvMAPIT 1.0.0:";;
short | recursive ) echo "Configuration of mvMAPIT 1.0.1:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1415,7 +1415,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
mvMAPIT configure 1.0.0
mvMAPIT configure 1.0.1
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1648,7 +1648,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by mvMAPIT $as_me 1.0.0, which was
It was created by mvMAPIT $as_me 1.0.1, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
Expand Down Expand Up @@ -4718,7 +4718,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by mvMAPIT $as_me 1.0.0, which was
This file was extended by mvMAPIT $as_me 1.0.1, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -4773,7 +4773,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
mvMAPIT config.status 1.0.0
mvMAPIT config.status 1.0.1
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT([mvMAPIT],[1.0.0])
AC_INIT([mvMAPIT],[1.0.1])

# Find the compiler and compiler flags used by R.
: ${R_HOME=`R RHOME`}
Expand Down
20 changes: 20 additions & 0 deletions oscar-tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
import logging
import os
import shutil
import re
import fire
from subprocess import run
from sh import sed

logging.basicConfig(level=logging.DEBUG)
logger = logging.getLogger("mvmapit-oscar-tasks")
Expand All @@ -28,3 +31,20 @@ def task_rinstall(tmpdir):

logger.info(f"Install mvMAPIT.")
_cmd(f"R CMD INSTALL {tmpdir} --preclean")


def change_version(version):
files = {
"DESCRIPTION": f"s/(Version: )[0-9.]*/\\1{version}/",
"configure.ac": f"s/[0-9]+\.[0-9]+\.[0-9]+/{version}/",
}

logger.info(f"Version: {version}")
for key, sedcmd in files.items():
sed(["-i", ".bu", "-E", sedcmd, key])

_cmd("autoconf")


if __name__ == "__main__":
fire.Fire()

0 comments on commit 0027a0a

Please sign in to comment.