Commit 5de3aa6a authored by Olivier Sallou's avatar Olivier Sallou
Browse files

New upstream version 3.0.21

parent 511284eb

.travis.yml

+21 −21
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:

- redis

# 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 -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 -r requirements.txt

- pip install coverage nose

- pip install python-coveralls

- python setup.py -q install

script:

   - python setup.py test

- nosetests -a '!network'

- flake8 --ignore E501 biomaj_download/*.py biomaj_download/download

#after_success:

#  - coveralls

deploy:

  provider: pypi

  skip_existing: true

  user: osallou

  password:

    secure: fMEDYld7N2uRbICa++b7dTUXxt6VxSD1ZE+ZaTHQWxHHSK5fxbdwvsVHicdgKH3erMOXb7foumQ6uxBAtQTVmY+ZJbidydT/BEeoLjIH0NxVoTLCOllWKHOKm8LzgigVjbSVqXi7ZZ6rzigpQbg7NCdiD4wQr6xLO+gB3LrWovIgcPIlWDLWiMIp0P3b9nmoOdiSBBpLXI7i9W7ksL25Mopx/p4OoeWFEbg7aSkRVKufWLCoyLnYnWCnmC0MK7PF7V7mgiw+Gutv3XcOgfaZ/MU088+OrpvnLxfKplkwukcMBc4cuMV8mtWmDaQ9u2X9MLoeyRoQ6jHyIvftW+fn4Ck3wzyKZA3Pbz5+UVUG6GVpnwm3NIYvPl0m62brVVqs/wVaI8HB/7u5qn60ER9u9l9/YGIG5rsPrb2w12QFmcjwrge2T9h+aDW3+fQuzbjVGJMBCLqu9hUoiz9WHWqa74Ka8OfP+fTA3vpASGfuYhzdlJ5tDO6M1kjIe23ga5DhUMKHyl4j7uA/YVxc5numYU9naD/PyZw1qqms8zhJdVmIsBMtBP/MeH0YVrhmQS7p4ni7BB545JBYv8UyUfVXt2DcQHG9EAkMT69QfJhSl9KICe4SmlHVYy2Uldw/LE/FwYmngfDzZUYtndsn2xS+NVi3FwMNa1+6q0Sqqmzfmqc=

  distributions: sdist bdist_wheel

  on:

    tags: true

CHANGES.txt

+5 −0
Original line number Diff line number Diff line 
3.0.21:

  Fix traefik labels

3.0.20:

  Update pika dependency release

  Add tags for traefik support

3.0.19:

  Check archives after download

  Fix python regexps syntax (deprecation)

biomaj_download/biomaj_download_web.py

+14 −2
Original line number Diff line number Diff line
@@ -41,7 +41,19 @@ with open(config_file, 'r') as ymlfile: 
def consul_declare(config):

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

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

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

        consul_agent.agent.service.register(

            'biomaj-download',

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

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

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

            tags=[

                'biomaj',

                'api',

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

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

                'traefik-int.enable=true'

            ]

        )

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

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

requirements.txt

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ mock 
nose

pycurl

py-bcrypt

pika==0.11.2

pika==0.13.0

redis

PyYAML

protobuf
@@ -10,7 +10,7 @@ flask 
python-consul

prometheus_client>=0.0.18

requests

biomaj_core>=3.0.12

biomaj_core>=3.0.16

biomaj_zipkin

flake8

humanfriendly

setup.py

+2 −2
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.19',

    'version': '3.0.21',

     'classifiers': [

        # How mature is this project? Common values are

        #   3 - Alpha
@@ -46,7 +46,7 @@ config = { 
                         'biomaj_zipkin',

                         'pycurl',

                         'py-bcrypt',

                         'pika==0.11.2',

                         'pika==0.13.0',

                         'redis',

                         'PyYAML',

                         'flask',