Skip to content

Commit

Permalink
Updated HISTORY.md again for (same, but more complete) new release (#71)
Browse files Browse the repository at this point in the history
* Script that automatically copies new data to stoomboot

Script that automatically copies new data to stoomboot.

* move file

* small refactor

* Removed max_runs and raise error for invalid detector

Removed max_runs variable and raise error if invalid detector is used. Later I want to soft-code (is that a word?) the database collections. Furthermore I want to find a way in which we see the TypeError appearing in the webinterface.

* Implemented new for-loop

Implemented new for-loop to save poor DAQ machine and query through the database just once.

* Oops, saw some other tiny mistakes but fixed them

* Update auto_processing.py

* Update amstrax/auto_processing/copy_live.py

Co-authored-by: Joran Angevaare <[email protected]>

* Small change (check host location and run number format)

* Inplemented logger, move command and config file usage!
This will make our lives much much easier also for runs collection.
We probably don't need the consoleHandler. Next up:
implementing Joran's main loop.

* Tiny change

* Made separate functions for argsparser, configparser and logs. Also the infinite loop is working reasonably. The only problem is that every time it restarts, it seems to be running main() round_nr * 2 times?

* Final version (?) with working log function and iteration

* final tweaks (#52)

Everything works as it should with these fancy readability upgrades. Time to merge!

* For copy_live: update runsdb also with {"processing_status": "pending"} after succesfull copying

* Changed autoprocessing to one with config file
Small layout thing submit_stbc

* Small layout change for submit_stbc

* Update requirements.txt

* Create test_basics.py

* Update requirements.txt

* fix codefactor

* fix bandit file

* Revert "Changed autoprocessing to one with config file"

This reverts commit aeafdc5.

* Update submit_stbc.py

* remove notebooks

* Update HISTORY.md

* Update HISTORY.md

* Bump version: 1.0.2 → 1.1.0

* Bump version: 1.1.0 → 1.1.1

* Removed amstrax_notebooks reference from this folder

* Bump version: 1.1.1 → 1.1.2

* Update HISTORY.md for new release (again)

* Update __init__.py

Co-authored-by: Joran Angevaare <[email protected]>
Co-authored-by: Joran Angevaare <[email protected]>
Co-authored-by: xams-daq <[email protected]>
Co-authored-by: Serena Di Pede <[email protected]>
  • Loading branch information
5 people authored Jan 13, 2022
1 parent 5d93319 commit 8ebbaa9
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 4 deletions.
3 changes: 1 addition & 2 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[bumpversion]
current_version = 1.1.1
current_version = 1.1.2
files = setup.py amstrax/__init__.py
commit = True
tag = True

20 changes: 20 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,27 @@
1.1.2 / 2021-12-23
------------------
Previous release was a consequence of mflierm's clumsyness.

Since release v1.0.2, some things changed, of which the most important is the script that copies data to the stoomboot cluster.

- Made a file that automatically copies new data files to stoomboot (#51)

Other merged PRs are:

- Add small utility to amstrax for version printing (#48)
- Set default to something that is produced (#49)
- fix line endings (#53)
- Add readthedocs instructions (#67)
- A lot of bumped versions in requirements.txt (PR #58 t/m #66)
- Fix docs (#68)
- Update HISTORY.md with new release (#71)


1.0.3 / 2021-12-23
------------------
- Made a file that automatically copies new data files to stoomboot (#51)


1.0.2 / 2021-12-07
------------------
- Bugfix XAMS context (#46)
Expand Down
2 changes: 1 addition & 1 deletion amstrax/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '1.1.1'
__version__ = '1.1.2'

from . import hitfinder_thresholds
from . import plugins
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def open_requirements(path):
history = file.read()

setuptools.setup(name='amstrax',
version='1.1.1',
version='1.1.2',
description='strax for XAMS data',
author='Nikhef',
url='https://github.com/XAMS-nikhef/amstrax',
Expand Down

0 comments on commit 8ebbaa9

Please sign in to comment.