FMWK: Updating some testing scripts and docs

Author: William McLendon

README.md

@@ -1,12 +1,8 @@
-<!--
-[![pipeline status](https://gitlab-ex.sandia.gov/trilinos-devops-consolidation/code/SetProgramOptions/badges/master/pipeline.svg)](https://gitlab-ex.sandia.gov/trilinos-devops-consolidation/code/SetProgramOptions/-/commits/master)
-[![coverage report](https://gitlab-ex.sandia.gov/trilinos-devops-consolidation/code/SetProgramOptions/badges/master/coverage.svg)](http://10.202.35.89:8080/SetProgramOptions/coverage/index.html)
-[![Generic badge](https://img.shields.io/badge/docs-latest-green.svg)](http://10.202.35.89:8080/SetProgramOptions/doc/index.html)
--->
 <!-- Github Badges -->
 [![SetProgramOptions Testing](https://github.com/sandialabs/SetProgramOptions/actions/workflows/test-driver-core.yml/badge.svg)](https://github.com/sandialabs/SetProgramOptions/actions/workflows/test-driver-core.yml)
 [![Documentation Status](https://readthedocs.org/projects/setprogramoptions/badge/?version=latest)](https://setprogramoptions.readthedocs.io/en/latest/?badge=latest)
 
+
 SetProgramOptions
 =================
 The `SetProgramOptions` package extends [`ConfigParserEnhanced`][2] to enable the processing

exec-reqs-install.sh

@@ -7,6 +7,13 @@
 # Source the common helpers script.
 source scripts/common.bash
 
+# Check if we're in a virtual environment
+pip_opt_user=""
+if [ -z ${VIRTUAL_ENV} ]; then
+    # if not in virtual environment
+    pip_opt_user="--user"
+fi
+
 printf "${yellow}"
 print_banner "INSTALL REQUIRED PACKAGES"
 printf "${normal}"
@@ -19,8 +26,9 @@ execute_command "${python_exe:?} --version"
 options=(
     -m pip
     install
-    --user
+    ${pip_opt_user}
     -r requirements.txt
+    -r requirements-build.txt
     -r requirements-test.txt
     -r doc/requirements.txt
 )

exec-reqs-uninstall.sh

@@ -18,6 +18,7 @@ options=(
     -y
     -r requirements.txt
     -r requirements-test.txt
+    #-r requirements-build.txt
 )
 
 cmd="${python_exe} ${options[@]} ${projectname}"

exec-tests.sh

@@ -39,9 +39,9 @@ options=(
 python3 -m pytest ${options[@]}
 err=$?
 
-
 # Install the package
-execute_command_checked "python3 -m pip wheel --no-deps -w dist . >& _test-build-dist.log"
+# execute_command_checked "python3 -m pip wheel --no-deps -w dist . >& _test-build-dist.log"
+execute_command_checked "python3 -m build >& _test-build-dist.log"
 execute_command_checked "python3 -m pip install ${pip_opt_user} . >& _test-install.log"
 
 

pyproject.toml

@@ -29,7 +29,10 @@ Issues = "https://gitlab-ex.sandia.gov/trilinos-devops-consolidation/code/SetPro
 [tool.poetry.dependencies]
 python = "^3.6"
 configparser = "^5.0"
-configparserenhanced = {git = "https://gitlab-ex.sandia.gov/trilinos-devops-consolidation/code/ConfigParserEnhanced.git", rev = "master"}
+configparserenhanced = "^0.8"
+
+# deprecated
+# configparserenhanced = {git = "https://gitlab-ex.sandia.gov/trilinos-devops-consolidation/code/ConfigParserEnhanced.git", rev = "master"}
 
 
 [tool.poetry.dev-dependencies]

requirements-build.txt

@@ -0,0 +1,13 @@
+#
+# Build/Distribution-specific requirements are in this file.
+# - Dependencies in requirements.txt are still needed.
+#
+
+# Build / Distribution Requirements
+setuptools >= 58.0
+build >= 0.7
+
+
+# (possibly) unnecessary packages
+# poetry >= 1.1
+

requirements.txt

@@ -3,10 +3,9 @@
 #
 
 # Core Requirements
-
+configparserenhanced
 
 # Privately hosted repositories
-#configparserenhanced @ git+ssh://git@gitlab-ex.sandia.gov/trilinos-devops-consolidation/code/ConfigParserEnhanced.git@master#egg=configparserenhanced
-
-configparserenhanced @ git+https://github.com/sandialabs/ConfigParserEnhanced.git@master#egg=configparserenhanced
+# configparserenhanced @ git+ssh://git@gitlab-ex.sandia.gov/trilinos-devops-consolidation/code/ConfigParserEnhanced.git@master#egg=configparserenhanced
+# configparserenhanced @ git+https://github.com/sandialabs/ConfigParserEnhanced.git@master#egg=configparserenhanced