Global: remove local configobj, add python3-only version to dependencies

CHANGES.rst

@@ -12,6 +12,8 @@ Release 1.4.2
 Global
 ------
 
+* Raise configobj requirements to python3-only version 5.0.9
+* Abandon embedded configobj in favor of dependency installation
 * Use python3 for scripts, fix installation setup
 
 Config

LICENSE.txt

@@ -7,47 +7,3 @@ Redistribution and use in source and binary forms, with or without modification,
     3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
---------------------------------------------------------------
-The following terms apply to the included 'configobj' package.
---------------------------------------------------------------
-
-Copyright (c): 
-2003-2010, Michael Foord
-2014, Eli Courtwright, Rob Dennis
-All rights reserved.
-E-mails : 
-fuzzyman AT voidspace DOT org DOT uk
-eli AT courtwright DOT org
-rdennis AT gmail DOT com
-
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the names of Michael Foord, Eli Courtwright or Rob Dennis,
-      nor the name of Voidspace,  may be used to endorse or promote 
-      products derived from this software without specific prior written 
-      permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Makefile

@@ -3,6 +3,7 @@ version := $(shell python3 -Ssc 'from package_info import version; print(version
 package = $(program)-$(version)
 
 prefix = /usr/local
+venv = $(HOME)/.venv/$(program)
 
 PYTHON = python3
 PIP = pip
@@ -37,7 +38,14 @@ dist:
 install: doc
 	$(PIP) install --prefix=$(prefix) .
 
-.PHONY: all clean distclean doc check dist install
+$(venv):
+	$(PYTHON) -m venv --upgrade-deps $(venv)
+
+vinstall: doc $(venv)
+	@ [ '$(VIRTUAL_ENV)' = $(venv) ] || { echo "virtual environment '$(venv)' not activated"; false; }
+	pip install .
+
+.PHONY: all clean distclean doc check dist install vinstall
 
 %.pdf: %.fodt
 	soffice --headless --convert-to pdf --outdir $(@D) $<

_version.py

-__version__ = '5.0.6'
\ No newline at end of file

setup.py

@@ -9,10 +9,10 @@ setup(
     author = 'Karl-Hermann Wieners',
     author_email = 'karl-hermann.wieners@mpimet.mpg.de',
     url = 'http://code.mpimet.mpg.de/projects/esmenv',
-    py_modules = ['_version', 'configobj', 'validate', 'feedback', 'expargparse', 'expconfig', 'files', 'package_info', 'update'],
+    py_modules = ['feedback', 'expargparse', 'expconfig', 'files', 'package_info', 'update'],
     scripts = ['mkexp', 'getexp', 'rmexp', 'diffexp', 'diffpath', 'cpexp', 'cppath', 'duexp', 'getconfig', 'editexp', 'upexp', 'setconfig', 'selconfig', 'namelist2config', 'files2config', 'importexp', 'unmergeconfig', 'compconfig', 'diffconfig'],
     data_files = [('share/doc/'+package_info.name, ['doc/mkexp.pdf', 'mkexp.bash'])],
     platforms = ['Posix'],
     license = 'LICENSE.txt',
-    install_requires = ['Jinja2(>= 2.6)', 'six']
+    install_requires = ['Jinja2(>= 2.6)', 'configobj(>= 5.0.9)']
 )