Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
LOFAR
Manage
Activity
Members
Labels
Plan
Issues
Wiki
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RadioObservatory
LOFAR
Commits
ddaf550c
Commit
ddaf550c
authored
4 years ago
by
Jörn Künsemöller
Browse files
Options
Downloads
Plain Diff
Merge branch '
TMSS-286
' into 'master'
Resolve
TMSS-286
Closes
TMSS-286
See merge request
!187
parents
0d19273c
694a796c
No related branches found
No related tags found
1 merge request
!187
Resolve TMSS-286
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Docker/lofar-ci/Dockerfile_ci_sas
+1
-0
1 addition, 0 deletions
Docker/lofar-ci/Dockerfile_ci_sas
SAS/TMSS/src/tmss/tmssapp/serializers/specification.py
+6
-6
6 additions, 6 deletions
SAS/TMSS/src/tmss/tmssapp/serializers/specification.py
with
7 additions
and
6 deletions
Docker/lofar-ci/Dockerfile_ci_sas
+
1
−
0
View file @
ddaf550c
...
@@ -18,6 +18,7 @@ ENV PATH /usr/pgsql-9.6/bin:$PATH
...
@@ -18,6 +18,7 @@ ENV PATH /usr/pgsql-9.6/bin:$PATH
RUN pip3 install cython kombu lxml requests pygcn xmljson mysql-connector-python python-dateutil django djangorestframework djangorestframework-xml ldap==1.0.2 flask fabric coverage python-qpid-proton PyGreSQL numpy h5py psycopg2 testing.postgresql Flask-Testing scipy Markdown django-filter python-ldap python-ldap-test ldap3 djangorestframework django-jsonforms django-json-widget django-jsoneditor drf-yasg flex swagger-spec-validator django-auth-ldap mozilla-django-oidc jsonschema comet
RUN pip3 install cython kombu lxml requests pygcn xmljson mysql-connector-python python-dateutil django djangorestframework djangorestframework-xml ldap==1.0.2 flask fabric coverage python-qpid-proton PyGreSQL numpy h5py psycopg2 testing.postgresql Flask-Testing scipy Markdown django-filter python-ldap python-ldap-test ldap3 djangorestframework django-jsonforms django-json-widget django-jsoneditor drf-yasg flex swagger-spec-validator django-auth-ldap mozilla-django-oidc jsonschema comet
# Note: nodejs now comes with npm, do not install the npm package separately, since that will be taken from the epel repo and is conflicting.
# Note: nodejs now comes with npm, do not install the npm package separately, since that will be taken from the epel repo and is conflicting.
RUN echo "Installing Nodejs packages..." && \
RUN echo "Installing Nodejs packages..." && \
curl -sL https://rpm.nodesource.com/setup_14.x | bash - && \
curl -sL https://rpm.nodesource.com/setup_14.x | bash - && \
...
...
This diff is collapsed.
Click to expand it.
SAS/TMSS/src/tmss/tmssapp/serializers/specification.py
+
6
−
6
View file @
ddaf550c
...
@@ -153,13 +153,13 @@ class DatatypeSerializer(serializers.ModelSerializer):
...
@@ -153,13 +153,13 @@ class DatatypeSerializer(serializers.ModelSerializer):
fields
=
'
__all__
'
fields
=
'
__all__
'
class
DataformatSerializer
(
serializers
.
ModelSerializer
):
class
DataformatSerializer
(
RelationalHyperlinked
ModelSerializer
):
class
Meta
:
class
Meta
:
model
=
models
.
Dataformat
model
=
models
.
Dataformat
fields
=
'
__all__
'
fields
=
'
__all__
'
class
CopyReasonSerializer
(
serializers
.
ModelSerializer
):
class
CopyReasonSerializer
(
RelationalHyperlinked
ModelSerializer
):
class
Meta
:
class
Meta
:
model
=
models
.
CopyReason
model
=
models
.
CopyReason
fields
=
'
__all__
'
fields
=
'
__all__
'
...
@@ -201,25 +201,25 @@ class ResourceTypeSerializer(RelationalHyperlinkedModelSerializer):
...
@@ -201,25 +201,25 @@ class ResourceTypeSerializer(RelationalHyperlinkedModelSerializer):
extra_fields
=
[
'
name
'
]
extra_fields
=
[
'
name
'
]
class
FlagSerializer
(
serializers
.
ModelSerializer
):
class
FlagSerializer
(
RelationalHyperlinked
ModelSerializer
):
class
Meta
:
class
Meta
:
model
=
models
.
Flag
model
=
models
.
Flag
fields
=
'
__all__
'
fields
=
'
__all__
'
class
SettingSerializer
(
serializers
.
ModelSerializer
):
class
SettingSerializer
(
RelationalHyperlinked
ModelSerializer
):
class
Meta
:
class
Meta
:
model
=
models
.
Setting
model
=
models
.
Setting
fields
=
'
__all__
'
fields
=
'
__all__
'
class
ProjectCategorySerializer
(
serializers
.
ModelSerializer
):
class
ProjectCategorySerializer
(
RelationalHyperlinked
ModelSerializer
):
class
Meta
:
class
Meta
:
model
=
models
.
ProjectCategory
model
=
models
.
ProjectCategory
fields
=
'
__all__
'
fields
=
'
__all__
'
class
PeriodCategorySerializer
(
serializers
.
ModelSerializer
):
class
PeriodCategorySerializer
(
RelationalHyperlinked
ModelSerializer
):
class
Meta
:
class
Meta
:
model
=
models
.
PeriodCategory
model
=
models
.
PeriodCategory
fields
=
'
__all__
'
fields
=
'
__all__
'
...
...
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