Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
GRID LRT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
ASTRON SDC
GRID LRT
Commits
aba97ddc
Commit
aba97ddc
authored
6 years ago
by
Alexandar Mechev
Browse files
Options
Downloads
Patches
Plain Diff
fixing python 2.6 issue and docs issue
parent
8e6908b9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
GRID_LRT/__init__.py
+2
-4
2 additions, 4 deletions
GRID_LRT/__init__.py
docs/storage.rst
+17
-0
17 additions, 0 deletions
docs/storage.rst
docs/token.rst
+5
-5
5 additions, 5 deletions
docs/token.rst
with
24 additions
and
9 deletions
GRID_LRT/__init__.py
+
2
−
4
View file @
aba97ddc
"""
GRID_LRT: Grid LOFAR Tools
"""
from
subprocess
import
call
,
check_output
,
STDOUT
from
future.moves.subprocess
import
check_output
import
os
import
socket
...
...
@@ -22,8 +23,6 @@ __email__ = "LOFAR@apmechev.com"
__status__
=
"
Production
"
__date__
=
"
2018-09-29
"
def
format_version
(
version
):
fmt
=
'
{tag}.{commitcount}+{gitsha}
'
parts
=
version
.
split
(
'
-
'
)
...
...
@@ -34,7 +33,6 @@ def format_version(version):
return
tag
return
fmt
.
format
(
tag
=
tag
,
commitcount
=
count
,
gitsha
=
sha
.
lstrip
(
'
g
'
))
def
get_git_version
():
command
=
'
git describe --tags --long --dirty
'
git_version
=
check_output
(
command
.
split
()).
decode
(
'
utf-8
'
).
strip
()
...
...
@@ -51,4 +49,4 @@ def get_git_hash():
if
not
call
([
"
git
"
,
"
branch
"
],
stderr
=
STDOUT
,
stdout
=
open
(
os
.
devnull
,
'
w
'
))
!=
0
:
__commit__
=
get_git_hash
()
__githash__
=
__commit__
[
'
hash
'
]
This diff is collapsed.
Click to expand it.
docs/storage.rst
0 → 100644
+
17
−
0
View file @
aba97ddc
.. _Staging:
Storage Modules
=============
GRID\_LRT's storage module enables users to interface with grid storage.
GRID_LRT.storage.gsifile
--------------------
.. automodule:: GRID_LRT.storage.gsifile
:members:
:undoc-members:
:inherited-members:
:show-inheritance:
This diff is collapsed.
Click to expand it.
docs/token.rst
+
5
−
5
View file @
aba97ddc
...
...
@@ -6,24 +6,24 @@ The GRID_LRT.Token module is responsible for interactions with CouchDB using the
Token.py
--------
Location: GRID_LRT/
T
oken.py
Location: GRID_LRT/
t
oken.py
Imports:
>>> from GRID_LRT.
T
oken import Token
_
Handler
>>> from GRID_LRT.
T
oken import TokenSet
>>> from GRID_LRT.
t
oken import TokenHandler
>>> from GRID_LRT.
t
oken import TokenSet
TokenHandler
~~~~~~~~~~~~~~~~~~~~~~
.. autoclass:: GRID_LRT.
T
oken.Token
_
Handler
.. autoclass:: GRID_LRT.
t
oken.TokenHandler
:members:
:undoc-members:
TokenSet
~~~~~~~~~~~~~~~~~~~~~~
.. autoclass:: GRID_LRT.
T
oken.TokenSet
.. autoclass:: GRID_LRT.
t
oken.TokenSet
:members:
:undoc-members:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment