Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
PEDASI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Research Software Group
PEDASI
Commits
5cc7b3c5
Commit
5cc7b3c5
authored
6 years ago
by
James Graham
Browse files
Options
Downloads
Patches
Plain Diff
Update references to GitHub location - moved to PEDASI org
parent
a9602420
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
playbook.yml
+2
-2
2 additions, 2 deletions
playbook.yml
provenance/models.py
+2
-1
2 additions, 1 deletion
provenance/models.py
with
4 additions
and
3 deletions
playbook.yml
+
2
−
2
View file @
5cc7b3c5
...
@@ -79,7 +79,7 @@
...
@@ -79,7 +79,7 @@
-
name
:
Clone / update dev branch from main repo
-
name
:
Clone / update dev branch from main repo
git
:
git
:
repo
:
'
ssh://git@github.com/
Southampton-RSG
/PEDASI
-IoT
.git'
repo
:
'
ssh://git@github.com/
PEDASI
/PEDASI.git'
dest
:
'
{{
project_dir
}}'
dest
:
'
{{
project_dir
}}'
accept_hostkey
:
yes
accept_hostkey
:
yes
key_file
:
'
~/.deployment-key'
key_file
:
'
~/.deployment-key'
...
@@ -106,7 +106,7 @@
...
@@ -106,7 +106,7 @@
-
name
:
Clone / update master branch
-
name
:
Clone / update master branch
git
:
git
:
repo
:
'
ssh://git@github.com/
Southampton-RSG
/PEDASI
-IoT
.git'
repo
:
'
ssh://git@github.com/
PEDASI
/PEDASI.git'
dest
:
'
{{
project_dir
}}'
dest
:
'
{{
project_dir
}}'
accept_hostkey
:
yes
accept_hostkey
:
yes
key_file
:
'
~/.deployment-key'
key_file
:
'
~/.deployment-key'
...
...
This diff is collapsed.
Click to expand it.
provenance/models.py
+
2
−
1
View file @
5cc7b3c5
...
@@ -80,6 +80,7 @@ class ProvEntry(mongoengine.DynamicDocument):
...
@@ -80,6 +80,7 @@ class ProvEntry(mongoengine.DynamicDocument):
instance_type
=
ContentType
.
objects
.
get_for_model
(
instance
)
instance_type
=
ContentType
.
objects
.
get_for_model
(
instance
)
document
=
prov
.
model
.
ProvDocument
(
namespaces
=
{
document
=
prov
.
model
.
ProvDocument
(
namespaces
=
{
# TODO set PEDASI PROV namespace
'
piot
'
:
'
http://www.pedasi-iot.org/
'
,
'
piot
'
:
'
http://www.pedasi-iot.org/
'
,
'
foaf
'
:
'
http://xmlns.com/foaf/0.1/
'
,
'
foaf
'
:
'
http://xmlns.com/foaf/0.1/
'
,
'
xsd
'
:
'
http://www.w3.org/2001/XMLSchema#
'
,
'
xsd
'
:
'
http://www.w3.org/2001/XMLSchema#
'
,
...
@@ -107,7 +108,7 @@ class ProvEntry(mongoengine.DynamicDocument):
...
@@ -107,7 +108,7 @@ class ProvEntry(mongoengine.DynamicDocument):
# Generate a UUID so we can lookup records belonging to a user
# Generate a UUID so we can lookup records belonging to a user
# But not identify the user from a given record
# But not identify the user from a given record
# TODO how strongly do we want to prevent user identification?
# TODO how strongly do we want to prevent user identification?
# See https://github.com/
Southampton-RSG
/PEDASI
-IoT
/issues/10
# See https://github.com/
PEDASI
/PEDASI/issues/10
'
piot:u-
'
+
str
(
uuid
.
uuid5
(
uuid
.
NAMESPACE_URL
,
user_uri
)),
'
piot:u-
'
+
str
(
uuid
.
uuid5
(
uuid
.
NAMESPACE_URL
,
user_uri
)),
other_attributes
=
{
other_attributes
=
{
prov
.
model
.
PROV_TYPE
:
'
prov:Person
'
,
prov
.
model
.
PROV_TYPE
:
'
prov:Person
'
,
...
...
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