Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
POP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
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
POPPY
POP
Commits
4a064254
Commit
4a064254
authored
Mar 26, 2020
by
Bonnin Xavier
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop'
parents
522d42a6
d7a2d32c
Branches
Branches containing commit
Tags
0.6.2
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
poppy/pop/descriptor.json
+3
-3
3 additions, 3 deletions
poppy/pop/descriptor.json
poppy/pop/models/versions/poppy_pop_0001_initial_.py
+0
-1
0 additions, 1 deletion
poppy/pop/models/versions/poppy_pop_0001_initial_.py
poppy/pop/tests.py
+1
-1
1 addition, 1 deletion
poppy/pop/tests.py
with
4 additions
and
5 deletions
poppy/pop/descriptor.json
+
3
−
3
View file @
4a064254
...
...
@@ -6,12 +6,12 @@
"description"
:
"Main plugin to operate POPPY"
},
"release"
:
{
"version"
:
"0.6.
1
"
,
"date"
:
"2020-0
2
-2
1
"
,
"version"
:
"0.6.
2
"
,
"date"
:
"2020-0
3
-2
0
"
,
"author"
:
"POPPy team"
,
"contact"
:
"roc.support@sympa.obspm.fr"
,
"institute"
:
"LESIA"
,
"modification"
:
"
job_log_id is not necessary unique in job_exception table
"
,
"modification"
:
"
Update job init model
"
,
"url"
:
"https://gitlab.obspm.fr/POPPY/POP"
},
"tasks"
:
[
...
...
This diff is collapsed.
Click to expand it.
poppy/pop/models/versions/poppy_pop_0001_initial_.py
+
0
−
1
View file @
4a064254
...
...
@@ -48,7 +48,6 @@ def upgrade():
sa
.
Column
(
'
exception_msg
'
,
sa
.
String
(),
nullable
=
False
),
sa
.
ForeignKeyConstraint
([
'
job_log_id
'
],
[
'
poppy.job_log.id_job_log
'
],
),
sa
.
PrimaryKeyConstraint
(
'
id_job_exception
'
),
sa
.
UniqueConstraint
(
'
job_log_id
'
),
schema
=
'
poppy
'
)
...
...
This diff is collapsed.
Click to expand it.
poppy/pop/tests.py
+
1
−
1
View file @
4a064254
...
...
@@ -32,4 +32,4 @@ class TestDbCommands(CommandTestCase):
self
.
run_command
(
command
)
# check the revision hash/name
assert
context
.
get_current_revision
()
==
'
a976cd33d39f
'
assert
context
.
get_current_revision
()
==
'
poppy_pop_0001_initial
'
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