Skip to content

Commit

Permalink
Merge pull request #678 from boegel/eb433
Browse files Browse the repository at this point in the history
release EasyBuild v4.3.3
  • Loading branch information
boegel authored Feb 23, 2021
2 parents b71d3e7 + 191950e commit b7c4f5b
Show file tree
Hide file tree
Showing 50 changed files with 2,903 additions and 964 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check_with_codespell.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
codespell --skip='.git,version-specific,scripts' --ignore-words-list=atleast,ninjs,simpy,proovread,namd --quiet-level=2; retVal=$?; if [ $retVal -eq 1 ]; then echo 'Got one expected warning, so success!'; else $(exit $retVal); fi;
codespell --skip='.git,version-specific,scripts' --ignore-words-list=atleast,ninjs,simpy,proovread,namd,precice --quiet-level=2; retVal=$?; if [ $retVal -eq 1 ]; then echo 'Got one expected warning, so success!'; else $(exit $retVal); fi;
13 changes: 8 additions & 5 deletions .github/workflows/scripts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ jobs:
run: |
sudo apt-get install lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl-dev
# fix for lua-posix packaging issue, see https://bugs.launchpad.net/ubuntu/+source/lua-posix/+bug/1752082
sudo ln -s /usr/lib/x86_64-linux-gnu/lua/5.2/posix_c.so /usr/lib/x86_64-linux-gnu/lua/5.2/posix.so
# needed for Ubuntu 18.04, but not for Ubuntu 20.04, so skipping symlinking if posix.so already exists
if [ ! -e /usr/lib/x86_64-linux-gnu/lua/5.2/posix.so ] ; then
sudo ln -s /usr/lib/x86_64-linux-gnu/lua/5.2/posix_c.so /usr/lib/x86_64-linux-gnu/lua/5.2/posix.so
fi
# use script provided by easybuild-framework to install recent Lmod
source install_eb_dep.sh Lmod-8.3.8 $HOME
echo $MOD_INIT > $HOME/mod_init
Expand All @@ -36,7 +39,7 @@ jobs:
export PATH=$(cat $HOME/path)
cd $HOME/${{matrix.repo}}
git checkout master
git checkout main
# file to figure out the version from depends on repo
if [[ ${{matrix.repo}} == "easybuild-framework" ]]; then
Expand Down Expand Up @@ -65,12 +68,12 @@ jobs:
cd ${{matrix.repo}}
# script should make sure we're on master branch
# script should make sure we're on main branch
git checkout develop &> /dev/null
($GITHUB_WORKSPACE/scripts/create_source_tarball.sh ${{matrix.repo}} $version 2>&1 | tee $out) || true
grep "ERROR: Not on master branch" $out
grep "ERROR: Not on main branch" $out
echo "Expected error found in output: OK!"
git checkout master &> /dev/null
git checkout main &> /dev/null
echo "================================================================================================"
Expand Down
13 changes: 6 additions & 7 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,15 @@ have any questions or suggestions, you can post them there.
Only members can post to this mailinglist. To request membership, see
https://lists.ugent.be/wws/info/easybuild.

IRC
^^^
Slack/IRC
^^^^^^^^^

An IRC channel #easybuild has been set up on the FreeNode network.
Contact the EasyBuild community via Slack: https://easybuild.slack.com,
self-request an invite via https://easybuild-slack.herokuapp.com.

Just connect your IRC client to the irc.freenode.net server, and join
the #easybuild channel.
An IRC channel #easybuild has been set up on the FreeNode network.

There is an IRC bot present (easybuilder). Just type !help to get
pointers to the available commands.
Just connect your IRC client to the chat.freenode.net server, and join the #easybuild channel.

Twitter
^^^^^^^
Expand Down
2 changes: 1 addition & 1 deletion docs/Archived-easyconfigs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Once in a blue moon, we review the list of toolchains (& versions) that are incl

