Olivier Sallou pushed to branch upstream at Debian Med / biomaj3-process
Commits:
219928da by Olivier Sallou at 2019-03-09T10:13:04Z
New upstream version 3.0.13
- - - - -
5 changed files:
- .travis.yml
- CHANGES.txt
- biomaj_process/biomaj_process_web.py
- requirements.txt
- setup.py
Changes:
=====================================
.travis.yml
=====================================
@@ -1,30 +1,30 @@
language: python
sudo: false
python:
- - "2.7"
- - "3.4"
- - "3.5"
+ - '2.7'
+ - '3.4'
+ - '3.5'
+ - '3.6'
services:
- - redis
-# Apply only on main branches
+- redis
branches:
except:
- - /^feature.*$/
-# command to install dependencies
-#before_install:
-# - "sudo apt-get update -qq"
-# - "sudo apt-get install -qq libldap2-dev libsasl2-dev"
+ - "/^feature.*$/"
install:
- - "pip install flake8"
- - "pip install -r requirements.txt"
- - "pip install coverage"
- - "pip install python-coveralls"
- - "python setup.py -q install"
-# - "echo data_file=$TRAVIS_BUILD_DIR/.coverage >> .coveragerc"
-# command to run tests
+- pip install flake8
+- pip install -r requirements.txt
+- pip install coverage
+- pip install python-coveralls
+- python setup.py -q install
script:
- - python setup.py test
- - flake8 --ignore E501 biomaj_process/*.py
-#after_success:
-# - coveralls
-
+- python setup.py test
+- flake8 --ignore E501 biomaj_process/*.py
+deploy:
+ provider: pypi
+ skip_existing: true
+ user: osallou
+ password:
+ secure:
WSyAkAWF5GB+7sBmGBNYxrtNuY5gFXEWqcRM/8ix2ukoepGQC5BDxmmaiAcsPNONnHsN6DO6e/YvWOhv2CcD53C70LYWILfOfRYr27rGRdTb0xUb4Ji4T6N+Q0jOZP/YFE5iawNEV+WH1XFBKSsHNH7Njvgy/6n/L40SOAZasOuSGK4W7C35FXnSxRxuEm5GKdXtmrwviCR+UyRK7n4jKu0uVKOtxVgiqniScZKc/lpcr7i6+7p2AZsXB6FGm+Kyn8kGzrBXvF2gv8WbcaA0Le6H/b9IDs/AE7Y2zcObZRPH+GVZqXYkxzHbbevMdCWy2vNxebdK/j53JV6hDQg9mU0GIPAoZUQ4u4gSQeyuneyDeAqUKPNR74d9G1BKlpzsmyq3XbNdEEZtF6Lbjr/1W/Lb0VWTNeTS8bfJxQBwWNpnQL02/EhmBn1KM/nSazXNZC3rzBcxHsesQbbmtOmMsprbdLIs0FBecKnSxk9KCLplTzAvJfGAWP5WqHNW0bWYA7DDM4wbJvWbiGJgYwdyXqpiPqocUOHCli9QDxpvJG21GHZV/lKRZPe5x+hLcYIJQhQIvJHBdbIZxqSq1bt9+JvXElcZN20oPPKieAl6LM6t5AXl+uUBSopWstMLNsJERekrPbnZxnrAFEDjzp2egqtXpz+qyWPLCrmSbkgNOVY=
+ distributions: sdist bdist_wheel
+ on:
+ tags: true
=====================================
CHANGES.txt
=====================================
@@ -1,3 +1,8 @@
+3.0.13:
+ Fix traefik prefix
+3.0.12:
+ Update pika dependency release
+ Add tags for traefik support
3.0.11:
Catch exception for microservices if remote server is not reachable
Rename package for protobuf to avoid collisions
=====================================
biomaj_process/biomaj_process_web.py
=====================================
@@ -29,7 +29,7 @@ process_time_metric = Counter("biomaj_process_time", "Bank
process execution tim
config_file = 'config.yml'
if 'BIOMAJ_CONFIG' in os.environ:
- config_file = os.environ['BIOMAJ_CONFIG']
+ config_file = os.environ['BIOMAJ_CONFIG']
config = None
with open(config_file, 'r') as ymlfile:
@@ -48,7 +48,19 @@ redis_client = redis.StrictRedis(
def consul_declare(config):
if config['consul']['host']:
consul_agent = consul.Consul(host=config['consul']['host'])
- consul_agent.agent.service.register('biomaj-process',
service_id=config['consul']['id'], address=config['web']['hostname'],
port=config['web']['port'], tags=['biomaj'])
+ consul_agent.agent.service.register(
+ 'biomaj-process',
+ service_id=config['consul']['id'],
+ address=config['web']['hostname'],
+ port=config['web']['port'],
+ tags=[
+ 'biomaj',
+ 'api',
+ 'traefik-int.backend=biomaj-process',
+ 'traefik-int.frontend.rule=PathPrefix:/api/process',
+ 'traefik-int.enable=true'
+ ]
+ )
check = consul.Check.http(url='http://' + config['web']['hostname'] +
':' + str(config['web']['port']) + '/api/process', interval=20)
consul_agent.agent.check.register(config['consul']['id'] + '_check',
check=check, service_id=config['consul']['id'])
=====================================
requirements.txt
=====================================
@@ -1,6 +1,6 @@
mock
nose
-pika
+pika==0.13.0
redis
PyYAML
protobuf
@@ -8,5 +8,5 @@ flask
python-consul
prometheus_client>=0.0.18
requests
-biomaj_core>=3.0.10
+biomaj_core>=3.0.16
biomaj_zipkin
=====================================
setup.py
=====================================
@@ -21,7 +21,7 @@ config = {
'url': 'http://biomaj.genouest.org',
'download_url': 'http://biomaj.genouest.org',
'author_email': 'olivier.sal...@irisa.fr',
- 'version': '3.0.11',
+ 'version': '3.0.13',
'classifiers': [
# How mature is this project? Common values are
# 3 - Alpha
@@ -44,7 +44,7 @@ config = {
'install_requires': [
'biomaj_core',
'biomaj_zipkin',
- 'pika',
+ 'pika==0.13.0',
'redis',
'PyYAML',
'flask',
View it on GitLab:
https://salsa.debian.org/med-team/biomaj3-process/commit/219928da81630d2b907ab19fe543c2589b921b50
--
View it on GitLab:
https://salsa.debian.org/med-team/biomaj3-process/commit/219928da81630d2b907ab19fe543c2589b921b50
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
debian-med-commit mailing list
debian-med-com...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
