CR changes

.travis.yml

@@ -14,8 +14,6 @@ env:
    global:
        - OS_CONDUCTOR_ENGINE=postgresql://postgres@/postgres
        - OS_ELASTICSEARCH_ADDRESS=localhost:9200
        - OS_API_URL=http://localhost:8000
        - OS_CONDUCTOR_URL=http://localhost:8000
        # DOCKER_USERNAME
        - secure: XKtk/mVKMBmyLhF+P9thIcP7stsPPG2Xd7JATB1ey73s1gIBPh2c9SqTeQXNjZv0adumoRpxCQPZRpzqqiynG24d0IIiK5KGCj/Yo+8v6+CkuFo0l+t+pmocR+z7iQIqpTP7SjdJjcpwBCY1yBCTveC10mjPIFtkstVtrF/0pnwGkXgYQOOiNX/kOrx8M66webirr7rICA0CGH+sWVJu0yAvtqZauVp1p1pBC8fd+yJDisxFZhzEnmUJ7nshAalzecR82CF9A6WjEnwjDDVuT1myERZCb1sQ8LODLVgGJ3jf6EWgHz1HO82Uwdz3ri4ps8z40/EWpdtrkGX7afN8SlPBnhybLu00ecXBWEDDaben+8wWVYVgAlY4bRqnIq5jAU99gS81NpmSh7linFPqp0ZM6xELWbpPuYY5u510iZeHUkXcNxDZaJdYOCZ8Z0u4KyxJb44wZ/ODVx80JoRmiYdkDKOIDxLLVVOsqRWulBETtsK3UEm8nsI4WjTj0ifdUUoZNP4UslDljFTniNe/LArlj8GyL8w4ZrORtVBREvSqIYx7aNN3yW9kV7bibI7+jVNXqHJ3QQBlUnyfK/SUQJ0oiqxz4R0jQijgIqJlrXCI1O4zYy87pU1ClNUPuSnxGsZGyczqLQIHAC8UXeARFTZ5w6Exx/5tIZ6KQA+jikg=
        # DOCKER_PASSWORD

Dockerfile

@@ -1,12 +1,14 @@
FROM python:3.6-alpine

RUN apk add --update --no-cache libpq postgresql-dev libffi libffi-dev bash libstdc++ nodejs
RUN apk add --update --no-cache libpq postgresql-dev libffi libffi-dev bash curl libstdc++ nodejs
RUN apk add --update --no-cache --virtual=build-dependencies build-base 
RUN apk --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ --update add leveldb leveldb-dev

WORKDIR /app
ADD requirements.txt .
RUN pip install -r requirements.txt

# Install os-types, used in the loading process for fiscal modelling the datapackage
RUN npm install -g os-types

RUN apk del build-dependencies

README.md

@@ -21,14 +21,10 @@ OS Conductor requires environmental variables to be set, either in the local env

# Base URL for the application, e.g. 'http://localhost' or 'https://openspending.org'
OS_BASE_URL=
# URL for this os-conductor instance within the network, used for callbacks. e.g. http://os-conductor:8000
OS_CONDUCTOR_URL=
# Address for the postgres instance, e.g. postgresql://postgres@db/postgres
OS_CONDUCTOR_ENGINE=
# Address for ElasticSearch instance
OS_ELASTICSEARCH_ADDRESS=
# Address for the OS API service (configured as a 'loader'), e.g. http://os-api-loader:8000
OS_API_URL=

# OAuth credentials. See the OAuth Credentials section below for details.
OS_CONDUCTOR_SECRETS_0=

conductor/blueprints/package/blueprint.py

@@ -13,8 +13,6 @@
else:
    cache = SimpleCache()

os_conductor = os.environ.get('OS_CONDUCTOR_URL')

logging.info('CACHE=%r', cache)

conductor/blueprints/package/controllers.py

@@ -13,7 +13,6 @@
from conductor.blueprints.user.controllers import PUBLIC_KEY
from .models import package_registry

os_api_url = os.environ.get('OS_API_URL')
runner = DppRunner()


@@ -136,7 +135,7 @@ def status(self):


    def __call__(self, pipeline_id, status, errors=None, stats=None):
        logging.error('upload_status_update: %s pipeline:%s, ' +
        logging.debug('upload_status_update: %s pipeline:%s, ' +
                      'status:%s, err:%s, stats:%s',
                      self.datapackage_url, pipeline_id, status, errors, stats)
        key = 'os-conductor:package:'+self.datapackage_url