Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
xdelaruelle committed Dec 13, 2024
1 parent ca8ef4c commit fde153f
Show file tree
Hide file tree
Showing 19 changed files with 46 additions and 43 deletions.
2 changes: 2 additions & 0 deletions .hunspell.en.dic
Original file line number Diff line number Diff line change
Expand Up @@ -1203,3 +1203,5 @@ B1000
A1000
nb
2d
envmodules
lightsteelblue
6 changes: 3 additions & 3 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Reporting issues
If you find a security vulnerability, please refer to our `security policy`_
for guidelines on how to report such issues responsibly.

.. _security policy: https://github.com/cea-hpc/modules/security
.. _security policy: https://github.com/envmodules/modules/security

.. _submitting-patches:

Expand Down Expand Up @@ -108,8 +108,8 @@ execute :file:`testsuite/modules.50-cmds/470-variant.exp` testfile, run::
Run :command:`script/mt` with ``--help`` option to get usage details and
syntax to select several testfiles.

.. _GitHub Actions: https://github.com/cea-hpc/modules/actions
.. _Cirrus CI: https://cirrus-ci.com/github/cea-hpc/modules
.. _GitHub Actions: https://github.com/envmodules/modules/actions
.. _Cirrus CI: https://cirrus-ci.com/github/envmodules/modules

.. _running-test-coverage:

Expand Down
2 changes: 1 addition & 1 deletion INSTALL-win.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Installation instructions
from the source tarball by the ``-win`` suffix in their name.

.. _SourceForge: https://sourceforge.net/projects/modules/files/Modules/
.. _GitHub: https://github.com/cea-hpc/modules/releases
.. _GitHub: https://github.com/envmodules/modules/releases

4. Unpack downloaded zip file then enter deflated directory and execute the
``INSTALL.bat`` script file found in it. This script installs files by
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.rst
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ under the name of ``modules`` or ``environment-modules``.
If you want to install Modules from sources, tarballs from all Modules'
releases can be retrieved from one of the following link:

* https://github.com/cea-hpc/modules/releases/
* https://github.com/envmodules/modules/releases/
* https://sourceforge.net/projects/modules/files/Modules/

For instance to download then unpack the last release of Modules:
Expand Down
4 changes: 2 additions & 2 deletions MIGRATING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3076,7 +3076,7 @@ A stack trace is also returned when an unknown error occurs in
("eval" body line 1)
invoked from within
"eval $execcmdlist"
Please report this issue at :noparse:`https://github.com/cea-hpc/modules/issues`
Please report this issue at :noparse:`https://github.com/envmodules/modules/issues`
Automatic default and latest symbolic versions
----------------------------------------------
Expand Down Expand Up @@ -4461,4 +4461,4 @@ please read the :ref:`changes` document.
A significant number of issues reported for v3.2 have been closed on v4.
List of these closed issues can be found at:

https://github.com/cea-hpc/modules/milestone/1?closed=1
https://github.com/envmodules/modules/milestone/1?closed=1
5 changes: 3 additions & 2 deletions NEWS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ Modules 5.6.0 (not yet released)
* Doc: improve Links, Community sections in documentation index and README
* Doc: improve Authors and Acknowledgments sections in README
* Doc: add :ref:`create-new-release` guide
* Update repository URL to https://github.com/envmodules/modules.

.. _Security policy: https://github.com/cea-hpc/modules/blob/main/SECURITY.md
.. _Security policy: https://github.com/envmodules/modules/blob/main/SECURITY.md


.. _5.5 release notes:
Expand Down Expand Up @@ -977,7 +978,7 @@ Modules 5.1.0 (2022-04-30)
* Mention tagging evaluation of a module, when tag list of an already loaded
module is updated.

.. _Code of conduct: https://github.com/cea-hpc/modules/blob/main/CODE_OF_CONDUCT.md
.. _Code of conduct: https://github.com/envmodules/modules/blob/main/CODE_OF_CONDUCT.md
.. _codespell: https://github.com/codespell-project/codespell
.. _Aspell: http://aspell.net/

Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# <img src="https://raw.githubusercontent.com/cea-hpc/modules/main/doc/img/modules_red.svg" height="180" alt="Modules"/>
# <img src="https://raw.githubusercontent.com/envmodules/modules/main/doc/img/modules_red.svg" height="180" alt="Modules"/>

[![Linux Build Status](https://github.com/cea-hpc/modules/workflows/linux-tests/badge.svg)](https://github.com/cea-hpc/modules/actions?query=workflow:linux-tests)
[![Windows Build Status](https://github.com/cea-hpc/modules/workflows/windows-tests/badge.svg)](https://github.com/cea-hpc/modules/actions?query=workflow:windows-tests)
[![FreeBSD/OS X/Linux Build Status](https://api.cirrus-ci.com/github/cea-hpc/modules.svg)](https://cirrus-ci.com/github/cea-hpc/modules)
[![Coverage Status](https://codecov.io/gh/cea-hpc/modules/branch/main/graph/badge.svg)](https://codecov.io/gh/cea-hpc/modules)
[![Linux Build Status](https://github.com/envmodules/modules/workflows/linux-tests/badge.svg)](https://github.com/envmodules/modules/actions?query=workflow:linux-tests)
[![Windows Build Status](https://github.com/envmodules/modules/workflows/windows-tests/badge.svg)](https://github.com/envmodules/modules/actions?query=workflow:windows-tests)
[![FreeBSD/OS X/Linux Build Status](https://api.cirrus-ci.com/github/envmodules/modules.svg)](https://cirrus-ci.com/github/envmodules/modules)
[![Coverage Status](https://codecov.io/gh/envmodules/modules/branch/main/graph/badge.svg)](https://codecov.io/gh/envmodules/modules)
[![Documentation Status](https://readthedocs.org/projects/modules/badge/?version=latest)](https://modules.readthedocs.io/en/latest/?badge=latest)
[![Packaging status](https://repology.org/badge/tiny-repos/environment-modules.svg)](https://repology.org/metapackage/environment-modules/versions)
[![Twitter](https://img.shields.io/twitter/url/https/twitter.com/EnvModules.svg?style=social&label=Follow)](https://twitter.com/EnvModules)
Expand Down Expand Up @@ -133,8 +133,8 @@ Links

* Web site: http://modules.sourceforge.net
* Online documentation: https://modules.readthedocs.io
* GitHub source repository: https://github.com/cea-hpc/modules
* GitHub Issue tracking system: https://github.com/cea-hpc/modules/issues
* GitHub source repository: https://github.com/envmodules/modules
* GitHub Issue tracking system: https://github.com/envmodules/modules/issues
* SourceForge project page: http://sourceforge.net/projects/modules/


Expand Down Expand Up @@ -198,5 +198,5 @@ be what it is without their contributions:
[8]: https://mast.hpc.social/@EnvModules
[9]: https://bsky.app/profile/envmodules.bsky.social
[10]: CODE_OF_CONDUCT.md
[11]: https://github.com/cea-hpc/modules/graphs/contributors
[11]: https://github.com/envmodules/modules/graphs/contributors
[12]: https://www.cea.fr/english
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ available as patch (`x.y.1`, `x.y.2`, etc.) releases.

You can report a vulnerability using GitHub's private reporting feature:

1. Go to [github.com/cea-hpc/modules/security](https://github.com/cea-hpc/modules/security).
1. Go to [github.com/envmodules/modules/security](https://github.com/envmodules/modules/security).
2. Click "Report a vulnerability" in the upper right corner of that page.
3. Fill out the form and submit your draft security advisory.

Expand Down
2 changes: 1 addition & 1 deletion doc/source/changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Modules 4

This section provides the list of differences with Modules version 3.2. This version of Modules is also referred in this document as *compatibility version*. Modules 4 is based on what was previously called Modules-Tcl. Comparison takes as a basis version ``3.2.10`` of compatibility version against Modules version ``4.0``. Any change made past these versions will explicitly mention the release number starting from the difference appears or disappears.

.. note:: The numerous bugs or limitations spotted on Modules ``3.2`` across the years have been fixed in Modules ``4.0``. The list of reported issues that have been solved are available on `the project code forge <https://github.com/cea-hpc/modules/milestone/1?closed=1>`_.
.. note:: The numerous bugs or limitations spotted on Modules ``3.2`` across the years have been fixed in Modules ``4.0``. The list of reported issues that have been solved are available on `the project code forge <https://github.com/envmodules/modules/milestone/1?closed=1>`_.

Removed or changed features
^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
6 changes: 3 additions & 3 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def get_version_release_from_git():
html_context = {
'conf_py_path': '/doc/source/',
'display_github': True,
'github_user': 'cea-hpc',
'github_user': 'envmodules',
'github_repo': 'modules',
'github_version': 'main',
}
Expand Down Expand Up @@ -263,7 +263,7 @@ def get_version_release_from_git():
rst_epilog += '.. |bold modulefilesdir| replace:: **%s**\n' % modulefilesdir
rst_epilog += '.. |file modulefilesdir| replace:: :file:`%s`\n' % modulefilesdir
rst_epilog += '.. |code version| replace:: ``%s``\n' % version
rst_epilog += '.. |gh_tgz_dl_url| replace:: https://github.com/cea-hpc/modules/releases/download/v%s/modules-%s.tar.gz\n' % (version, version)
rst_epilog += '.. |gh_tgz_dl_url| replace:: https://github.com/envmodules/modules/releases/download/v%s/modules-%s.tar.gz\n' % (version, version)

# define roles used to color text in parsed-literal to render output like in terminal
rst_epilog += """.. role:: noparse
Expand Down Expand Up @@ -352,7 +352,7 @@ def parse_opt_args_node(env, sig, signode):
from docutils import nodes
def ghcommit_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
commit_id = str(text)
commit_url = 'https://github.com/cea-hpc/modules/commit/' + commit_id
commit_url = 'https://github.com/envmodules/modules/commit/' + commit_id
title = nodes.reference('', commit_id, refuri=commit_url)
return [title], []

Expand Down
2 changes: 1 addition & 1 deletion doc/source/cookbook/compiler-etc-dependencies.rst
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ installed. To avoid requiring you to update lines in numerous
files, we require you to set the environment variable
``MOD_GIT_ROOTDIR`` to location where the modules git working directory
was cloned. E.g., if you issued the command
``git clone https://github.com/cea-hpc/modules.git ~/modules.test``
``git clone https://github.com/envmodules/modules.git ~/modules.test``
you should set ``MOD_GIT_ROOTDIR`` to ``~/modules.test``. Please
ensure it is exported (use ``setenv`` in csh and related shells,
or ``export`` in Bourne derived shells like bash). This is just
Expand Down
6 changes: 3 additions & 3 deletions doc/source/cookbook/modulefiles-in-git.rst
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,20 @@ Modules 4.1). Your modulerc should have::
module use /\$MODULES_REPO

(The extra slash required before \$MODULES_REPO is a `bug
<https://github.com/cea-hpc/modules/issues/223>`_ to be fixed in
<https://github.com/envmodules/modules/issues/223>`_ to be fixed in
4.2.3.)

Copy the ``localmodules`` file from the Modules source tree to your
repo::

cd /home/modules/modulefiles
curl --output localmodules https://raw.githubusercontent.com/cea-hpc/modules/main/doc/example/modulefiles-in-git/modulefiles/localmodules
curl --output localmodules https://raw.githubusercontent.com/envmodules/modules/main/doc/example/modulefiles-in-git/modulefiles/localmodules

Edit paths in the top of ``localmodules``, if your installation
differs from the assumptions, then::

git add localmodules
git commit -m 'Add localmodules from github.com/cea-hpc/modules'
git commit -m 'Add localmodules from github.com/envmodules/modules'

Usage example
-------------
Expand Down
6 changes: 3 additions & 3 deletions doc/source/design/create-new-release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -113,17 +113,17 @@ target of online document should also point to the new release. It may be
verified at:

* http://modules.sf.net
* http://cea-hpc.github.io/modules/
* http://envmodules.github.io/modules/
* https://modules.readthedocs.io/en/stable/NEWS.html

Change *Default Download* on `SourceForge Files`_ page. Set the ``.tar.gz``
dist ball of the new release as the new default.

.. _SourceForge Files: https://sourceforge.net/projects/modules/files/Modules/

Close milestone on GitHub at https://github.com/cea-hpc/modules/milestones
Close milestone on GitHub at https://github.com/envmodules/modules/milestones

Create release on GitHub at https://github.com/cea-hpc/modules/releases/new:
Create release on GitHub at https://github.com/envmodules/modules/releases/new:

* Release title is bare version number ``X.Y.Z``
* Attach ``.tar.gz``, ``.tar.bz2`` and ``-win.zip`` artifacts to the release
Expand Down
16 changes: 8 additions & 8 deletions doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
Environment Modules
===================

.. image:: https://img.shields.io/github/stars/cea-hpc/modules
:target: https://github.com/cea-hpc/modules
.. image:: https://img.shields.io/github/stars/envmodules/modules
:target: https://github.com/envmodules/modules
:alt: GitHub Repository

.. image:: https://img.shields.io/github/license/cea-hpc/modules?color=lightsteelblue
.. image:: https://img.shields.io/github/license/envmodules/modules?color=lightsteelblue
:alt: GitHub License

.. image:: https://img.shields.io/github/v/release/cea-hpc/modules
:target: https://github.com/cea-hpc/modules/releases/latest
.. image:: https://img.shields.io/github/v/release/envmodules/modules
:target: https://github.com/envmodules/modules/releases/latest
:alt: GitHub Release

.. image:: https://img.shields.io/twitter/url/https/twitter.com/EnvModules.svg?style=social&label=@EnvModules
Expand Down Expand Up @@ -145,9 +145,9 @@ Links

* Web site: http://modules.sourceforge.net
* Documentation: https://modules.readthedocs.io
* Source repository: https://github.com/cea-hpc/modules
* Issue tracking system: https://github.com/cea-hpc/modules/issues
* Download releases: https://github.com/cea-hpc/modules/releases
* Source repository: https://github.com/envmodules/modules
* Issue tracking system: https://github.com/envmodules/modules/issues
* Download releases: https://github.com/envmodules/modules/releases

Community
---------
Expand Down
2 changes: 1 addition & 1 deletion doc/source/module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5321,7 +5321,7 @@ ENVIRONMENT
.. envvar:: MODULES_WA_277

If set to ``1`` prior to Modules package initialization, enables workaround
for Tcsh history issue (see https://github.com/cea-hpc/modules/issues/277).
for Tcsh history issue (see https://github.com/envmodules/modules/issues/277).
This issue leads to erroneous history entries under Tcsh shell. When
workaround is enabled, an alternative *module* alias is defined which fixes
the history mechanism issue. However the alternative definition of the
Expand Down
2 changes: 1 addition & 1 deletion script/mrel
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ set exitcode 0
set rpmbuilddir $env(HOME)/rpmbuild
set srpmdir $rpmbuilddir/SRPMS
set rpmdir $rpmbuilddir/RPMS/$tcl_platform(machine)
set dlurl https://github.com/cea-hpc/modules/releases/download
set dlurl https://github.com/envmodules/modules/releases/download
set cwd [pwd]

# define and open log file
Expand Down
2 changes: 1 addition & 1 deletion share/modulefiles/module-git
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ proc ModulesHelp {} {

module-whatis {gets last version of the module sources from GitHub}

set-alias get-modules {git clone git://github.com/cea-hpc/modules.git && cd modules}
set-alias get-modules {git clone git://github.com/envmodules/modules.git && cd modules}

if {[module-info mode load]} {
ModulesHelp
Expand Down
2 changes: 1 addition & 1 deletion tcl/report.tcl.in
Original file line number Diff line number Diff line change
Expand Up @@ -2212,7 +2212,7 @@ proc reportFinalError {error_msg} {
if {$add_report_link} {
append error_msg \n[sgr hi {Please report this issue at\
https://github.com/cea-hpc/modules/issues}]
https://github.com/envmodules/modules/issues}]
}
}
Expand Down
4 changes: 2 additions & 2 deletions testsuite/modules.00-init/120-siteconfig.exp
Original file line number Diff line number Diff line change
Expand Up @@ -161,15 +161,15 @@ lappend ans { "unk_foo"}
lappend ans { (procedure "reportVersion" line 2)}
lappend ans { invoked from within}
lappend ans { "reportVersion"}
lappend ans { Please report this issue at https://github.com/cea-hpc/modules/issues}
lappend ans { Please report this issue at https://github.com/envmodules/modules/issues}
testouterr_cmd sh {-V} ERR [join $ans \n]
unsetenv_var TESTSUITE_ENABLE_SITECONFIG_BROKEN2
setenv_var TESTSUITE_ENABLE_SITECONFIG_BROKEN3 1
set ans [list]
lappend ans "$error_msgs: invalid command name \"reportVersion\""
lappend ans { while executing}
lappend ans { "reportVersion"}
lappend ans { Please report this issue at https://github.com/cea-hpc/modules/issues}
lappend ans { Please report this issue at https://github.com/envmodules/modules/issues}
testouterr_cmd sh {-V} ERR [join $ans \n]
unsetenv_var TESTSUITE_ENABLE_SITECONFIG_BROKEN3

Expand Down

0 comments on commit fde153f

Please sign in to comment.