Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
mjirik committed Jun 18, 2020
2 parents b9c66bb + 8a42300 commit 0261a7b
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package:
name: scaffan
version: "0.24.1"
version: "0.24.2"

source:
# this is used for build from git hub
git_rev: 0.24.1
git_rev: 0.24.2
git_url: https://github.com/mjirik/scaffan.git

# this is used for pypi
Expand Down
2 changes: 1 addition & 1 deletion scaffan/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# import os, sys; sys.path.append(os.path.dirname(os.path.realpath(__file__)))
__version__ = "0.24.1"
__version__ = "0.24.2"
"""
Used for scaffold analysis
"""
2 changes: 1 addition & 1 deletion scaffan/annotation.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import math
from read_roi import read_roi_zip

__version__ = "0.24.1"
__version__ = "0.24.2"

# def get_one_annotation(viewstate):
# titles_list = viewstate.xpath(".//title/text()")
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.24.1
current_version = 0.24.2
files = setup.py conda-recipe/meta.yaml scaffan/__init__.py scaffan/annotation.py
commit = True
tag = True
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# Versions should comply with PEP440. For a discussion on single-sourcing
# the version across setup.py and the project code, see
# http://packaging.python.org/en/latest/tutorial.html#version
version="0.24.1",
version="0.24.2",
url="https://github.com//scaffan",
author="Miroslav Jirik",
author_email="miroslav.jirik@gmail.com",
Expand Down

0 comments on commit 0261a7b

Please sign in to comment.