Skip to content

Commit

Permalink
Merge pull request #5 from Terralego/change_app_name
Browse files Browse the repository at this point in the history
change app name from terra to geostore
  • Loading branch information
submarcos committed Sep 11, 2019
2 parents ba83df5 + 9b3ef6c commit 4361bcb
Show file tree
Hide file tree
Showing 106 changed files with 262 additions and 261 deletions.
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ omit =
*/tests*
*/migrations*
*/lib*
test_terra/*
test_geostore/*
doc/*
manage.py

Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
install:
- pip install flake8
script:
- flake8 terra
- flake8 geostore

- stage: deploy
install: skip
Expand Down
7 changes: 4 additions & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
include *.md
recursive-include terra *.md
recursive-include terra *.py
recursive-exclude test_terra *
recursive-include geostore *.md
recursive-include geostore *.py
recursive-exclude test_geostore *
recursive-exclude geostore/tests/ *
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[![Build Status](https://travis-ci.org/Terralego/terralego.backend.terra.svg?branch=master)](https://travis-ci.org/Terralego/terralego.backend.terra/)
[![codecov](https://codecov.io/gh/Terralego/terralego.backend.terra/branch/master/graph/badge.svg)](https://codecov.io/gh/Terralego/terralego.backend.terra)
[![Maintainability](https://api.codeclimate.com/v1/badges/74b0d8430ff982633ee7/maintainability)](https://codeclimate.com/github/Terralego/terralego.backend.terra/maintainability)
[![Documentation Status](https://readthedocs.org/projects/terralegobackendterra/badge/?version=latest)](https://terralegobackendterra.readthedocs.io/en/latest/?badge=latest)
[![Build Status](https://travis-ci.org/Terralego/django-geostore.svg?branch=master)](https://travis-ci.org/Terralego/django-geostore/)
[![codecov](https://codecov.io/gh/Terralego/django-geostore/branch/master/graph/badge.svg)](https://codecov.io/gh/Terralego/django-geostore)
[![Maintainability](https://api.codeclimate.com/v1/badges/74b0d8430ff982633ee7/maintainability)](https://codeclimate.com/github/Terralego/django-geostore/maintainability)
[![Documentation Status](https://readthedocs.org/projects/django-geostore/badge/?version=latest)](https://django-geostore.readthedocs.io/en/latest/?badge=latest)

![Python Version](https://img.shields.io/badge/python-%3E%3D%203.6-blue.svg)
![Django Version](https://img.shields.io/badge/django-%3E%3D%202.1%2C<3.0-blue.svg)
Expand Down
4 changes: 2 additions & 2 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@

# -- Project information -----------------------------------------------------

project = 'terra-backend-crud'
project = 'geostore-backend-crud'
copyright = '2019, Makina Corpus'
author = 'Makina Corpus'

# The full version, including alpha/beta/rc tags
release = open(os.path.join(root, 'terra', 'VERSION.md')).read()
release = open(os.path.join(root, 'geostore', 'VERSION.md')).read()


# -- General configuration ---------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions doc/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ In your project :
...
'rest_framework',
'rest_framework_gis',
'terra',
'geostore',
...
]

Expand All @@ -34,11 +34,11 @@ In your project :

urlpatterns = [
...
path('', include('terra.urls', namespace='terra')),
path('', include('geostore.urls', namespace='geostore')),
...
]

You can customize default url and namespace by including terra.views directly
You can customize default url and namespace by including geostore.views directly


# ADMIN :
Expand Down
12 changes: 6 additions & 6 deletions doc/index.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
|Build Status| |Maintainability| |codecov|

terra
django-geostore
=======================

Terralego backend app
Expand All @@ -11,9 +11,9 @@ Terralego backend app
configuration
use

.. |Build Status| image:: https://travis-ci.org/Terralego/terralego.backend.terra.svg?branch=master
:target: https://travis-ci.org/Terralego//terralego.backend.terra
.. |Build Status| image:: https://travis-ci.org/Terralego/django-geostore.svg?branch=master
:target: https://travis-ci.org/Terralego//django-geostore
.. |Maintainability| image:: https://api.codeclimate.com/v1/badges/74b0d8430ff982633ee7/maintainability
:target: https://codeclimate.com/github/Terralego/terralego.backend.terra/maintainability
.. |codecov| image:: https://codecov.io/gh/Terralego/terralego.backend.terra/branch/master/graph/badge.svg
:target: https://codecov.io/gh/Terralego/terralego.backend.terra
:target: https://codeclimate.com/github/Terralego/django-geostore/maintainability
.. |codecov| image:: https://codecov.io/gh/Terralego/django-geostore/branch/master/graph/badge.svg
:target: https://codecov.io/gh/Terralego/django-geostore
6 changes: 3 additions & 3 deletions doc/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ From Github:

::

pip install -e https://github.com/Terralego/terralego.backend.terra.git@master#egg=terra
pip install -e https://github.com/Terralego/django-geostore.git@master#egg=geostore

With git
--------

::

git clone https://github.com/Terralego/terralego.backend.terra.git
cd terralego.backend.terra
git clone https://github.com/Terralego/django-geostore.git
cd django-geostore
python setup.py install
File renamed without changes.
2 changes: 1 addition & 1 deletion terra/__init__.py → geostore/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from enum import IntEnum

default_app_config = 'terra.apps.TerraConfig'
default_app_config = 'geostore.apps.GeostoreConfig'


class GeometryTypes(IntEnum):
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions terra/apps.py → geostore/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
from django.conf import settings


class TerraConfig(AppConfig):
name = 'terra'
verbose_name = "TERRA: Geographic Store"
class GeostoreConfig(AppConfig):
name = 'geostore'
verbose_name = "Geographic Store"

def ready(self):
# force use specific geojson serializer
modules = getattr(settings, 'SERIALIZATION_MODULES', {})
modules.update({
'geojson': 'terra.serializers.geojson',
'geojson': 'geostore.serializers.geojson',
})
setattr(settings, 'SERIALIZATION_MODULES', modules)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
from django.db import transaction
from mercantile import tiles

from terra.models import Layer
from terra.tiles.helpers import VectorTile
from geostore.models import Layer
from geostore.tiles.helpers import VectorTile


class Command(BaseCommand):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from django.utils.module_loading import import_string
from django.utils.translation import ugettext as _

from terra.models import Layer
from geostore.models import Layer


class Command(BaseCommand):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
from django.core.management.base import BaseCommand, CommandError
from django.db import transaction

from terra.management.commands.mixins import LayerCommandMixin
from terra.models import Layer, LayerGroup
from geostore.management.commands.mixins import LayerCommandMixin
from geostore.models import Layer, LayerGroup


class Command(LayerCommandMixin, BaseCommand):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
from django.core.management.base import BaseCommand, CommandError
from django.utils.translation import ugettext as _

from terra.management.commands.mixins import LayerCommandMixin
from terra.models import Layer
from geostore.management.commands.mixins import LayerCommandMixin
from geostore.models import Layer


class Command(LayerCommandMixin, BaseCommand):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
from django.core.management.base import BaseCommand, CommandError
from django.db import transaction

from terra.management.commands.mixins import LayerCommandMixin
from terra.models import Layer, LayerGroup
from geostore.management.commands.mixins import LayerCommandMixin
from geostore.models import Layer, LayerGroup


class Command(LayerCommandMixin, BaseCommand):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
from django.core.management.base import BaseCommand, CommandError
from django.utils.translation import ugettext as _

from terra.management.commands.mixins import LayerCommandMixin
from terra.models import LayerGroup
from terra.tiles.helpers import guess_maxzoom, guess_minzoom
from geostore.management.commands.mixins import LayerCommandMixin
from geostore.models import LayerGroup
from geostore.tiles.helpers import guess_maxzoom, guess_minzoom


class Command(LayerCommandMixin, BaseCommand):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from django.db import connection, transaction
from django.utils.module_loading import import_string

from terra.management.commands.mixins import LayerCommandMixin
from terra.models import Feature, Layer
from geostore.management.commands.mixins import LayerCommandMixin
from geostore.models import Feature, Layer


class Command(LayerCommandMixin, BaseCommand):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.core.management.base import CommandError

from terra.models import Layer
from geostore.models import Layer


class LayerCommandMixin(object):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from django.core.management.base import BaseCommand, CommandError
from django.db import transaction

from terra.models import Layer, Routing
from geostore.models import Layer, Routing


class Command(BaseCommand):
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import django.db.models.deletion
from django.db import migrations, models

import terra.fields
import geostore.fields


class Migration(migrations.Migration):
Expand All @@ -25,17 +25,17 @@ class Migration(migrations.Migration):
('geom', django.contrib.gis.db.models.fields.GeometryField()),
('identifier', models.CharField(default=uuid.uuid4, max_length=255)),
('properties', django.contrib.postgres.fields.jsonb.JSONField()),
('from_date', terra.fields.DateFieldYearLess(default='01-01', help_text='Layer validity period start')),
('to_date', terra.fields.DateFieldYearLess(default='12-31', help_text='Layer validity period end')),
('from_date', geostore.fields.DateFieldYearLess(default='01-01', help_text='Layer validity period start')),
('to_date', geostore.fields.DateFieldYearLess(default='12-31', help_text='Layer validity period end')),
],
),
migrations.CreateModel(
name='FeatureRelation',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('properties', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict)),
('destination', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='relations_as_destination', to='terra.Feature')),
('origin', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='relations_as_origin', to='terra.Feature')),
('destination', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='relations_as_destination', to='geostore.Feature')),
('origin', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='relations_as_origin', to='geostore.Feature')),
],
),
migrations.CreateModel(
Expand All @@ -52,13 +52,13 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('schema', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict)),
('destination', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='relations_as_destination', to='terra.Layer')),
('origin', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='relations_as_origin', to='terra.Layer')),
('destination', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='relations_as_destination', to='geostore.Layer')),
('origin', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='relations_as_origin', to='geostore.Layer')),
],
),
migrations.AddField(
model_name='feature',
name='layer',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='features', to='terra.Layer'),
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='features', to='geostore.Layer'),
),
]
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class Migration(migrations.Migration):

dependencies = [
('terra', '0001_initial'),
('geostore', '0001_initial'),
]

operations = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class Migration(migrations.Migration):

dependencies = [
('terra', '0011_auto_20180711_0831'),
('geostore', '0011_auto_20180711_0831'),
]

operations = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@


def update_name(apps, schema_editor):
Layer = apps.get_model('terra', 'Layer')
Layer = apps.get_model('geostore', 'Layer')
for layer in Layer.objects.filter(name=""):
layer.name = uuid.uuid4()
layer.save(update_fields=['name', ])
Expand All @@ -15,7 +15,7 @@ def update_name(apps, schema_editor):
class Migration(migrations.Migration):

dependencies = [
('terra', '0012_extension_pgrouting'),
('geostore', '0012_extension_pgrouting'),
]

operations = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class Migration(migrations.Migration):

dependencies = [
('terra', '0013_auto_20180919_1146'),
('geostore', '0013_auto_20180919_1146'),
]

operations = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class Migration(migrations.Migration):

dependencies = [
('terra', '0014_auto_20180918_1210'),
('geostore', '0014_auto_20180918_1210'),
]

operations = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class Migration(migrations.Migration):

dependencies = [
('terra', '0015_auto_20181005_1302'),
('geostore', '0015_auto_20181005_1302'),
]

operations = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class Migration(migrations.Migration):

dependencies = [
('terra', '0016_auto_20181120_1059'),
('geostore', '0016_auto_20181120_1059'),
]

operations = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class Migration(migrations.Migration):

dependencies = [
('terra', '0017_auto_20181114_0806'),
('geostore', '0017_auto_20181114_0806'),
]

operations = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
class Migration(migrations.Migration):

dependencies = [
('terra', '0017_auto_20181114_0806'),
('geostore', '0017_auto_20181114_0806'),
]

operations = [
BtreeGistExtension(),
migrations.AddIndex(
model_name='feature',
index=models.Index(fields=['identifier'], name='terra_featu_identif_212b28_idx'),
index=models.Index(fields=['identifier'], name='geo_featu_identif_212b28_idx'),
),
migrations.AddIndex(
model_name='feature',
index=django.contrib.postgres.indexes.GistIndex(fields=['layer', 'geom'], name='terra_featu_layer_i_3dcdde_gist'),
index=django.contrib.postgres.indexes.GistIndex(fields=['layer', 'geom'], name='geo_featu_layer_i_3dcdde_gist'),
),
]
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
class Migration(migrations.Migration):

dependencies = [
('terra', '0018_auto_20190326_1049'),
('terra', '0018_auto_20190228_1655'),
('geostore', '0018_auto_20190326_1049'),
('geostore', '0018_auto_20190228_1655'),
]

operations = [
Expand Down

0 comments on commit 4361bcb

Please sign in to comment.