mirror of
https://github.com/gsi-upm/soil
synced 2025-09-14 04:02:21 +00:00
Compare commits
6 Commits
0.13.3
...
0.13.4-fix
Author | SHA1 | Date | |
---|---|---|---|
|
1d532dacfe | ||
|
a1f8d8c9c5 | ||
|
de326eb331 | ||
|
04b4380c61 | ||
|
d70a0c865c | ||
|
625c28e4ee |
@@ -1,6 +1,4 @@
|
|||||||
image: python:3.7
|
stages:
|
||||||
|
|
||||||
steps:
|
|
||||||
- build
|
- build
|
||||||
- test
|
- test
|
||||||
|
|
||||||
@@ -9,6 +7,8 @@ build:
|
|||||||
image:
|
image:
|
||||||
name: gcr.io/kaniko-project/executor:debug
|
name: gcr.io/kaniko-project/executor:debug
|
||||||
entrypoint: [""]
|
entrypoint: [""]
|
||||||
|
tags:
|
||||||
|
- docker
|
||||||
script:
|
script:
|
||||||
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
|
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
|
||||||
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
|
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
|
||||||
@@ -17,5 +17,9 @@ build:
|
|||||||
|
|
||||||
|
|
||||||
test:
|
test:
|
||||||
|
tags:
|
||||||
|
- docker
|
||||||
|
image: python:3.7
|
||||||
|
stage: test
|
||||||
script:
|
script:
|
||||||
python setup.py test
|
- python setup.py test
|
@@ -1 +1 @@
|
|||||||
0.13.3
|
0.13.4
|
||||||
|
@@ -19,7 +19,7 @@ from xml.etree.ElementTree import tostring
|
|||||||
from tornado.concurrent import run_on_executor
|
from tornado.concurrent import run_on_executor
|
||||||
from concurrent.futures import ThreadPoolExecutor
|
from concurrent.futures import ThreadPoolExecutor
|
||||||
|
|
||||||
from ..simulation import SoilSimulation
|
from ..simulation import Simulation
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
logger.setLevel(logging.INFO)
|
logger.setLevel(logging.INFO)
|
||||||
|
|
||||||
@@ -168,7 +168,7 @@ class SocketHandler(tornado.websocket.WebSocketHandler):
|
|||||||
|
|
||||||
@run_on_executor
|
@run_on_executor
|
||||||
def nonblocking(self, config):
|
def nonblocking(self, config):
|
||||||
simulation = SoilSimulation(**config)
|
simulation = Simulation(**config)
|
||||||
return simulation.run()
|
return simulation.run()
|
||||||
|
|
||||||
@tornado.gen.coroutine
|
@tornado.gen.coroutine
|
||||||
|
Reference in New Issue
Block a user