Skip to content

Commit

Permalink
Merge pull request #647 from boegel/master
Browse files Browse the repository at this point in the history
release EasyBuild v4.3.0
  • Loading branch information
boegel authored Sep 13, 2020
2 parents 20d819b + 8e7b2f8 commit ea76fe8
Show file tree
Hide file tree
Showing 15 changed files with 1,714 additions and 604 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Static Analysis
on: [push, pull_request]
jobs:
python-linting:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2

- name: set up Python
uses: actions/setup-python@v1
with:
python-version: 3.8

- name: install Python packages
run: |
pip install --upgrade pip
pip install --upgrade flake8
- name: Run flake8 to verify PEP8-compliance of Python code
run: flake8 -j3
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ LICENSE_HEADER
*.swp
*.nja
build/
/docs/_build/
dist/
*egg-info/
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 20200913.01** (`Sep 13th 2020`): update release notes for EasyBuild v4.3.0 (see :ref:`release_notes_eb430`)
* **release 20200708.01** (`July 8th 2020`): update release notes for EasyBuild v4.2.2 (see :ref:`release_notes_eb422`)
* **release 20200520.01** (`May 20th 2020`): update release notes for EasyBuild v4.2.1 (see :ref:`release_notes_eb421`)
* **release 20200414.01** (`Apr 14th 2020`):
Expand Down
23 changes: 12 additions & 11 deletions docs/Contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ Updating existing pull requests
Please consider using ``eb --update-pr`` instead, see :ref:`github_update_pr`.

It is quite common to update a pull request after creating it,
for example if Travis reports problems with the changes being made, or as a response
for example if the test suite run in GitHub Actions reports problems with the changes being made, or as a response
to someone reviewing your contribution.

To update an existing pull request, it suffices to add commits to the branch
Expand All @@ -464,7 +464,7 @@ For example, to update the pull request that was created using the ``mybranch``
git commit -m "example commit message for additional changes"
git push origin mybranch
Updating a pull request will trigger Travis to re-test your contribution,
Updating a pull request will trigger GitHub Actions to re-test your contribution,
and a notification will be sent out to whoever is 'watching' your pull request.


Expand All @@ -473,7 +473,7 @@ and a notification will be sent out to whoever is 'watching' your pull request.
Merging of pull requests
~~~~~~~~~~~~~~~~~~~~~~~~

Once your pull request has been given the green light by Travis and one or more
Once your pull request has been given the green light by GitHub Actions and one or more
people reviewing have approved the changes, it can be merged into
the ``develop`` branch.

Expand Down Expand Up @@ -501,7 +501,7 @@ Requirements for pull requests

(i) *the PR must target the* ``develop`` *branch of the repository*; see :ref:`contributing_review_process_develop_branch`

(ii) *the test suite must (still) pass*, i.e. Travis *must* give a green light; see :ref:`contributing_review_process_travis`
(ii) *the test suite must (still) pass*, i.e. GitHub Actions *must* give a green light; see :ref:`contributing_review_process_travis`

* *tests should be added or enhanced when appropriate*; see :ref:`contributing_review_process_adding_tests`,
especially for PRs to the ``easybuild-framework`` repository
Expand Down Expand Up @@ -532,17 +532,18 @@ when preparing a new EasyBuild release.
Occasionally, an additional version branch (e.g. '``3.3.x``') may be introduced temporarily,
in case an intermittent bugfix release is being worked on.

.. _contributing_review_process_travis:
.. _contributing_review_process_github_actions:

Test suite (Travis)
~~~~~~~~~~~~~~~~~~~
Test suite (GitHub Actions)
~~~~~~~~~~~~~~~~~~~~~~~~~~~

Each pull request is tested automatically by Travis and the test result is reported in the pull request.
Each pull request is tested automatically by `GitHub Actions <https://github.com/features/actions>`_
and the test result is reported in the pull request.

**Only pull requests that have been tested and approved by Travis are
**Only pull requests that have been tested and approved by GitHub Actions are
eligible for being merged!**

Note that Travis will only run the *test suite* for that particular repository.
Note that GitHub Actions will only run the *test suite* for that particular repository.
That is, for easyconfig contributions it does *not* include
actually building and installing software.

Expand Down Expand Up @@ -612,7 +613,7 @@ be contributed can be performed via ``eb --check-contrib``. This will check:
* style aspects for the specified easyconfig files
* whether SHA256 checksums are included for all source files & patches

This check is also a part of the test suite run by Travis for easyconfig PRs.
This check is also a part of the test suite run by GitHub Actions for easyconfig PRs.


.. _contributing_review_process_review_pr:
Expand Down
4 changes: 2 additions & 2 deletions docs/Integration_with_GitHub.rst
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ for pull requests based on an outdated branch in which easyconfigs are changed t
as well.

As such, the exact semantics of ``--from-pr`` depends on the state of the specified pull request, i.e. whether or not
the pull request was merged already, whether the pull request is mergeable and stable (as indicated by Travis), etc.
the pull request was merged already, whether the pull request is mergeable and stable (as indicated by GitHub Actions), etc.

.. _github_from_pr_vs_develop_open_stable_prs:

Expand Down Expand Up @@ -279,7 +279,7 @@ For closed and unstable pull requests, only the branch corresponding to the pull
which aligns with the semantics of ``--from-pr`` as it was before EasyBuild v2.9.0. In this case, the current
``develop`` branch is *not* taken into account.

.. note:: A pull request is considered unstable when GitHub reports merge conflicts or when Travis reports
.. note:: A pull request is considered unstable when GitHub reports merge conflicts or when GitHub Actions reports
one or more failing tests.


Expand Down
Loading

0 comments on commit ea76fe8

Please sign in to comment.