89 use tox and tox env change to supporting 38 (#91)

* tox updates

* test updates

* rm old log files

* update tests

* recover unicode compare test

* refactor

* tests

* logging

* logging

* rm old test dir

* update Makefile

* windows testing

* logging

* docs

* Last 0.2.7b1 commit

Author: rweigel

CHANGES.txt

@@ -10,7 +10,7 @@ v0.0.6:
 		2018-10-04 -- Improve dateticks.py
 		2018-10-04 -- Add hapi_demo.ipynb
 		2018-10-04 -- Other documentation improvements
-v0.0.7: 
+v0.0.7:
 		2018-10-06 -- Improve documentation
 		2018-10-06 -- Add reader tests
 		2018-10-23 -- Improve dateticks and tests
@@ -107,4 +107,7 @@ v0.2.6:
 v0.2.7b1:
 	2025-03-01 -- Unrecognized ISO 8601 time format: '00:00:00.Z' https://github.com/hapi-server/client-python/issues/76
 	2025-03-01 -- 'infer_datetime_format' is deprecated ... https://github.com/hapi-server/client-python/issues/78
-  2026-04-08 -- Improve NaN handling https://github.com/hapi-server/client-python/issues/88
+	2026-04-08 -- Improve NaN handling https://github.com/hapi-server/client-python/issues/88
+	2026-05-02 -- Logging and testing https://github.com/hapi-server/client-python/issues/89
+0.2.7:
+	2026--05-02-- Support for Python 2.7 dropped. This is last release with support for 3.5 through 3.8.

Makefile

@@ -1,9 +1,13 @@
-# Test hapi() data read functions using repository code:
+# Test in Conda virtual environments (to be deprecated):
 #   make repository-test PYTHON=_PYTHON_ # Test using _PYTHON_ (e.g, python3.6)
 #   make repository-test-all             # Test on all versions in $(PYTHONVERS) var below
 #
+# Test using tox (See also README.md for additional instructions):
+#   tox
+#
 # Beta releases:
-# 1. Run make repository-test-all
+# 1. tox
+# 2. make repository-test-all # (To be deprecated)
 # 2. For non-doc/formatting changes, update version in CHANGES.txt.
 # 3. run `make version-update` if version changed in CHANGES.txt.
 # 4. Commit and push
@@ -45,24 +49,30 @@ PYTHON=python3.8
 PYTHON_VER=$(subst python,,$(PYTHON))
 
 # Python versions to test
-PYTHONVERS=python3.13 python3.12 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5
+PYTHONVERS=python3.14 python3.13 python3.12 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6
 
 # VERSION is updated in "make version-update" step and derived
 # from CHANGES.txt. Do not edit.
 VERSION=0.2.7b1
 SHELL:= /bin/bash
-#SHELL:= /c/Windows/system32/cmd
 
 LONG_TESTS=false
 
-CONDA=$(PWD)/anaconda3
+CONDA=$(CURDIR)/anaconda3
 
 ifeq ($(OS),Windows_NT)
-	CONDA=C:/Users/weigel/git/client-python/anaconda3
-	TMP=tmp/
+	CONDA=$(CURDIR)/anaconda3
 endif
+#TOS1=conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main
+#TOS2=conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r
 CONDA_ACTIVATE=source $(CONDA)/etc/profile.d/conda.sh; conda activate
 
+ifeq ($(OS),Windows_NT)
+	CONDA_RUN=$(CONDA)/Scripts/conda.exe run -n $(PYTHON)
+else
+	CONDA_RUN=$(CONDA_ACTIVATE) $(PYTHON);
+endif
+
 ################################################################################
 install: $(CONDA)/envs/$(PYTHON)
 	$(CONDA_ACTIVATE) $(PYTHON); pip install --editable .
@@ -73,26 +83,6 @@ install: $(CONDA)/envs/$(PYTHON)
 test:
 	make repository-test-all
 
-####################################################################
-# Tox notes
-#
-# Ideally local tests would use same commands as .tox.ini and .travis.yml.
-#
-# To use tox -e short-test, it seems we need to install and activate
-# each version of python. So using tox locally does not seem to make
-# things much simpler than `make repository-test`, which installs
-# conda and virtual enviornments and runs tests.
-#
-# However, Travis tests use tox-travis and it seems creation of
-# virtual environment is done automatically.
-#
-#repository-test-all-tox:
-#	tox -e short-test
-#repository-test-tox: 
-# # Does not work
-#	tox -e py$(subst .,,$(PYTHON_VER)) short-test
-####################################################################
-
 # Test contents in repository using different Python versions
 repository-test-all:
 	@make clean
@@ -104,63 +94,86 @@ repository-test-all:
 repository-test:
 	@make clean
 	make condaenv PYTHON=$(PYTHON)
-	$(CONDA_ACTIVATE) $(PYTHON); pip install pytest deepdiff; pip install .
+	$(CONDA_RUN) pip install pytest deepdiff
+	$(CONDA_RUN) pip install .
 
-ifeq (LONG_TESTS,true)
-	$(CONDA_ACTIVATE) $(PYTHON); python -m pytest --tb=short -v -m 'long' hapiclient/test/test_hapi.py
+ifeq ($(LONG_TESTS),true)
+	$(CONDA_RUN) python -m pytest -m "long" test
 else
-	$(CONDA_ACTIVATE) $(PYTHON); python -m pytest --tb=short -v -m 'short' hapiclient/test/test_hapi.py
+	$(CONDA_RUN) python -m pytest -m "not long" test
 endif
-
-	$(CONDA_ACTIVATE) $(PYTHON); python -m pytest -v hapiclient/test/test_chunking.py
-	$(CONDA_ACTIVATE) $(PYTHON); python -m pytest -v hapiclient/test/test_hapitime2datetime.py
-	$(CONDA_ACTIVATE) $(PYTHON); python -m pytest -v hapiclient/test/test_datetime2hapitime.py
-	$(CONDA_ACTIVATE) $(PYTHON); python -m pytest -v hapiclient/test/test_hapitime_reformat.py
 ################################################################################
 
 ################################################################################
 # Anaconda install
+ifeq ($(OS),Windows_NT)
+CONDA_PKG=Miniconda3-latest-Windows-x86_64.exe
+CONDA_PKG_PATH=C:/tmp/$(CONDA_PKG)
+else
+UNAME_S:=$(shell uname -s)
+UNAME_M:=$(shell uname -m)
+
+ifeq ($(UNAME_S),Linux)
 CONDA_PKG=Miniconda3-latest-Linux-x86_64.sh
-CONDA_PKG_PATH=/tmp/$(CONDA_PKG)
-ifeq ($(shell uname -s),Darwin)
-	CONDA_PKG=Miniconda3-latest-MacOSX-x86_64.sh
-	CONDA_PKG_PATH=/tmp/$(CONDA_PKG)
+ifeq ($(UNAME_M),aarch64)
+CONDA_PKG=Miniconda3-latest-Linux-aarch64.sh
 endif
-ifeq ($(OS),Windows_NT)
-	CONDA_PKG=Miniconda3-latest-Windows-x86_64.exe
-	CONDA_PKG_PATH=C:/tmp/$(CONDA_PKG)
+endif
+
+ifeq ($(UNAME_S),Darwin)
+CONDA_PKG=Miniconda3-latest-MacOSX-x86_64.sh
+ifeq ($(UNAME_M),arm64)
+CONDA_PKG=Miniconda3-latest-MacOSX-arm64.sh
+endif
+endif
+
+CONDA_PKG_PATH=/tmp/$(CONDA_PKG)
 endif
 
 activate:
 	@echo "On command line enter:"
 	@echo "$(CONDA_ACTIVATE) $(PYTHON)"
 
 condaenv:
-	make $(CONDA)/envs/$(PYTHON) PYTHON=$(PYTHON)
+	$(MAKE) $(CONDA)/envs/$(PYTHON) PYTHON=$(PYTHON)
 
 $(CONDA)/envs/$(PYTHON): $(CONDA)
 ifeq ($(OS),Windows_NT)
-	$(CONDA_ACTIVATE); \
-		$(CONDA)/Scripts/conda \
-			create -y --name $(PYTHON) python=$(PYTHON_VER)
+	$(CONDA)/Scripts/conda.exe tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main
+	$(CONDA)/Scripts/conda.exe tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r
+	$(CONDA)/Scripts/conda.exe tos accept --override-channels --channel https://repo.anaconda.com/pkgs/msys2
+	$(CONDA)/Scripts/conda.exe create -y --name $(PYTHON) python=$(PYTHON_VER)
 else
 	$(CONDA_ACTIVATE); \
+		$(CONDA)/bin/conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main; \
+		$(CONDA)/bin/conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r; \
 		$(CONDA)/bin/conda \
 		create -y --name $(PYTHON) python=$(PYTHON_VER)
 endif
 
-$(CONDA): $(CONDA_PKG_PATH)
 ifeq ($(OS),Windows_NT)
-	# Not working; path is not set
-	#start "$(CONDA_PKG_PATH)" /S /D=$(CONDA)
-	echo "!!! Install miniconda3 into $(CONDA) manually by executing 'start $(PWD)/anaconda3'. Then re-execute make command."
-	exit 1
+$(CONDA):
+	@powershell -NoProfile -Command "$$ErrorActionPreference='Stop'; \
+		$$pkg = '$(CONDA_PKG)'; \
+		if ([string]::IsNullOrWhiteSpace($$pkg)) { $$pkg = 'Miniconda3-latest-Windows-x86_64.exe' }; \
+		$$tempDir = [System.IO.Path]::GetTempPath(); \
+		if ([string]::IsNullOrWhiteSpace($$tempDir)) { $$tempDir = 'C:\\Windows\\Temp' }; \
+		New-Item -ItemType Directory -Force -Path $$tempDir | Out-Null; \
+		$$installer = Join-Path $$tempDir $$pkg; \
+		$$url = 'https://repo.anaconda.com/miniconda/' + $$pkg; \
+		$$condaExe = Join-Path '$(CONDA)' 'Scripts/conda.exe'; \
+		if (Test-Path $$condaExe) { exit 0 }; \
+		if (!(Test-Path $$installer)) { Invoke-WebRequest -Uri $$url -OutFile $$installer }; \
+		$$target = [System.IO.Path]::GetFullPath('$(CONDA)').Replace('/','\\'); \
+		Start-Process -FilePath $$installer -ArgumentList '/InstallationType=JustMe','/RegisterPython=0','/AddToPath=0','/S',('/D=' + $$target) -Wait -NoNewWindow; \
+		if (!(Test-Path $$condaExe)) { throw 'Miniconda install failed.' }"
 else
+$(CONDA): $(CONDA_PKG_PATH)
 	test -d anaconda3 || bash $(CONDA_PKG_PATH) -b -p $(CONDA)
-endif
 
 $(CONDA_PKG_PATH):
-	curl https://repo.anaconda.com/miniconda/$(CONDA_PKG) > $(CONDA_PKG_PATH)
+	curl -L -o $(CONDA_PKG_PATH) https://repo.anaconda.com/miniconda/$(CONDA_PKG)
+endif
 ################################################################################
 
 ################################################################################
@@ -265,17 +278,23 @@ test-clean:
 ################################################################################
 
 clean:
-	- @find . -name __pycache__ | xargs rm -rf {}
-	- @find . -name *.pyc | xargs rm -rf {}
-	- @find . -name *.DS_Store | xargs rm -rf {}
-	- @find . -type d -name __pycache__ | xargs rm -rf {}
-	- @find . -name *.pyc | xargs rm -rf {}
+
+ifeq ($(OS),Windows_NT)
+	- @powershell -NoProfile -Command "Get-ChildItem -Path . -Recurse -Directory -Filter '__pycache__' -ErrorAction SilentlyContinue | Remove-Item -Recurse -Force -ErrorAction SilentlyContinue"
+	- @powershell -NoProfile -Command "Get-ChildItem -Path . -Recurse -File -Include '*.pyc','*.DS_Store' -ErrorAction SilentlyContinue | Remove-Item -Force -ErrorAction SilentlyContinue"
+	- @powershell -NoProfile -Command "Remove-Item -Path '*~' -Force -ErrorAction SilentlyContinue"
+	- @powershell -NoProfile -Command "Remove-Item -Path '#*#' -Force -ErrorAction SilentlyContinue"
+	- @powershell -NoProfile -Command "Remove-Item -Path 'env','dist','.pytest_cache','hapiclient.egg-info' -Recurse -Force -ErrorAction SilentlyContinue"
+	- @powershell -NoProfile -Command "Remove-Item -Path '/c/tools/miniconda3/envs/python3.6/Scripts/wheel.exe*','/c/tools/miniconda3/envs/python3.6/vcruntime140.dll.*' -Force -ErrorAction SilentlyContinue"
+else
+	- @find . -type d -name __pycache__ -exec rm -rf {} +
+	- @find . -type f -name '*.pyc' -exec rm -f {} +
+	- @find . -type f -name '*.DS_Store' -exec rm -f {} +
 	- @rm -f *~
 	- @rm -f \#*\#
 	- @rm -rf env
 	- @rm -rf dist
 	- @rm -f MANIFEST
 	- @rm -rf .pytest_cache/
 	- @rm -rf hapiclient.egg-info/
-	- @rm -rf /c/tools/miniconda3/envs/python3.6/Scripts/wheel.exe*
-	- @rm -rf /c/tools/miniconda3/envs/python3.6/vcruntime140.dll.*
+endif

README.md

@@ -39,6 +39,7 @@ start      = '2003-09-01T00:00:00'
 stop       = '2003-12-01T00:00:00'
 parameters = 'DST1800'
 opts       = {'logging': True}
+# See misc/hapi_logging_demo.py for example of using conventional Python logging.
 
 # Get data
 data, meta = hapi(server, dataset, parameters, start, stop, **opts)
@@ -81,7 +82,41 @@ returns the [Numpy N-D array](https://docs.scipy.org/doc/numpy-1.15.1/user/quick
 
 The HAPI client data model is intentionally basic. There is an ongoing discussion of a data model for Heliophysics data among the [PyHC community](https://heliopython.org/). When this data model is complete, a function that converts `data` and `meta` to that data model will be included in the `hapiclient` package.
 
-# Development
+# Development and Testing
+
+## Testing Python versions available with tox-env
+
+As of 2026-04-14, Python 3.8+ is available with tox-env.
+
+```bash
+git clone https://github.com/hapi-server/client-python
+cd client-python; python -m pip install -e .
+
+# Run a specific test on current Python version (default is log_level=INFO
+# for hapiclient logger and test logger when executed this way).
+python test/test_hapi_data_requests.py
+
+# Run a specific test on a specific Python version with all logging
+tox -e py311 -- test/test_hapi_data_requests.py
+# Set log level for test logger
+tox -e py311 -- test/test_hapi_data_requests.py --log-level=INFO
+
+# Run a specific test on all Python versions set by tox.ini `envlist`
+tox -- test/test_hapi_data_requests.py
+
+# Run all tests in ./test
+tox
+
+# Run long-running tests
+tox -e long-test
+
+# Run long-running tests on a specific Python version
+tox -e long-test --override testenv:long-test.basepython=python3.11
+```
+
+## Testing Python versions available with Anaconda
+
+As of 2026-04-14, Python 3.5+ is available with Anaconda.
 
 ```bash
 git clone https://github.com/hapi-server/client-python
@@ -106,12 +141,13 @@ make repository-test
 
 To run an individual unit test in a Python session, use, e.g.,
 
-```python
-from hapiclient.test.test_hapi import test_reader_short
-test_reader_short()
+```bash
+cd test; python test_hapitime_reformat.py
 ```
 
 # Contact
 
 Submit bug reports and feature requests on the [repository issue
 tracker](https://github.com/hapi-server/client-python/issues>).
+
+Before submitting a pull request, please post an issue with the proposed changes for discussion prior to developing the pull request.