Merge branch 'b297' into 'master'

New Version of Bline: 2019.297

See merge request passoft/bline!6

HISTORY.rst

@@ -2,88 +2,51 @@
 History
 =======
 
-2016.288 (2016-10-14)
-------------------
-* New. No changes.
-
-2016.355 (2016-12-20)
-------------------
-* Just changed some help descriptions a little.
-* Added the -H "more" help.
-
-2017.006 (2017-01-06)
-------------------
-* New -V command for examining offloaded files a bit more.
-* Added a bit more to the -H help.
-
-2017.012 (2017-01-12)
-------------------
-* Added a summary to the -V command output.
-
-2017.020 (2017-01-20)
-------------------
-* Added baler time range (all of the files) to the -V summary.
-* A couple little corrections to the help.
-
-2017.024 (2017-01-24)
-------------------
-* Added some more -H command help.
-* Made some of the status messages a little more wordy.
-* Commands like  -F "DT0001*" "DT0002*"  did not work. Having multiple search
-  patterns would fail. "DT0002*" by itself, for example, would have worked.
-  Now it all works.
-
-2017.026 (2017-01-26)
-------------------
-* Rewrote all of the command line handling stuff. There could be bugs
-  all over the place.
-* Added the  -m "A message"  command.
-* Added the  -e [<files>]  command for excluding files, but then only
-  offloading low sample rate files (like -o). -E offloads all files
-  (like -O).
-
-2017.038 (2017-02-07)
-------------------
-* Prints out the current version when using the -U command.
-* Put in note about using "bline.py" or "bline" in the helps.
-
-2017.039 (2017-02-08)
-------------------
-* Fixed a bug in the -v command that showed up when files were missing
-  or not everything had been offloaded.
-* Took the note back out about bline/bline.py. It will always be
-  bline.py.
-
-2017.055 (2017-02-24)
-------------------
-* Changed the way the record size of a file is determined. It should
-  always be 4096 bytes for baler files, but you never know.
-* Fixed it so you have to at least supply the TagID when using the
-  -m command.
-
-2017.152 (2017-06-01)
-------------------
-* Does a simple check to see if the TagID and IPAddr are reversed.
-* Does a simple check when offloading to see if previously offloaded
-  data files will be overwritten. It may report false alarms depending
-  on the command.
-* Fixed a small bug in the -F command.
-
-2017.163 (2017-06-12)
-------------------
-* Lists the command line being executed so it gets into the log.
-
-2018.071 (2018-03-12)
-------------------
-* Small bug in the 'check for updates' section.
-
-2018.135 (2018-06-07)
-------------------
-* First release on new build system.
-
 2019.064 (2019-03-05)
-------------------
+---------------------
 * Converted for Python 2 or 3.
 * Added -vl command that lists the files that have not been fully
   offloaded from the baler. -v just shows how many there are.
 * Does not yet contain BaleAddr replacement code.
+
+2019.259 (2019-09-16)
+---------------------
+* New version (really BLINE2) that assigns the IP address to the baler,
+  and erases data and Q330 association from the baler, thus removing
+  the need for BaleAddr.
+* The TagID of the baler to communicate with is still required on the
+  command line, but the IP address of the baler is no longer required for
+  every command on the command line.
+* The Ethernet device name may be required when assigning the IP address
+  to the baler (-b command) if BLINE says so (generally Python 2).
+* These non-regular Python modules may need to be installed to get all
+  of the new commands (-b, -X, -s) to work:
+     psutil - all OSs and Python versions
+     pexpect - Linux
+     subprocess32 - all OSs when using Python 2
+  Python 3 is recommended, since support for 2 is going away soon.
+  pip/pip3 may be used to install the required modules.
+
+2019.269 (2019-09-26)
+---------------------
+* Caught a different program having trouble checking for updates. Put
+  in some code as a possible fix.
+* Collected the imports for all of the extra required modules into one
+  place so all of the warnings come out at the same time. Use
+     bline.py 5555 -b
+  to get a list of the warnings. 5555 may be any number for this test.
+* Fixed up the long version of the Help a bit.
+
+2019.289 (2019-10-16)
+---------------------
+* Added the -A command that will combine all of the offloaded files
+  into a .ALL file.
+* Added the -G command that will combine all of the files for a
+  channel into one file. The file names are close to the miniseed
+  file names produced by sdrsplit.
+* Changed the command line switch for a couple commands.
+
+2019.297 (2019-10-24)
+---------------------
+* Enhanced the -G command and added the -GD command for concatenating
+  the offloaded channel files.

bline/__init__.py

@@ -4,4 +4,4 @@
 
 __author__ = """IRIS PASSCAL"""
 __email__ = 'software-support@passcal.nmt.edu'
-__version__ = '2018.135'
+__version__ = '2019.289'

conda.recipe/meta.yaml

 package:
   name: bline
-  version: 2018.135
+  version: 2019.297
 
 source:
   path: ..

setup.cfg

 [bumpversion]
-current_version = 2019.064
+current_version = 2019.297
 commit = True
 tag = True
 

setup.py

@@ -11,7 +11,6 @@ with open('README.rst') as readme_file:
 with open('HISTORY.rst') as history_file:
     history = history_file.read()
 
-
 setup(
     author="IRIS PASSCAL",
     author_email='software-support@passcal.nmt.edu',
@@ -28,7 +27,10 @@ setup(
             'bline=bline.bline:main',
         ],
     },
-    install_requires=[],
+    install_requires=['psutil',
+                      'ipaddress',
+                      'pexpect',
+                      'subprocess32'],
     setup_requires = [],
     extras_require={
         'dev': [
@@ -51,6 +53,6 @@ setup(
     packages=find_packages(include=['bline']),
     test_suite='tests',
     url='https://git.passcal.nmt.edu/passoft/bline',
-    version='2019.064',
+    version='2019.297',
     zip_safe=False,
 )