Merge pull request #2 from gsell/main

pull changes from upstream main

Author: gsell

.cirrus.yml

@@ -80,7 +80,7 @@ task:
   env:
     MAKE: gmake
   freebsd_instance:
-    image_family: freebsd-14-2
+    image_family: freebsd-14-3
     cpu: 1
     memory: 2G
   reqinstall_script: pkg install -y bash curl gmake dejagnu py311-sphinx gzip tcl86 tcl-wrapper autoconf ksh93 zsh fish perl5 python311 ruby cmake R readline

.hunspell.en.dic

@@ -1301,3 +1301,9 @@ buildable
 Reproducibility
 rebase
 reproducibility
+latexpdf
+Kerberos
+Benoit
+HPSF
+wget
+MSVC

.readthedocs.yaml

@@ -24,5 +24,5 @@ python:
     - requirements: doc/source/requirements.txt
 
 # If using Sphinx, optionally build your docs in additional formats such as PDF
-# formats:
-#    - pdf
+formats:
+   - pdf

CODE_OF_CONDUCT.md

@@ -61,7 +61,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-modules-maintainers@lists.sourceforge.net.
+modules-TSC+owner@lists.hpsf.io.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

CONTRIBUTING.rst

@@ -20,11 +20,11 @@ Support questions
 -----------------
 
 Please use the `modules-interest mailing list`_
