Issue #680: added code supporting depends_on_any() modfunc

.readthedocs.yml

@@ -5,15 +5,16 @@
 # version of configuration file (required)
 version: 2
 
+# Set the OS, Python version and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+
 # Build from the docs/ directory with Sphinx
 sphinx:
   configuration: docs/source/conf.py
 
 # also build docs in PDF format
 formats: [pdf]
 
-# Optionally set the version of Python and requirements required to build your docs
-python:
-  version: 3.7
-  install:
-      - requirements: docs/requirements.txt

Makefile.in

@@ -72,7 +72,7 @@ AUTO_SWAP                 := @AUTO_SWAP@
 SPIDER_CACHE_DIRS         := @SPIDER_CACHE_DIRS@
 LEGACY_ORDERING           := @LEGACY_ORDERING@
 EXPORT_MODULE             := @EXPORT_MODULE@
-LMOD_PERMANENT_CONFLICTS  := @LMOD_PERMANENT_CONFLICTS@
+LMOD_DOWNSTREAM_CONFLICTS := @LMOD_DOWNSTREAM_CONFLICTS@
 BASENAME                  := @BASENAME@
 UPDATE_VERSION            := LUA_PATH="$(srcdir)/tools/?.lua;$(SYS_LUA_PATH)" $(PATH_TO_LUA) $(srcdir)/proj_mgmt/updateVersion
 BUILD_V_src               := LUA_PATH="$(srcdir)/tools/?.lua;$(SYS_LUA_PATH)" LUA_CPATH="$(SYS_LUA_CPATH)" $(PATH_TO_LUA) $(srcdir)/proj_mgmt/buildVersion_src
@@ -291,7 +291,7 @@ __installMe:
 	          -e 's|@fast_tcl_interp@|$(FAST_TCL_INTERP)|g'                     \
 	          -e 's|@settarg_cmd@|$(SETTARG_CMD)|g'                             \
 	          -e 's|@lmod_config_dir@|$(LMOD_CONFIG_DIR)|g'                     \
-	          -e 's|@lmod_downstream_conflicts@|$(LMOD_PERMANENT_CONFLICTS)|g'   \
+	          -e 's|@lmod_downstream_conflicts@|$(LMOD_DOWNSTREAM_CONFLICTS)|g' \
 	          -e "s|@my_shell@|$$fn|g"                                          \
 	          -e 's|@tclsh@|$(PATH_TO_TCLSH)|g'                                 \
 	          -e 's|@ls@|$(PATH_TO_LS)|g'                                       \

README.new

@@ -138,3 +138,11 @@ Lmod 8.7+
    (8.7.37) * Issue #698: Use the correct mname from Framestack when unregistering a "break" module	    
             * Ignore backup files (*~ .*.swp etc) files in a modulerc.d directory.
             * Issue #699: Fixed buildVersion_src to deal with (HEAD detached at x.y.z)
+W.I.P:
+   (8.7.38) * Issue #697: Add warning if doing "module use --help"
+            * Make LMOD_IGNORE_CACHE use "yes/no" env var setting system.
+            * Make module --terse show <module> do the same as module --loc show <module>.
+              Namely print the location of the module.
+            * Support for "module --terse spider phdf5/1.12.2" that just prints the module in the hierarchy.
+            * Move almost almost all cosmic:value() calls to inside function not at routine top-level.
+            * PR: #702: Report build time in UTC when $SOURCE_DATE_EPOCH is set