Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
a0574a9
bump version to 3.3.1.dev0
boegel Jun 26, 2017
25b012f
Merge pull request #2246 from boegel/develop
boegel Jun 26, 2017
04797ff
resolve symlinks to location of 'eb' in get_paths_for
boegel Jun 27, 2017
6d939d7
add test for get_paths_for
boegel Jun 27, 2017
4aceab5
fallback to checking location relative to 'eb' location in find_eb_sc…
boegel Jun 28, 2017
7da3a31
enhance test for find_eb_script, mention both considered locations in…
boegel Jun 28, 2017
f69673b
Merge pull request #2248 from boegel/resolve_symlink_get_paths_for
boegel Jun 28, 2017
b85dfb4
User-specific module path was not respecting...
Jun 28, 2017
63d71cd
Don't use absolute path for user modules dir
Jun 28, 2017
8dab289
Fix broken test
Jun 28, 2017
6abe62b
Update easyblock.py
Jun 28, 2017
7b17ecb
Explicitly set suffix_modules_path build option
Jun 28, 2017
0b1f590
Update easyblock.py
Jun 29, 2017
718d2a3
Damn you regex!
Jun 29, 2017
daa0228
Merge pull request #2250 from ocaisa/patch-4
boegel Jun 29, 2017
47d1ea0
add support for 'allow_prepend_abs_path' easyconfig parameter
boegel Jun 29, 2017
1cba74c
Merge pull request #2249 from boegel/find_eb_script_fallback
boegel Jun 30, 2017
05eafc0
Merge pull request #2254 from boegel/allow_prepend_abs_path
boegel Jul 1, 2017
c9fae14
update EasyBuild bootstrap script to download distribute tarball from…
boegel Jul 4, 2017
f167e13
bump version in bootstrap script
boegel Jul 4, 2017
d28755d
use SHA256 checksum for bootstrap script
boegel Jul 5, 2017
fce006b
fix target GitHub account/organisation for --new-pr & co
boegel Jul 5, 2017
59f594c
fix tests that got broken by migration to github.com/easybuilders
boegel Jul 5, 2017
edb74d8
fix URLS in install_eb_dep.sh script used by Travis
boegel Jul 5, 2017
a31f5a1
fix typo in URL for EasyBuild website in install_eb_dep.sh script
boegel Jul 5, 2017
c97807e
Merge pull request #2258 from boegel/fix_new_pr
Jul 5, 2017
575a8fe
Merge branch 'develop' into easybuilders_bootstrap
boegel Jul 5, 2017
a3c378c
fix checking whether copied easyconfigs are new, check *before* copyi…
boegel Jul 6, 2017
0aac21c
pick up commit msg as PR title if none was specified, rather than enf…
boegel Jul 6, 2017
3935c70
enhance test for copy_easyconfigs
boegel Jul 6, 2017
3b65eb7
enhance test for --new-pr
boegel Jul 6, 2017
7103379
fix refs to hpcugent in test_download_repo
boegel Jul 6, 2017
bddcd12
remove irrelevant commnent in Travis config
boegel Jul 6, 2017
e9ec8a3
fix broken test
boegel Jul 6, 2017
83b4180
fix variable name for SHA256 checksum
boegel Jul 6, 2017
f355af6
Merge pull request #2256 from boegel/easybuilders_bootstrap
damianam Jul 6, 2017
076a64a
give custom commit msg priority for PR title over auto-derived title
boegel Jul 6, 2017
f9475f3
clarify comment in test_copy_easyconfigs, drop duplicate check
boegel Jul 6, 2017
afd40c6
Merge pull request #2259 from boegel/new_pr_fixes
damianam Jul 6, 2017
c1fdb81
use https URL in bootstrap stage 0 to download distribute tarball
boegel Jul 6, 2017
4c2f6ae
get rid of references to hpcugent after move to github.com/easybuilders
boegel Jul 6, 2017
a5c591f
fix broken tests
boegel Jul 6, 2017
ada3646
automatically enable --ignore-osdeps under --new-pr and --update-pr
boegel Jul 6, 2017
13b408c
use https:// URL for easybuild.readthedocs.io
boegel Jul 7, 2017
accf310
fix README w.r.t. vsc-base as dependency
boegel Jul 7, 2017
c556f68
fix remarks in tests
boegel Jul 7, 2017
72c592c
fix broken tests
boegel Jul 7, 2017
2178a5e
Merge pull request #2261 from boegel/migration_to_easybuilders
wpoely86 Jul 7, 2017
36431db
add --merge-pr & (empty) corresponding merge_pr function
boegel Jul 7, 2017
6264746
enhance print_msg to support printing messages to stderr
boegel Jul 7, 2017
6695131
implement check_pr_eligible_to_merge function
boegel Jul 7, 2017
ec93b26
complete implementation of merge_pr function
boegel Jul 7, 2017
c3a5d2d
add test for --merge-pr
boegel Jul 7, 2017
d203a35
fix broken test for --list-software
boegel Jul 7, 2017
3bb0062
fix typo in docstring for print_msg
boegel Jul 8, 2017
8950f37
occured -> occurred
boegel Jul 8, 2017
2e411c8
check for approvied review rather than 'lgtm' in comments, refuse to …
boegel Jul 8, 2017
c046620
prepare release notes for eb331
migueldiascosta Jul 10, 2017
96e3938
Merge pull request #24 from migueldiascosta/eb331
boegel Jul 10, 2017
03a2d3f
fix @damianam's remarks
boegel Jul 10, 2017
31b2bb1
also include #2262 & #2266 in EasyBuild v3.3.1 release notes
boegel Jul 10, 2017
17789d5
only require test reports for easyconfig PRs
boegel Jul 11, 2017
30ad5ec
enhance test for --merge-pr to also test on an easyblocks PR
boegel Jul 11, 2017
f75d294
Merge pull request #2266 from boegel/merge_pr
damianam Jul 11, 2017
6bdee13
Merge branch 'eb331' of github.com:hpcugent/easybuild-framework into …
boegel Jul 11, 2017
8a65f25
Merge pull request #2262 from boegel/ignore_osdeps_new_update_pr
damianam Jul 11, 2017
0e58fa7
bump version to 3.3.1
boegel Jul 12, 2017
3a07ecc
Merge pull request #2271 from boegel/eb331
damianam Jul 12, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,15 @@ script:
# run test suite
- python -O -m test.framework.suite
# check bootstrap script version
# version and MD5 are hardcoded below to avoid forgetting to update the version in the script along with contents
# version and SHA256 checksum are hardcoded below to avoid forgetting to update the version in the script along with contents
- EB_BOOTSTRAP_VERSION=$(grep '^EB_BOOTSTRAP_VERSION' $TRAVIS_BUILD_DIR/easybuild/scripts/bootstrap_eb.py | sed 's/[^0-9.]//g')
- EB_BOOTSTRAP_MD5SUM=$(md5sum $TRAVIS_BUILD_DIR/easybuild/scripts/bootstrap_eb.py | cut -f1 -d' ')
- EB_BOOTSTRAP_FOUND="$EB_BOOTSTRAP_VERSION $EB_BOOTSTRAP_MD5SUM"
- EB_BOOTSTRAP_EXPECTED="20170503.01 fdf8ca02b6600c4ce0b6a02b88f1f40a"
- EB_BOOTSTRAP_SHA256SUM=$(sha256sum $TRAVIS_BUILD_DIR/easybuild/scripts/bootstrap_eb.py | cut -f1 -d' ')
- EB_BOOTSTRAP_FOUND="$EB_BOOTSTRAP_VERSION $EB_BOOTSTRAP_SHA256SUM"
- EB_BOOTSTRAP_EXPECTED="20170706.01 484b3ae32ca7057de2ccc83820927bdaf0f4e3d3be6cda1747ec80449509a0e9"
- test "$EB_BOOTSTRAP_FOUND" = "$EB_BOOTSTRAP_EXPECTED" || (echo "Version check on bootstrap script failed $EB_BOOTSTRAP_FOUND" && exit 1)
# test bootstrap script
- python $TRAVIS_BUILD_DIR/easybuild/scripts/bootstrap_eb.py /tmp/$TRAVIS_JOB_ID/eb_bootstrap
# unset $PYTHONPATH to avoid mixing two EasyBuild 'installations' when testing bootstrapped EasyBuild module
- unset PYTHONPATH
# simply sanity check on bootstrapped EasyBuild module
# note: temporarily disabled because bootstrap test fails, cfr. https://github.com/hpcugent/easybuild-framework/issues/1869
- module use /tmp/$TRAVIS_JOB_ID/eb_bootstrap/modules/all; module load EasyBuild; eb --version
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under different terms from the Initial License or this Contributor Agreement.