-(``modules-interest@lists.sourceforge.net``) or the `Modules chat room`_
+(``modules-interest@lists.hpsf.io``) or the `Modules chat room`_
 (``#modules:matrix.org``) for questions. Do not use the
 issue tracker for this.
 
-.. _modules-interest mailing list: https://sourceforge.net/projects/modules/lists/modules-interest
+.. _modules-interest mailing list: https://lists.hpsf.io/g/modules-interest
 .. _Modules chat room: https://matrix.to/#/#modules:matrix.org
 
 Asking for new features

MIGRATING.rst

@@ -55,7 +55,7 @@ modulepaths and recursively found in modulepaths enabled by available modules.
     -------------- :sgrdi:`/path/to/modulefiles.3` (via bar/1) --------------
     qux/1  qux/2
 
-The :subcmd:`spider` sub-command relies on the :ref:Extra match search
+The :subcmd:`spider` sub-command relies on the :ref:`Extra match search`
 mechanism to scan modulefiles and identify the modulepaths they enable. Since
 all modulefiles are evaluated during this scan, it is recommended to build
 and use a :ref:`Module cache` to improve search performance.
@@ -295,7 +295,7 @@ for the module.
 
     :ps:`$` module show foo
     -------------------------------------------------------------------
-    :sgrhi:`/path/to/modulefiles/mp4/foo/1`:
+    :sgrhi:`/path/to/modulefiles/foo/1`:
 
     :sgrcm:`provide`         liba/1.2 libb/2.1
     :sgrcm:`conflict`        foo
@@ -717,7 +717,7 @@ module will automatically be unloaded.
     :ps:`$` module purge
     :ps:`$` module load bar/1
     :ps:`$` echo $_LMFILES_
-    /path/to/othermfiles/mp2/bar/1
+    /path/to/othermfiles/bar/1
     :ps:`$` module load foo/1
     Loading :sgrhi:`bar/1`
       :sgrer:`ERROR`: Module already loaded from a different modulepath
@@ -2696,34 +2696,83 @@ attached to.
 Tags inherited from module state, consequence of a module action or set by
 using :mfcmd:`module-tag` but that have a special meaning currently are:
 
-+------------------+-------------------------+-----------------------+-------+----------------------+
-| Tag              | Description             | Set with              | Abbr. | Color                |
-|                  |                         |                       |       |                      |
-+==================+=========================+=======================+=======+======================+
-| auto-loaded      | Module has been loaded  | Inherited             | aL    | .. parsed-literal::  |
-|                  | automatically           |                       |       |     :sgral:`mod/1.0` |
-+------------------+-------------------------+-----------------------+-------+----------------------+
-| forbidden        | Module cannot be loaded | Inherited from        | F     | .. parsed-literal::  |
-|                  |                         | :mfcmd:`module-forbid`|       |     :sgrf:`mod/1.0`  |
-+------------------+-------------------------+-----------------------+-------+----------------------+
-| hidden           | Module is not visible   | Inherited from        | H     | .. parsed-literal::  |
-|                  | on :subcmd:`avail`      | :mfcmd:`module-hide`  |       |     :sgrh:`mod/1.0`  |
-+------------------+-------------------------+-----------------------+-------+----------------------+
-| hidden-loaded    | See `Hiding loaded      | Inherited from        | H     | .. parsed-literal::  |
-|                  | modules`_               | :mfcmd:`module-hide`  |       |     :sgrh:`mod/1.0`  |
-+------------------+-------------------------+-----------------------+-------+----------------------+
-| loaded           | Module is currently     | Inherited             | L     | .. parsed-literal::  |
-|                  | loaded                  |                       |       |     :sgrl:`mod/1.0`  |
-+------------------+-------------------------+-----------------------+-------+----------------------+
-| nearly-forbidden | Module will soon not be | Inherited from        | nL    | .. parsed-literal::  |
-|                  | able to load anymore    | :mfcmd:`module-forbid`|       |     :sgrnf:`mod/1.0` |
-+------------------+-------------------------+-----------------------+-------+----------------------+
-| sticky           | See `Sticky modules`_   | :mfcmd:`module-tag`   | S     | .. parsed-literal::  |
-|                  |                         |                       |       |     :sgrs:`mod/1.0`  |
-+------------------+-------------------------+-----------------------+-------+----------------------+
-| super-sticky     | See `Sticky modules`_   | :mfcmd:`module-tag`   | sS    | .. parsed-literal::  |
-|                  |                         |                       |       |     :sgrss:`mod/1.0` |
-+------------------+-------------------------+-----------------------+-------+----------------------+
+.. only:: html
+
+    +------------------+-------------------------+------------------------+-------+------------------------+
+    | Tag              | Description             | Set with               | Abbr. | Color                  |
+    |                  |                         |                        |       |                        |
+    +==================+=========================+========================+=======+========================+
+    | auto-loaded      | Module has been loaded  | Inherited              | aL    | .. parsed-literal::    |
+    |                  | automatically           |                        |       |                        |
+    |                  |                         |                        |       |     :sgral:`mod/1.0`   |
+    +------------------+-------------------------+------------------------+-------+------------------------+
+    | forbidden        | Module cannot be loaded | Inherited from         | F     | .. parsed-literal::    |
+    |                  |                         | :mfcmd:`module-forbid` |       |                        |
+    |                  |                         |                        |       |     :sgrf:`mod/1.0`    |
+    +------------------+-------------------------+------------------------+-------+------------------------+
+    | hidden           | Module is not visible   | Inherited from         | H     | .. parsed-literal::    |
+    |                  | on :subcmd:`avail`      | :mfcmd:`module-hide`   |       |                        |
+    |                  |                         |                        |       |     :sgrh:`mod/1.0`    |
+    +------------------+-------------------------+------------------------+-------+------------------------+
+    | hidden-loaded    | See `Hiding loaded      | Inherited from         | H     | .. parsed-literal::    |
+    |                  | modules`_               | :mfcmd:`module-hide`   |       |                        |
+    |                  |                         |                        |       |     :sgrh:`mod/1.0`    |
+    +------------------+-------------------------+------------------------+-------+------------------------+
+    | loaded           | Module is currently     | Inherited              | L     | .. parsed-literal::    |
+    |                  | loaded                  |                        |       |                        |
+    |                  |                         |                        |       |     :sgrl:`mod/1.0`    |
+    +------------------+-------------------------+------------------------+-------+------------------------+
+    | nearly-forbidden | Module will soon not be | Inherited from         | nL    | .. parsed-literal::    |
+    |                  | able to load anymore    | :mfcmd:`module-forbid` |       |                        |
+    |                  |                         |                        |       |     :sgrnf:`mod/1.0`   |
+    +------------------+-------------------------+------------------------+-------+------------------------+
+    | sticky           | See `Sticky modules`_   | :mfcmd:`module-tag`    | S     | .. parsed-literal::    |
+    |                  |                         |                        |       |                        |
+    |                  |                         |                        |       |     :sgrs:`mod/1.0`    |
+    +------------------+-------------------------+------------------------+-------+------------------------+
+    | super-sticky     | See `Sticky modules`_   | :mfcmd:`module-tag`    | sS    | .. parsed-literal::    |
+    |                  |                         |                        |       |                        |
+    |                  |                         |                        |       |     :sgrss:`mod/1.0`   |
+    +------------------+-------------------------+------------------------+-------+------------------------+
+
+.. only:: not html
+
+    +------------------+-------------------------+------------------------+-------+
+    | Tag              | Description             | Set with               | Abbr. |
+    |                  |                         |                        |       |
+    +==================+=========================+========================+=======+
+    | auto-loaded      | Module has been loaded  | Inherited              | aL    |
+    |                  | automatically           |                        |       |
+    |                  |                         |                        |       |
+    +------------------+-------------------------+------------------------+-------+
+    | forbidden        | Module cannot be loaded | Inherited from         | F     |
+    |                  |                         | :mfcmd:`module-forbid` |       |
+    |                  |                         |                        |       |
+    +------------------+-------------------------+------------------------+-------+
+    | hidden           | Module is not visible   | Inherited from         | H     |
+    |                  | on :subcmd:`avail`      | :mfcmd:`module-hide`   |       |
+    |                  |                         |                        |       |
+    +------------------+-------------------------+------------------------+-------+
+    | hidden-loaded    | See `Hiding loaded      | Inherited from         | H     |
+    |                  | modules`_               | :mfcmd:`module-hide`   |       |
+    |                  |                         |                        |       |
+    +------------------+-------------------------+------------------------+-------+
+    | loaded           | Module is currently     | Inherited              | L     |
+    |                  | loaded                  |                        |       |
+    |                  |                         |                        |       |
+    +------------------+-------------------------+------------------------+-------+
+    | nearly-forbidden | Module will soon not be | Inherited from         | nL    |
+    |                  | able to load anymore    | :mfcmd:`module-forbid` |       |
+    |                  |                         |                        |       |
+    +------------------+-------------------------+------------------------+-------+
+    | sticky           | See `Sticky modules`_   | :mfcmd:`module-tag`    | S     |
+    |                  |                         |                        |       |
+    |                  |                         |                        |       |
+    +------------------+-------------------------+------------------------+-------+
+    | super-sticky     | See `Sticky modules`_   | :mfcmd:`module-tag`    | sS    |
+    |                  |                         |                        |       |
+    |                  |                         |                        |       |
+    +------------------+-------------------------+------------------------+-------+
 
 Hiding loaded modules
 ^^^^^^^^^^^^^^^^^^^^^

NEWS.rst

@@ -6,11 +6,24 @@ Release notes
 This file describes changes in recent versions of Modules. It primarily
 documents those changes that are of interest to users and admins.
 
-.. _5.6 release notes:
+.. _5.7 release notes:
 
-Modules 5.6.1 (not yet released)
+Modules 5.7.0 (not yet released)
 --------------------------------
 
+* Script: improve :command:`mrel` to always ask a Fedora Kerberos ticket.
+* Use CMake ``EVAL CODE`` to forward arguments passed to ``module`` CMake
+  function. (fix issue #419 with contribution from Benoit Dumas)
+* Doc: update email address in `Code of conduct`_ to report bad behavior to
+  maintainers.
+* Move *modules-interest* mailing-list to HPSF.
+
+
+.. _5.6 release notes:
+
+Modules 5.6.1 (2025-11-25)
+--------------------------
+
 * Script: improve :command:`mrel` to better support Koji states and not rely
   on sudo privileges to test a new release.
 * Script: adapt utilities to only use :command:`curl` rather also requiring
@@ -30,6 +43,18 @@ Modules 5.6.1 (not yet released)
 * Doc: precise that no automatic path resolution is performed on
   :mfcmd:`prepend-path`, :mfcmd:`append-path` or :mfcmd:`remove-path`
   modulefile commands. (fix issue #597)
+* Doc: add way to build latexpdf documentation.
+* Ensure that a module having the same name than a loaded module from
+  another modulepath does not inherit its tags. (fix issue #599)
+* Drop tags stored in memory that applies to a module when unloading it. It
+  ensures that tags applied to the module when reloaded from a different
+  modulepath are not inherited.
+* Always apply *abort on error* behavior in case a Dependent Reload sticky
+  (and :option:`--force` is not set) or super-sticky module fails to reload.
+  (fix issue #601)
+* When loading a module, check already loaded modules and their aliases
+  exactly matching specification before looking at available modules and their
+  aliases. (fix issue #602)
 
 .. _Furo: https://github.com/pradyunsg/furo
 

README.md

@@ -137,7 +137,7 @@ Modules is an open source project. Questions, discussion, and contributions
 are welcome. You can get in contact with the Modules community via:
 
 * the [modules-interest mailing list][6]
-  (`modules-interest@lists.sourceforge.net`)
+  (`modules-interest@lists.hpsf.io`)
 * the [Modules chat room][7] (`#modules:matrix.org`)
 
 The project is also present on several social media platforms:
@@ -212,7 +212,7 @@ be what it is without their contributions:
 [3]: https://modules.readthedocs.io/en/stable/MIGRATING.html
 [4]: https://modules.readthedocs.io/en/stable/NEWS.html
 [5]: https://modules.readthedocs.io/en/stable/changes.html
-[6]: https://sourceforge.net/projects/modules/lists/modules-interest
+[6]: https://lists.hpsf.io/g/modules-interest
 [7]: https://matrix.to/#/#modules:matrix.org
 [8]: https://x.com/EnvModules
 [9]: https://mast.hpc.social/@EnvModules

doc/Makefile

@@ -33,12 +33,14 @@ else
 ECHO_GEN2 = \#
 endif
 
-ALL_RST := $(wildcard $(SOURCE_DIR)/*.rst $(SOURCE_DIR)/cookbook/*.rst\
-	$(SOURCE_DIR)/design/*.rst)
+ALL_RST := $(filter-out $(SOURCE_DIR)/latex_index.rst, $(wildcard $(SOURCE_DIR)/*.rst\
+	$(SOURCE_DIR)/cookbook/*.rst $(SOURCE_DIR)/design/*.rst))
 ALL_TXT := $(patsubst $(SOURCE_DIR)/%,$(BUILD_DIR)/%,$(patsubst %.rst,%.txt,$(ALL_RST)))
 ALL_HTML := $(patsubst $(SOURCE_DIR)/%,$(BUILD_DIR)/%,$(patsubst %.rst,%.html,$(ALL_RST)))
 ALL_MAN := $(BUILD_DIR)/module.1 $(BUILD_DIR)/ml.1 $(BUILD_DIR)/envml.1\
 	$(BUILD_DIR)/modulefile.5
+ALL_TEX := $(BUILD_DIR)/latex/modules.tex
+ALL_PDF := $(BUILD_DIR)/latex/modules.pdf
 
 all: man txt
 
@@ -54,6 +56,8 @@ man: $(ALL_MAN)
 ifneq ($(builddoc),p)
 txt: $(ALL_TXT)
 html: $(ALL_HTML)
+latex: $(ALL_TEX)
+latexpdf: $(ALL_PDF)
 else
 # limit txt targets to documents that have been prebuilt
 txt: $(BUILD_DIR)/changes.txt $(BUILD_DIR)/MIGRATING.txt \
@@ -113,6 +117,14 @@ endif
 $(BUILD_DIR)/module.1: $(BUILD_DIR)/module.1.in
 	$(translate-in-script)
 
+$(BUILD_DIR)/latex/modules.tex: $(SOURCE_DIR)/version.py
+	$(ECHO_GEN2) $(ECHO_DIR_PREFIX)$@
+	$(SPHINXBUILD) $(SPHINXOPTS) -b latex "$(SOURCE_DIR)" "$(BUILD_DIR)/latex"
+
+$(BUILD_DIR)/latex/modules.pdf: $(BUILD_DIR)/latex/modules.tex
+	$(ECHO_GEN2) $(ECHO_DIR_PREFIX)$@
+	$(MAKE) -C "$(BUILD_DIR)/latex" all-pdf
+
 install: man txt
 	$(INSTALL_DIR) '$(DESTDIR)$(mandir)/man1' '$(DESTDIR)$(mandir)/man5'
 ifeq ($(docinstall),y)
@@ -162,4 +174,4 @@ V = 1
 endif
 # let verbose by default the install/clean/test and other specific non-build targets
 $(V).SILENT: ../version.inc $(SOURCE_DIR)/version.py $(ALL_HTML) $(ALL_TXT) \
-	$(BUILD_DIR)/module.1.in $(ALL_MAN)
+	$(BUILD_DIR)/module.1.in $(ALL_MAN) $(ALL_TEX) $(ALL_PDF)

doc/source/conf.py

@@ -46,8 +46,8 @@
 
 # General information about the project.
 project = u'Modules'
-copyright = '1996-2025, Modules Contributors'
-author = ''
+author = 'Modules Contributors'
+copyright = f'1996-2025, {author}'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -79,7 +79,7 @@ def get_version_release_from_git():
             else:
                 return version, version + '+' + branch + '-' + tags
     else:
-        return '5.6.0', ''
+        return '5.6.1', ''
 
 # The short X.Y version.
 # The full version, including alpha/beta/rc tags.
@@ -196,6 +196,7 @@ def get_version_release_from_git():
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
+    ('latex_index', 'modules.tex', f'{project} documentation', author, 'manual'),
 ]
 
 
@@ -357,9 +358,9 @@ def ghcommit_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
     title = nodes.reference('', commit_id, refuri=commit_url)
     return [title], []
 
-# define new directive/role that can be used as .. subcmd::/:subcmd:,
-# .. mfcmd::/:mfcmd:, .. mfvar::/:mfvar: and .. sitevar::/:sitevar:
 def setup(app):
+    # define new directive/role that can be used as .. subcmd::/:subcmd:,
+    # .. mfcmd::/:mfcmd:, .. mfvar::/:mfvar: and .. sitevar::/:sitevar:
     app.add_object_type('subcmd', 'subcmd',
                         objname='module sub-command',
                         indextemplate='pair: %s; module sub-command',
@@ -385,3 +386,9 @@ def setup(app):
                         indextemplate='pair: %s; module configuration option')
     app.add_role('ghcommit', ghcommit_role)
 
+    # exclude latex index document on non-latex output builder
+    def on_builder_inited(app):
+        if app.builder.name != 'latex':
+            app.config.exclude_patterns.append('latex_index.rst')
+
+    app.connect('builder-inited', on_builder_inited)