Last 0.1.9b3 commit

Author: rweigel

CHANGES.txt

@@ -74,4 +74,6 @@ v0.1.9b1:
 	2020-01-20 -- d3625e3 Fix for wrong error message (#24)
 v0.1.9b2:
 	2020-05-25 -- 23b659c Simplify dtype/length code
+v0.1.9b3:
+	2020-05-25 -- 
 

Makefile

@@ -48,7 +48,7 @@ PYTHONVERS=python3.8 python3.7 python3.6 python3.5 python2.7
 
 # VERSION is updated in "make version-update" step and derived
 # from CHANGES.txt. Do not edit.
-VERSION=0.1.9b2
+VERSION=0.1.9b3
 SHELL:= /bin/bash
 
 LONG_TESTS=false
@@ -128,6 +128,22 @@ $(CONDA)/envs/$(PYTHON): ./anaconda3
 	curl https://repo.anaconda.com/miniconda/$(CONDA_PKG) > /tmp/$(CONDA_PKG)
 ################################################################################
 
+################################################################################
+venv-test:
+	cp hapi_demo.py /tmp # TODO: Explain why needed.
+	cp hapi_demo.py /tmp
+	source env-$(PYTHON)/bin/activate && \
+		pip install pytest deepdiff ipython && \
+		pip uninstall -y hapiplot && \
+		pip install --pre hapiplot && \
+		pip uninstall -y hapiclient && \
+		pip install --pre '$(PACKAGE)' \
+			--index-url $(URL)/simple  \
+			--extra-index-url https://pypi.org/simple && \
+		env-$(PYTHON)/bin/pytest -v -m 'short' hapiclient/test/test_hapi.py
+		env-$(PYTHON)/bin/ipython /tmp/hapi_demo.py
+################################################################################
+
 ################################################################################
 # Packaging
 package:
@@ -148,15 +164,7 @@ env-$(PYTHON):
 package-test:
 	make package
 	make env-$(PYTHON)
-	cp hapi_demo.py /tmp
-	source env-$(PYTHON)/bin/activate && \
-		pip install pytest && \
-		pip install deepdiff && \
-		pip uninstall -y hapiclient && \
-		pip install dist/hapiclient-$(VERSION).tar.gz \
-			--index-url $(URL)/simple  \
-			--extra-index-url https://pypi.org/simple && \
-		env-$(PYTHON)/bin/pytest -v -m 'short' hapiclient/test/test_hapi.py
+	make venv-test PACKAGE='dist/hapiclient-$(VERSION).tar.gz'
 ################################################################################
 
 ################################################################################
@@ -181,15 +189,7 @@ release-test-all:
 release-test:
 	rm -rf env
 	source activate $(PYTHON); pip install virtualenv; $(PYTHON) -m virtualenv env
-	cp hapi_demo.py /tmp
-	source env/bin/activate && \
-		pip install pytest && \
-		pip install deepdiff && \
-		pip install 'hapiclient==$(VERSION)' \
-			--index-url $(URL)/simple  \
-			--extra-index-url https://pypi.org/simple && \
-		env/bin/pytest -v hapiclient/test/test_hapi.py && \
-		env/bin/python /tmp/hapi_demo.py
+	make venv-test PACKAGE='dist/hapiclient-$(VERSION).tar.gz'
 ################################################################################
 
 ################################################################################

hapiclient/__init__.py

@@ -7,4 +7,4 @@
 # Allow "from hapiclient import HAPIError"
 from hapiclient.util import HAPIError
 
-__version__ = '0.1.9b2'
+__version__ = '0.1.9b3'

hapiclient/hapi.py

@@ -144,7 +144,7 @@ def hapiopts():
 def hapi(*args, **kwargs):
     """Request data from a HAPI server.
 
-    Version: 0.1.9b2
+    Version: 0.1.9b3
 
 
     Examples

hapiclient/test/readcompare.log

@@ -3,58 +3,58 @@ Parameter(s) = scalar; run = short. cache = False; usecache = False
 ___________________________________________________________
 Method                total      d/l->buff  parse buff
 ___________________________________________________________
-csv; numpy; no len.    0.2200     0.1984     0.0003
-csv; pandas; no len.   0.2166     0.1931     0.0021
-csv; numpy             0.2104     0.1892     0.0002
-csv; pandas            0.2242     0.2013     0.0015
-binary                 0.2038     0.1591     0.0000
+csv; numpy; no len.    0.2053     0.1830     0.0003
+csv; pandas; no len.   0.2085     0.1850     0.0021
+csv; numpy             0.2111     0.1868     0.0003
+csv; pandas            0.2204     0.1948     0.0016
+binary                 0.2093     0.1659     0.0000
 
 Parameter(s) = scalar,vector; run = short. cache = False; usecache = False
 ___________________________________________________________
 Method                total      d/l->buff  parse buff
 ___________________________________________________________
-csv; numpy; no len.    0.2176     0.1952     0.0004
-csv; pandas; no len.   0.4133     0.3865     0.0027
-csv; numpy             0.2166     0.1921     0.0002
-csv; pandas            0.2177     0.1949     0.0017
-binary                 0.1857     0.1499     0.0000
+csv; numpy; no len.    0.2238     0.2003     0.0007
+csv; pandas; no len.   0.2318     0.2049     0.0017
+csv; numpy             0.2149     0.1926     0.0002
+csv; pandas            0.2284     0.2018     0.0020
+binary                 0.2165     0.1702     0.0000
 
 Parameter(s) = ; run = short. cache = False; usecache = False
 ___________________________________________________________
 Method                total      d/l->buff  parse buff
 ___________________________________________________________
-csv; numpy; no len.    0.1760     0.1498     0.0042
-csv; pandas; no len.   0.1928     0.1570     0.0118
-csv; numpy             0.2229     0.1960     0.0018
-csv; pandas            0.2369     0.2003     0.0116
-binary                 0.3107     0.2641     0.0000
+csv; numpy; no len.    0.2429     0.2124     0.0056
+csv; pandas; no len.   0.2334     0.1999     0.0118
+csv; numpy             0.2172     0.1928     0.0018
+csv; pandas            0.2203     0.1845     0.0117
+binary                 0.2046     0.1627     0.0000
 
 Parameter(s) = scalar; run = short. cache = True; usecache = False
 _____________________________________________________________
 Method                total      d/l->file  read & parse file
 _____________________________________________________________
-csv; numpy; no len.    0.2337     0.1919     0.0009
-csv; pandas; no len.   0.2223     0.1971     0.0016
-csv; numpy             0.1955     0.1694     0.0004
-csv; pandas            0.1994     0.1732     0.0018
-binary                 0.2105     0.1651     0.0001
+csv; numpy; no len.    0.2297     0.1895     0.0008
+csv; pandas; no len.   0.2299     0.2044     0.0017
+csv; numpy             0.2295     0.2036     0.0004
+csv; pandas            0.2127     0.1839     0.0016
+binary                 0.2056     0.1616     0.0001
 
 Parameter(s) = scalar,vector; run = short. cache = True; usecache = False
 _____________________________________________________________
 Method                total      d/l->file  read & parse file
 _____________________________________________________________
-csv; numpy; no len.    0.2109     0.1879     0.0006
-csv; pandas; no len.   0.2068     0.1818     0.0025
-csv; numpy             0.2132     0.1904     0.0004
-csv; pandas            0.2160     0.1892     0.0019
-binary                 0.2190     0.1761     0.0002
+csv; numpy; no len.    0.2212     0.1962     0.0011
+csv; pandas; no len.   0.2251     0.1991     0.0019
+csv; numpy             0.2408     0.2164     0.0004
+csv; pandas            0.2328     0.2068     0.0018
+binary                 0.2058     0.1591     0.0002
 
 Parameter(s) = ; run = short. cache = True; usecache = False
 _____________________________________________________________
 Method                total      d/l->file  read & parse file
 _____________________________________________________________
-csv; numpy; no len.    0.1994     0.1687     0.0045
-csv; pandas; no len.   0.2024     0.1667     0.0124
-csv; numpy             0.1830     0.1567     0.0017
-csv; pandas            0.2034     0.1662     0.0116
-binary                 0.2211     0.1770     0.0002
+csv; numpy; no len.    0.2237     0.1948     0.0044
+csv; pandas; no len.   0.2287     0.1872     0.0132
+csv; numpy             0.2111     0.1862     0.0017
+csv; pandas            0.2265     0.1898     0.0120
+binary                 0.2234     0.1792     0.0002

setup.py

@@ -29,7 +29,7 @@
 # version is modified by misc/version.py (executed from Makefile). Do not edit.
 setup(
     name='hapiclient',
-    version='0.1.9b2',
+    version='0.1.9b3',
     author='Bob Weigel',
     author_email='rweigel@gmu.edu',
     packages=find_packages(),