Skip to content
Snippets Groups Projects

Feature/use api client

Merged Feature/use api client
feature/use_api_client into develop
Merged Nicola Jordan requested to merge feature/use_api_client into develop

Created by: hixi

Switch Conversion Service.

Closes #263 (closed)

Also closes #186 (closed) (because it removes the to-be-simplified code)

Reviewed by:

  • @das-g

Merge request reports

Approval is optional

Merged by avatar (Jul 18, 2025 7:27am UTC)

Merge details

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Nicola Jordan
    Nicola Jordan @nicola.jordan started a thread on commit 5d03af1a
    • osmaxx-py/config/settings/test.py
    1 1 from .local import * # noqa
    2 2
    3 OSMAXX['download_file_name'] = '%(excerpt_name)s-%(content_type)s-%(id)s.%(file_extension)s'
    3 DEBUG = False
    4
    5 OSMAXX_TEST_SETTINGS = {
    6 'download_file_name': '%(excerpt_name)s-%(content_type)s-%(id)s.%(file_extension)s',
    7 'CONVERSION_SERVICE_URL': 'http://localhost:8901/api/',
    8 'CONVERSION_SERVICE_USERNAME': 'osmaxxi',
  • Nicola Jordan
    Nicola Jordan @nicola.jordan started a thread on commit 0c754500
    • compose-common.yml
    20 20 - DJANGO_MEDIA_ROOT=/data/media
    21 21 - DJANGO_PRIVATE_MEDIA_ROOT=/data/private_media
    22 22 - DJANGO_RESULT_MEDIA_ROOT=/results
    23 - DJANGO_CELERY_BROKER_URL=amqp://guest@rabbit
    24 23 - DJANGO_DATABASE_URL=postgis://postgres@database/postgres
    25 24
  • Nicola Jordan
    Nicola Jordan @nicola.jordan started a thread on commit 0c754500
    • compose-common.yml
    20 20 - DJANGO_MEDIA_ROOT=/data/media
    21 21 - DJANGO_PRIVATE_MEDIA_ROOT=/data/private_media
    22 22 - DJANGO_RESULT_MEDIA_ROOT=/results
    23 - DJANGO_CELERY_BROKER_URL=amqp://guest@rabbit
    24 23 - DJANGO_DATABASE_URL=postgis://postgres@database/postgres
    25 24
  • Nicola Jordan
    Nicola Jordan @nicola.jordan
    Author Contributor

    Merged by: hixi at 2015-11-21 06:02:45 UTC

    • Please register or sign in to reply