Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/mikgroup/sigpy
Browse files Browse the repository at this point in the history
  • Loading branch information
frankong committed Sep 22, 2020
2 parents cd27418 + fe386f9 commit a125b77
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "sigpy" %}
{% set version = "0.1.20" %}
{% set version = "0.1.21" %}

package:
name: '{{ name|lower }}'
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# The short X.Y version
version = ''
# The full version, including alpha/beta/rc tags
release = '0.1.20'
release = '0.1.21'


# -- General configuration ---------------------------------------------------
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.1.20
current_version = 0.1.21
commit = True
tag = True

Expand Down
2 changes: 1 addition & 1 deletion sigpy/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.1.20"
__version__ = "0.1.21"
2 changes: 1 addition & 1 deletion tests/test_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
class TestVersion(unittest.TestCase):

def test_version(self):
assert version.__version__ == '0.1.20'
assert version.__version__ == '0.1.21'

0 comments on commit a125b77

Please sign in to comment.