### Fork easybuild-framework

First, you'll need to fork [easybuild-framework on GitHub](http://github.com/hpcugent/easybuild-framework).
First, you'll need to fork [easybuild-framework on GitHub](https://github.com/easybuilders/easybuild-framework).

If you do not have a (free) GitHub account yet, you'll need to get one.

Expand All @@ -43,10 +43,10 @@ Pull the _develop_ branch from the main easybuild-framework repository:

```bash
cd easybuild
git remote add github_hpcugent [email protected]:hpcugent/easybuild-framework.git
git remote add github_easybuilders [email protected]/easybuilders/easybuild-framework.git
git branch develop
git checkout develop
git pull github_hpcugent develop
git pull github_easybuilders develop
```

### Keep develop up-to-date
Expand All @@ -57,7 +57,7 @@ Make sure you update it every time you create a feature branch (see below):

```bash
git checkout develop
git pull github_hpcugent develop
git pull github_easybuilders develop
```


Expand All @@ -67,7 +67,7 @@ git pull github_hpcugent develop
### Pick a branch name

Please try and follow these guidelines when picking a branch name:
* use the number of the issue as a prefix for your branch name, e.g. `86_` for issue [#86](https://github.com/hpcugent/easybuild-framework/issues/86)
* use the number of the issue as a prefix for your branch name, e.g. `86_` for issue [#86](https://github.com/easybuilders/easybuild-framework/issues/86)
* append a short but descriptive branch name, in which words are joined by underscores, e.g. `86_encoding_scheme`

### Create branch
Expand Down Expand Up @@ -131,7 +131,7 @@ If you're contributing code to an existing issue you can also convert the issue
GITHUBUSER=your_username && PASSWD=your_password && BRANCH=branch_name && ISSUE=issue_number && \
curl --user "$GITHUBUSER:$PASSWD" --request POST \
--data "{\"issue\": \"$ISSUE\", \"head\": \"$GITHUBUSER:$BRANCH\", \"base\": \"develop\"}" \
https://api.github.com/repos/hpcugent/easybuild-framework/pulls
https://api.github.com/repos/easybuilders/easybuild-framework/pulls
```
This is currently only supported by github from the command line and not via the web interface.
You might also want to look into [hub](https://github.com/defunkt/hub) for more command line features.
Expand Down
28 changes: 16 additions & 12 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. image:: http://hpcugent.github.io/easybuild/images/easybuild_logo_small.png
.. image:: https://easybuilders.github.io/easybuild/images/easybuild_logo_small.png
:align: center

`EasyBuild <https://hpcugent.github.io/easybuild>`_ is a software build
`EasyBuild <https://easybuilders.github.io/easybuild>`_ is a software build
and installation framework that allows you to manage (scientific) software
on High Performance Computing (HPC) systems in an efficient way.

Expand All @@ -14,36 +14,40 @@ The EasyBuild documentation is available at http://easybuild.readthedocs.org/.

The EasyBuild framework source code is hosted on GitHub, along
with an issue tracker for bug reports and feature requests, see
http://github.com/hpcugent/easybuild-framework.
https://github.com/easybuilders/easybuild-framework.

Related Python packages:

* **vsc-base**

* dependency for EasyBuild framework
* provides ``generaloption`` (support for command line interface) & ``fancylogger`` (logging support)
* GitHub repository: https://github.com/hpcugent/vsc-base
* package on PyPi: https://pypi.python.org/pypi/vsc-base

* **easybuild-easyblocks**

* a collection of easyblocks that implement support for building and installing (groups of) software packages
* GitHub repository: http://github.com/hpcugent/easybuild-easyblocks
* GitHub repository: https://github.com/easybuilders/easybuild-easyblocks
* package on PyPi: https://pypi.python.org/pypi/easybuild-easyblocks

* **easybuild-easyconfigs**

* a collection of example easyconfig files that specify which software to build,
and using which build options; these easyconfigs will be well tested
with the latest compatible versions of the easybuild-framework and easybuild-easyblocks packages
* GitHub repository: http://github.com/hpcugent/easybuild-easyconfigs
* GitHub repository: https://github.com/easybuilders/easybuild-easyconfigs
* PyPi: https://pypi.python.org/pypi/easybuild-easyconfigs

The code in the ``vsc`` directory originally comes from the *vsc-base* package
(https://github.com/hpcugent/vsc-base).


*Build status overview:*

* **master** branch:

.. image:: https://travis-ci.org/hpcugent/easybuild-framework.svg?branch=master
:target: https://travis-ci.org/hpcugent/easybuild-framework/branches
.. image:: https://travis-ci.org/easybuilders/easybuild-framework.svg?branch=master
:target: https://travis-ci.org/easybuilders/easybuild-framework/branches

* **develop** branch:

.. image:: https://travis-ci.org/hpcugent/easybuild-framework.svg?branch=develop
:target: https://travis-ci.org/hpcugent/easybuild-framework/branches
.. image:: https://travis-ci.org/easybuilders/easybuild-framework.svg?branch=develop
:target: https://travis-ci.org/easybuilders/easybuild-framework/branches
Loading