Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue329 node 12 #358

Merged
merged 14 commits into from Feb 20, 2020
Merged
26 changes: 13 additions & 13 deletions .travis.yml
@@ -1,28 +1,25 @@
stages:
- "Tests"
- "docker-compose integration tests"

dist: bionic
language: shell
os: linux
jobs:
include:
- stage: "Tests"
name: "Admin tests"
language: node_js
node_js:
- "8"
node_js: "12"
cache:
directories:
- node_modules
before_install:
- cd admin
install:
- yarn
- yarn install
script:
- yarn test && yarn build

- name: "Backend tests"
language: python
python:
- 3.6
python: "3.6"
cache:
pip: true
services:
Expand All @@ -31,22 +28,21 @@ jobs:
before_install:
- cd backend
install:
- pip install pytest==4.3.0 pytest-cov coveralls
- pip install pytest==4.* pytest-cov coveralls
- pip install -r requirements.txt
script:
- PYTHONPATH=`pwd` pytest --cov=src

- name: "Frontend tests"
language: python
python:
- 3.6
python: "3.6"
cache:
pip: true
before_install:
- cd frontend
install:
- pip install -r requirements.txt
- pip install pytest py-w3c
- pip install pytest==4.* py-w3c
script:
- BACKEND_URL=https://www.research-software.nl/api PYTHONPATH=. pytest --live

Expand All @@ -58,3 +54,7 @@ jobs:
- docker-compose build
script:
- docker-compose --file docker-compose.yml --file docker-compose.test.yml run test

stages:
- "Tests"
- "docker-compose integration tests"
2 changes: 1 addition & 1 deletion admin/Dockerfile
@@ -1,4 +1,4 @@
FROM node:8.11.1
FROM node:12.15.0

RUN mkdir /app

Expand Down
22 changes: 9 additions & 13 deletions admin/public/settings.json
Expand Up @@ -19,10 +19,6 @@
"help":
"<p><b>Answer the following questions</b> (in Markdown with bullet points (*)):</p><ul><li>What does your software provide for what user?</li><li>What does your software do?</li><li>What makes your software unique?</li><li>List some highlights/awards:</li></ul><p>Example for Xenon:</p><p>* Provides an easy-to-use interface for distributed computing developers <br />* Enables the use of different file transfer protocols and scheduling systems on remote machines <br />* No need to learn and implement many different APIs<br/>* Successfully used in many eScience tools and projects</p>"
},
"citationcff": {
"label": "citationcff",
"sortIndex": 300
},
"contributingOrganizations": {
"label": "Contributing organizations",
"sortIndex": 400
Expand Down Expand Up @@ -57,16 +53,12 @@
},
"createdBy": {
"label": "Created by",
"sortIndex": 1000,
"sortIndex": 1010,
"readonly": true
},
"getStartedURL": {
"label": "Getting started URL",
"sortIndex": 500
},
"repositoryURLs": {
"sortIndex": 580,
"label": "Code repository URLs"
"sortIndex": 510
},
"isFeatured": {
"sortIndex": 20,
Expand All @@ -83,7 +75,7 @@
},
"primaryKey": {
"label": "Primary key",
"sortIndex": 1000,
"sortIndex": 900,
"readonly": true
},
"programmingLanguage": {
Expand Down Expand Up @@ -130,6 +122,10 @@
}
}
},
"repositoryURLs": {
"sortIndex": 580,
"label": "Code repository URLs"
},
"shortStatement": {
"label": "Short statement",
"multiline": true,
Expand Down Expand Up @@ -161,12 +157,12 @@
},
"updatedAt": {
"label": "Updated at",
"sortIndex": 1000,
"sortIndex": 1020,
"readonly": true
},
"updatedBy": {
"label": "Updated by",
"sortIndex": 1000,
"sortIndex": 1030,
"readonly": true
}
}
Expand Down