Skip to content

Commit 41e02d3

Browse files
stdweirdstdweird
committed
Move to vsc-install testing
1 parent 26b76db commit 41e02d3

24 files changed

+452
-412
lines changed

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2+
*~
3+
4+
setup.cfg
5+
16
*.py[co]
27

38
# Packages

‎LICENSE

Lines changed: 380 additions & 238 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
- Python 2.6 : [![Build Status](https://jenkins1.ugent.be/job/vsc-utils-python26/badge/icon)](https://jenkins1.ugent.be/job/vsc-utils-python26/)
55
- Python 2.7 : [![Build Status](https://jenkins1.ugent.be/job/vsc-utils-python27/badge/icon)](https://jenkins1.ugent.be/job/vsc-utils-python27/)
66

7+
# Description
78
Common tools used within our organization.
89
These tools live in the vsc.utils namespace, toghether with the tools from
910
vsc-base.
1011

11-
They have been split of from vsc-base because the tools here need aditional dependencies to work correctly whereas the tools in vsc-base do not.
12+
They have been split of from vsc-base because the tools here need aditional dependencies
13+
to work correctly whereas the tools in vsc-base do not.
1214

1315
Originally created by the HPC team of Ghent University (http://ugent.be/hpc).
1416

‎bdist_rpm_settings.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎lib/vsc/__init__.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
##
2-
# Copyright 2012-2013 Ghent University
1+
#
2+
# Copyright 2015-2015 Ghent University
33
#
44
# This file is part of vsc-utils,
55
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
@@ -8,7 +8,7 @@
88
# the Hercules foundation (http://www.herculesstichting.be/in_English)
99
# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
1010
#
11-
# http://github.com/hpcugent/vsc-utils
11+
# https://github.com/hpcugent/vsc-utils
1212
#
1313
# vsc-utils is free software: you can redistribute it and/or modify
1414
# it under the terms of the GNU Library General Public License as
@@ -22,12 +22,9 @@
2222
#
2323
# You should have received a copy of the GNU Library General Public License
2424
# along with vsc-utils. If not, see <http://www.gnu.org/licenses/>.
25-
##
25+
#
2626
"""
27-
@author: Jens Timmerman (Ghent University)
27+
Allow other packages to extend this namespace, zip safe setuptools style
2828
"""
29-
from pkgutil import extend_path
30-
31-
# we're not the only ones in this namespace
32-
__path__ = extend_path(__path__, __name__) #@ReservedAssignment
33-
__import__('pkg_resources').declare_namespace(__name__)
29+
import pkg_resources
30+
pkg_resources.declare_namespace(__name__)

‎lib/vsc/utils/__init__.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
##
2-
# Copyright 2012-2013 Ghent University
1+
#
2+
# Copyright 2015-2015 Ghent University
33
#
44
# This file is part of vsc-utils,
55
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
@@ -8,7 +8,7 @@
88
# the Hercules foundation (http://www.herculesstichting.be/in_English)
99
# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
1010
#
11-
# http://github.com/hpcugent/vsc-utils
11+
# https://github.com/hpcugent/vsc-utils
1212
#
1313
# vsc-utils is free software: you can redistribute it and/or modify
1414
# it under the terms of the GNU Library General Public License as
@@ -22,12 +22,9 @@
2222
#
2323
# You should have received a copy of the GNU Library General Public License
2424
# along with vsc-utils. If not, see <http://www.gnu.org/licenses/>.
25-
##
25+
#
2626
"""
27-
@author: Jens Timmerman (Ghent University)
27+
Allow other packages to extend this namespace, zip safe setuptools style
2828
"""
29-
from pkgutil import extend_path
30-
31-
# we're not the only ones in this namespace
32-
__path__ = extend_path(__path__, __name__) #@ReservedAssignment
33-
__import__('pkg_resources').declare_namespace(__name__)
29+
import pkg_resources
30+
pkg_resources.declare_namespace(__name__)

‎lib/vsc/utils/availability.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
##
2-
# Copyright 2012-2013 Ghent University
1+
#
2+
# Copyright 2012-2015 Ghent University
33
#
44
# This file is part of vsc-utils,
55
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
@@ -8,7 +8,7 @@
88
# the Hercules foundation (http://www.herculesstichting.be/in_English)
99
# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
1010
#
11-
# http://github.com/hpcugent/vsc-utils
11+
# https://github.com/hpcugent/vsc-utils
1212
#
1313
# vsc-utils is free software: you can redistribute it and/or modify
1414
# it under the terms of the GNU Library General Public License as
@@ -22,7 +22,7 @@
2222
#
2323
# You should have received a copy of the GNU Library General Public License
2424
# along with vsc-utils. If not, see <http://www.gnu.org/licenses/>.
25-
##
25+
#
2626
"""
2727
Module for high-availability functionality.
2828

‎lib/vsc/utils/cache.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2012-2013 Ghent University
2+
# Copyright 2012-2015 Ghent University
33
#
44
# This file is part of vsc-utils,
55
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
@@ -8,7 +8,7 @@
88
# the Hercules foundation (http://www.herculesstichting.be/in_English)
99
# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
1010
#
11-
# http://github.com/hpcugent/vsc-utils
11+
# https://github.com/hpcugent/vsc-utils
1212
#
1313
# vsc-utils is free software: you can redistribute it and/or modify
1414
# it under the terms of the GNU Library General Public License as
@@ -22,6 +22,7 @@
2222
#
2323
# You should have received a copy of the GNU Library General Public License
2424
# along with vsc-utils. If not, see <http://www.gnu.org/licenses/>.
25+
#
2526
"""
2627
Caching utilities.
2728

‎lib/vsc/utils/crypt.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
##
2-
# Copyright 2009 Daniel Miller
3-
# Copyright 2012-2013 Ghent University
1+
#
2+
# Copyright 2009-2015 Ghent University
43
#
54
# This file is part of vsc-utils,
6-
# originally created by Daniel Miller (http://code.activestate.com/recipes/576980/)
7-
# and adapted by the HPC team of Ghent University (http://ugent.be/hpc/en),
5+
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
86
# with support of Ghent University (http://ugent.be/hpc),
97
# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
108
# the Hercules foundation (http://www.herculesstichting.be/in_English)
119
# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
1210
#
13-
# http://github.com/hpcugent/vsc-utils
11+
# https://github.com/hpcugent/vsc-utils
1412
#
1513
# vsc-utils is free software: you can redistribute it and/or modify
1614
# it under the terms of the GNU Library General Public License as
@@ -24,7 +22,7 @@
2422
#
2523
# You should have received a copy of the GNU Library General Public License
2624
# along with vsc-utils. If not, see <http://www.gnu.org/licenses/>.
27-
##
25+
#
2826
"""
2927
Borrowed code from http://code.activestate.com/recipes/576980/
3028
-- originally released under MIT license

‎lib/vsc/utils/fs_store.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#!/usr/bin/env python
2-
##
3-
# Copyright 2012-2013 Ghent University
1+
#
2+
# Copyright 2012-2015 Ghent University
43
#
54
# This file is part of vsc-utils,
65
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
@@ -9,7 +8,7 @@
98
# the Hercules foundation (http://www.herculesstichting.be/in_English)
109
# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
1110
#
12-
# http://github.com/hpcugent/vsc-utils
11+
# https://github.com/hpcugent/vsc-utils
1312
#
1413
# vsc-utils is free software: you can redistribute it and/or modify
1514
# it under the terms of the GNU Library General Public License as
@@ -23,7 +22,7 @@
2322
#
2423
# You should have received a copy of the GNU Library General Public License
2524
# along with vsc-utils. If not, see <http://www.gnu.org/licenses/>.
26-
##
25+
#
2726
"""Functions to help storing information somewhere in the file system.
2827
2928
An example use of this is storing cached information in the user's

0 commit comments

Comments
 (0)