bugfix: version import

Merge branch 'dev'
Merge branch 'dev' of aou/data-maker into master
2023-07-27 10:36:55 -05:00 · 2023-07-25 14:42:50 -05:00 · 2022-11-21 21:04:47 +00:00 · 2020-01-10 11:21:26 -06:00 · 2020-01-09 11:27:20 -06:00 · 2020-01-07 10:34:14 -06:00
2 changed files with 2 additions and 2 deletions
--- a/data/maker/init.py
+++ b/data/maker/init.py
@ -22,7 +22,7 @@ import nujson as json
 from multiprocessing import Process, RLock
 from datetime import datetime, timedelta
 from multiprocessing import Queue
-from version import __version__
+from data.maker.version import __version__
 import time


--- a/data/maker/version.py
+++ b/data/maker/version.py
@ -1 +1 @@
-__version__='1.7.0'
+__version__='1.7.2'
Author	SHA1	Message	Date
Steve Nyemba	d8035a6705	bugfix: version import	2023-07-27 10:36:55 -05:00
Steve Nyemba	c865e59ff4	Merge branch 'dev'	2023-07-25 14:42:50 -05:00
Steve L. Nyemba	59d6cc50c0	Merge branch 'dev' of aou/data-maker into master	2022-11-21 21:04:47 +00:00
Steve Nyemba	76e84c3859	Merging the release into stable. Handling of GPU and epochs	2020-01-10 11:21:26 -06:00
steve	54abbeb42a	Merge branch 'dev' of aou/data-maker into master	2020-01-09 11:27:20 -06:00
steve	c3ce08ac90	Merge branch 'dev' of aou/data-maker into master	2020-01-07 10:34:14 -06:00