Easyconfig files that use toolchains that become *deprecated* are then moved to the *easyconfigs archive*,
i.e. the ``__archive__`` subdirectory in the ``easybuild-easyconfigs`` repository
(see https://github.com/easybuilders/easybuild-easyconfigs/tree/master/easybuild/easyconfigs/__archive__).
(see https://github.com/easybuilders/easybuild-easyconfigs/tree/main/easybuild/easyconfigs/__archive__).

.. _archived_easyconfigs_deprecated_toolchains_what:

Expand Down
1 change: 1 addition & 0 deletions docs/Changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Changelog for EasyBuild documentation

(for EasyBuild release notes, see :ref:`release_notes`)

* **release 20210223.01** (`Feb 23rd 2021`): update release notes for EasyBuild v4.3.3 (see :ref:`release_notes_eb433`)
* **release 20201210.01** (`Dec 10th 2020`): update release notes for EasyBuild v4.3.2 (see :ref:`release_notes_eb432`)
* **release 20201029.01** (`Oct 29th 2020`): update release notes for EasyBuild v4.3.1 (see :ref:`release_notes_eb431`)
* **release 20200913.01** (`Sep 13th 2020`): update release notes for EasyBuild v4.3.0 (see :ref:`release_notes_eb430`)
Expand Down
8 changes: 4 additions & 4 deletions docs/Contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -428,10 +428,10 @@ you should use the GitHub interface, and follow the steps outlined below.

i. visit https://github.com/EXAMPLE/easybuild-framework;
ii. switch to the branch that includes the changes you want to contribute
using the '``Branch: master``' button on the left,
using the '``Branch: main``' button on the left,
for example by selecting ``Branch: mybranch`` from the dropdown list
iii. click the '``New pull request``' button;
iv. change the target branch to ``develop`` using the '``base: master``' button;
iv. change the target branch to ``develop`` using the '``base: main``' button;
v. review your changes using the 'diff' view presented by GitHub;
vi. provide an appropriate title and description for your contribution;
vii. open the pull request by clicking the green '``Create pull request``' button
Expand Down Expand Up @@ -525,8 +525,8 @@ Requirements for pull requests
**Pull requests are only merged in the** '``develop``' **branch** of the EasyBuild repositories,
which contains the changes that will be included in the next EasyBuild release.

The '``master``' branch provides the latest stable release of EasyBuild at all times.
Only the EasyBuild release manager should issue a pull request to the EasyBuild '``master``' branch,
The '``main``' branch provides the latest stable release of EasyBuild at all times.
Only the EasyBuild release manager should issue a pull request to the EasyBuild '``main``' branch,
when preparing a new EasyBuild release.

Occasionally, an additional version branch (e.g. '``3.3.x``') may be introduced temporarily,
Expand Down
4 changes: 2 additions & 2 deletions docs/Implementing-easyblocks.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Easyblocks can either be *generic* or *software-specific*.
Generic easyblocks implement a 'standard' software build and installation procedure that is used by multiple different
software packages.
A commonly used example is the
`ConfigureMake <https://github.com/easybuilders/easybuild-easyblocks/blob/master/easybuild/easyblocks/generic/configuremake.py>`_
`ConfigureMake <https://github.com/easybuilders/easybuild-easyblocks/blob/main/easybuild/easyblocks/generic/configuremake.py>`_
generic easyblock, which implements the standard ``configure`` - ``make`` - ``make install`` installation procedure used
by most GNU software packages.

Expand Down Expand Up @@ -176,7 +176,7 @@ Generic easyblocks are located in the ``easybuid.easyblocks.generic`` namespace,
live in the ``easybuild.easyblocks`` namespace directly. To keep things organised, the actual Python module file
for software-specific easyblocks are kept in 'letter' subdirectories,
rather than in one large '``easyblocks``' directory
(see https://github.com/easybuilders/easybuild-easyblocks/blob/master/easybuild/easyblocks/).
(see https://github.com/easybuilders/easybuild-easyblocks/blob/main/easybuild/easyblocks/).

Note that you shouldn't concern yourself too much with getting the location of an easyblock right, as long as you
use ``--include-easyblocks`` to make EasyBuild use additional or customised easyblocks
Expand Down
2 changes: 1 addition & 1 deletion docs/Installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ To upgrade to a newer EasyBuild version (say, |version|) than the one currently
* using the easyconfig file available on the develop branch at Github <https://github.com/easybuilders/easybuild-easyconfigs/tree/develop/easybuild/easyconfigs/e/EasyBuild>`__

* install EasyBuild version |version| from PyPI, using one of the standard Python installation tools (``easy_install``, ``pip``, ...), see also :ref:`alt_inst_easy_install_pip`
* update the ``master`` branch of your Git working copies of the different EasyBuild repositories
* update the ``main`` branch of your Git working copies of the different EasyBuild repositories

.. _dependencies:

Expand Down
4 changes: 2 additions & 2 deletions docs/Installation_Alternative.rst
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ Installation of latest release from GitHub
To install the latest (stable) release of an EasyBuild package directly
from GitHub, use the following command::

pip install --install-option "--prefix=$HOME/EasyBuild" https://github.com/easybuilders/easybuild-framework/archive/master.tar.gz
pip install --install-option "--prefix=$HOME/EasyBuild" https://github.com/easybuilders/easybuild-framework/archive/main.tar.gz

Again, the order in which the EasyBuild packages are installed is
important to have full control over the installation process, see
Expand Down Expand Up @@ -202,7 +202,7 @@ It can be used as follows::
# pick an installation prefix (adjust as you like)
INSTALL_PREFIX=$(mktemp -d $HOME/EasyBuild-XXXXXX)
# download script
curl -O https://raw.githubusercontent.com/easybuilders/easybuild-framework/master/easybuild/scripts/install-EasyBuild-develop.sh
curl -O https://raw.githubusercontent.com/easybuilders/easybuild-framework/main/easybuild/scripts/install-EasyBuild-develop.sh
# run downloaded script, specifying *your* GitHub username and the installation prefix
bash install-EasyBuild-develop.sh GITHUB_USERNAME $INSTALL_PREFIX
# update $MODULEPATH via 'module use', and load the module
Expand Down
Loading

0 comments on commit b7c4f5b

Please sign in to comment.