Commit fb768c1c authored by Olivier Sallou's avatar Olivier Sallou
Browse files

New upstream version 3.0.8

parent 0c326333

.travis.yml

+23 −24
Original line number Diff line number Diff line 
language: python

sudo: false

python:

  - "2.7"

  - "3.4"

  - "3.5"

- '2.7'

- '3.4'

- '3.5'

- '3.6'

services:

- mongodb

# Apply only on main branches

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"

- pip install flake8

- pip install -r requirements.txt

- pip install coverage

- pip install python-coveralls

- python setup.py -q install

before_script:

- sleep 10



# command to run tests

script:

- python setup.py test

- flake8 --ignore E501 biomaj_user/*.py

#after_success:

#  - coveralls

deploy:

  provider: pypi

  skip_existing: true

  user: osallou

  password:

    secure: LKJMO4pp5ZL7LG0xgQsmFLkO9OU6erAoAbVT2Bm6Q21cA1IhT8WivtfEMkatnMATLGQ+a5uCNcNTutLScFXsGavJFUEROKEZ2mrldMs2CMSemzp6txR2XuCuJibz5Q6wxp8A0l1r1y7R+VyJSMVRioRNQ8pb5C19aazEN36Uziuqquwky/R8jFpv7PnwYu8USgalgzeJd7GQdKKVktMJFOE+2EiMwZnlTly6urom1oVXPxk3pb6Ns8p1Wx1fay4p61zCLROSnQAAcKR+saJOCQS9W1yJV0IMrFptzwg4fX6/Q9ukZqOrKJ6a2LmfbwzQ57xl5lGv9/FLff9SWHFgm96pnBhJcoL2PGdRph1zijB8ZZeBJblwEIyRGl7unc5QrV/bjjBWSJiwaysOBnu6l5k1sUNwRW0c5VbkWniw6/q+nJidj5qcaRbJouTDAs4638+HFkMKo8SzzYqCpdCMbUerdvD10bf4uNAEwP5vY0yIyZ+Vbchyk/ZqCurivCK/xQ1bo7HzkG5CWzPyxl01ee+0ZIog148dhoQqXtvsCwjHgtMBgpjU17KqYNbI3EPtqytwV3dRPnlJxrlGMBk/t9ohUEZg71csbgIyfIX0EOO1qD4BocpWXDs3y5mNhHnA7GW5lobFBhx/Qyj3bB12EyzFYzK9157EwxKgo+iQ8PM=

  distributions: sdist bdist_wheel

  on:

    tags: true

CHANGES.txt

+4 −0
Original line number Diff line number Diff line 
3.0.8:

  Fix traefik prefix

3.0.7:

  Add tags for traefik support

3.0.6:

  update ldap3 requirement version to use more recent release

3.0.5:

biomaj_user/biomaj_user_service.py

+14 −2
Original line number Diff line number Diff line
@@ -29,7 +29,19 @@ app = Flask(__name__) 
def consul_declare(config):

    if config['consul']['host']:

        consul_agent = consul.Consul(host=config['consul']['host'])

        consul_agent.agent.service.register('biomaj-user', service_id=config['consul']['id'], address=config['web']['hostname'], port=config['web']['port'], tags=['biomaj'])

        consul_agent.agent.service.register(

            'biomaj-user',

            service_id=config['consul']['id'],

            address=config['web']['hostname'],

            port=config['web']['port'],

            tags=[

                'biomaj',

                'api',

                'traefik-int.backend=biomaj-user',

                'traefik-int.frontend.rule=PathPrefix:/api/user',

                'traefik-int.enable=true',

            ]

        )

        check = consul.Check.http(url='http://' + config['web']['hostname'] + ':' + str(config['web']['port']) + '/api/user', interval=20)

        consul_agent.agent.check.register(config['consul']['id'] + '_check', check=check, service_id=config['consul']['id'])

setup.py

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ config = { 
    'url': 'http://biomaj.genouest.org',

    'download_url': 'http://biomaj.genouest.org',

    'author_email': 'olivier.sallou@irisa.fr',

    'version': '3.0.6',

    'version': '3.0.8',

     'classifiers': [

        # How mature is this project? Common values are

        #   3 - Alpha