Skip to content

Commit

Permalink
Merge pull request #5 from AxFoundation/master
Browse files Browse the repository at this point in the history
update fork
  • Loading branch information
JoranAngevaare authored Jul 16, 2019
2 parents dee08e3 + 61e07aa commit c5f6608
Show file tree
Hide file tree
Showing 10 changed files with 561 additions and 396 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.7.3
current_version = 0.7.5
files = setup.py strax/__init__.py docs/source/conf.py
commit = True
tag = True
Expand Down
10 changes: 10 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
0.7.5 / 2019-07-06
------------------
- Time selection refactor and context extensibility (#195)

0.7.4 / 2019-06-26
-------------------
- Fix availability checks (#194)
- Allow selection of runs by name (#192)
- Fix some context methods for multi-output plugins

0.7.3 / 2019-06-17
-------------------
- Multiple outputs per plugin (#190)
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
# built documents.
#
# The short X.Y version.
version = '0.7.3'
version = '0.7.5'
# The full version, including alpha/beta/rc tags.
release = '0.7.3'
release = '0.7.5'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
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 @@
history = file.read()

setuptools.setup(name='strax',
version='0.7.3',
version='0.7.5',
description='Streaming analysis for xenon TPCs',
author='Jelle Aalbers',
url='https://github.com/AxFoundation/strax',
Expand Down
6 changes: 5 additions & 1 deletion strax/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# flake8: noqa
__version__ = '0.7.3'
__version__ = '0.7.5'

# Glue the package together
# See https://www.youtube.com/watch?v=0oTh1CXRaQ0 if this confuses you
Expand All @@ -21,6 +21,10 @@
from .processor import *
from .context import *

# Just run this file, it will add new methods to Context
from . import run_selection
del run_selection

from .io import *

from strax.processing.data_reduction import *
Expand Down
Loading

0 comments on commit c5f6608

Please sign in to comment.