Changeset 8486 for mauRepo/MolesManager


Ignore:
Timestamp:
06/08/12 17:01:38 (7 years ago)
Author:
mnagni
Message:

Incomplete - # 22534: Add versiojn number to the gui page
 http://team.ceda.ac.uk/trac/ceda/ticket/22534

Location:
mauRepo/MolesManager/trunk
Files:
1 added
53 edited
1 moved

Legend:

Unmodified
Added
Removed
  • mauRepo/MolesManager/trunk/MANIFEST.in

    r8485 r8486  
    1 prune tests 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/db/after_flush.py

    r8482 r8486  
    3131@author: mnagni 
    3232''' 
    33 from MolesManager.db.partyIndexes import addPartyIndexes, deletePartyIndexes,\ 
     33from cedaMoles.MolesManager.db.partyIndexes import addPartyIndexes, deletePartyIndexes,\ 
    3434    updatePartyIndexes 
    3535from ea_model.moles3_4.utilities.mo_responsiblepartyinfo import MO_ResponsiblePartyInfo 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/db/partyIndexes.py

    r8482 r8486  
    3131@author: mnagni 
    3232''' 
    33 from libs.epb import EPB 
     33from cedaMoles.libs.epb import EPB 
    3434from sqlalchemy import Table, Column, ForeignKey, Integer, String, event 
    3535from sqlalchemy.orm import mapper 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/forms/MapperView.py

    r8088 r8486  
    1818import json 
    1919import inspect 
    20 from MolesManager.forms.formsFactory import convertColumnToFormField 
     20from cedaMoles.MolesManager.forms.formsFactory import convertColumnToFormField 
    2121 
    2222 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/forms/date.py

    r8480 r8486  
    44@author: mnagni 
    55''' 
    6 from MolesManager.forms.formsFactory import createFieldInstance 
     6from cedaMoles.MolesManager.forms.formsFactory import createFieldInstance 
    77from django.forms.forms import Form 
    88from sqlalchemy.orm.properties import ColumnProperty, RelationshipProperty 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/moles3epb.py

    r8482 r8486  
    3131@author: mnagni 
    3232''' 
    33 from libs.epb import EPB 
     33from cedaMoles.libs.epb import EPB 
    3434from ea_model.moles3_4.observationcollection.mo_observationcollection import MO_ObservationCollection 
    3535from ea_model.moles3_4.observation.mo_observation import MO_Observation 
    3636from sqlalchemy import Table, Column, ForeignKey, Integer, String, event 
    3737from sqlalchemy.orm import mapper 
    38 from MolesManager.ceda_guid import CedaGUID 
     38from cedaMoles.MolesManager.ceda_guid import CedaGUID 
    3939from sqlalchemy.orm.collections import InstrumentedList 
    4040from ea_model.iso_19115_2006_metadata_corrigendum.reference_system_information.md_identifier import MD_Identifier 
    4141from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_citation import CI_Citation 
    4242from ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_geographicboundingbox import EX_GeographicBoundingBox 
    43 from libs.postgisutil import create_st_setSRID, unifyGeometriesAsBBox 
     43from cedaMoles.libs.postgisutil import create_st_setSRID, unifyGeometriesAsBBox 
    4444from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection 
    4545from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 
    4646from ea_model.ceda_metadatamodel.ceda_project.ceda_project import CEDA_Project 
    47 from MolesManager.codelist import MM_RoleValue, getCLValue 
    48 from libs.migration.processor.commons import fromPhenomenonTimeToString 
     47from cedaMoles.MolesManager.codelist import MM_RoleValue, getCLValue 
     48from cedaMoles.libs.migration.processor.commons import fromPhenomenonTimeToString 
    4949from datetime import datetime 
    5050from ascore.utils import synchAttributes 
    51 from MolesManager.db.partyIndexes import associateMOParty_indexes 
    52 from MolesManager.db.after_flush import afterFlush 
     51from cedaMoles.MolesManager.db.partyIndexes import associateMOParty_indexes 
     52from cedaMoles.MolesManager.db.after_flush import afterFlush 
    5353 
    5454class Moles3EPBFactory(EPB): 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/molesSessionMiddleware.py

    r8482 r8486  
    3131@author: Maurizio Nagni 
    3232''' 
    33 from MolesManager.moles3epb import Moles3EPBFactory 
    34 from libs.migration.client import MigrationThread 
    35 from MolesManager.settings import RUN_MIGRATION, MIGRATION_INTERVAL,\ 
     33from cedaMoles.MolesManager.moles3epb import Moles3EPBFactory 
     34from cedaMoles.libs.migration.client import MigrationThread 
     35from cedaMoles.MolesManager.settings import RUN_MIGRATION, MIGRATION_INTERVAL,\ 
    3636    MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT, MOLES3_DB_CONNECTION,\ 
    3737    MOLES3_DB_SCRIPT, EVENTS_DB, INFO_DB_CONNECTION 
    38 from libs.commons_db import DbManager 
    39 from libs.migration.InfodbEPB import InfodbEPBFactory 
    40 from libs.migration.MigrationEPB import MigrationEPBFactory 
     38from cedaMoles.libs.commons_db import DbManager 
     39from cedaMoles.libs.migration.InfodbEPB import InfodbEPBFactory 
     40from cedaMoles.libs.migration.MigrationEPB import MigrationEPBFactory 
    4141from sqlalchemy import exc 
    4242from django.core.context_processors import csrf 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/settings.py

    r8484 r8486  
    219219#MIGRATION_DB_CONNECTION = 'postgresql://user:pws@host:port/dbName' 
    220220MIGRATION_DB_CONNECTION = 'PG_MIGRATION_DB_CONNECTION' 
    221 from libs.migration.db.migrationTables import doTables as doMigration 
     221from cedaMoles.libs.migration.db.migrationTables import doTables as doMigration 
    222222MIGRATION_DB_SCRIPT = doMigration 
    223223 
     
    236236 
    237237# Local modifications to settings are imported from settings_local.py 
    238 from settings_local import * 
     238from cedaMoles.MolesManager.settings_local import * 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaBrowse.py

    r8409 r8486  
    55from django.shortcuts import render_to_response 
    66from django.core.context_processors import csrf 
    7 from MolesManager.moles3epb import Moles3EPB 
    8 from MolesManager.djencoder import DJEncoder 
     7from cedaMoles.MolesManager.moles3epb import Moles3EPB 
     8from cedaMoles.MolesManager.djencoder import DJEncoder 
    99from django.utils.safestring import mark_safe 
    1010from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaInstrument.py

    r8409 r8486  
    66from django.shortcuts import render_to_response 
    77from django.core.context_processors import csrf 
    8 from MolesManager.moles3epb import Moles3EPB 
    9 from MolesManager.djencoder import DJEncoder 
     8from cedaMoles.MolesManager.moles3epb import Moles3EPB 
     9from cedaMoles.MolesManager.djencoder import DJEncoder 
    1010from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 
    1111 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaObservationCollectionView.py

    r8445 r8486  
    3333from django.shortcuts import render_to_response 
    3434from django.core.context_processors import csrf 
    35 from MolesManager.djencoder import encodeToJSON 
     35from cedaMoles.MolesManager.djencoder import encodeToJSON 
    3636from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection 
    3737 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaObservationView.py

    r8477 r8486  
    3333from django.shortcuts import render_to_response 
    3434from django.core.context_processors import csrf 
    35 from MolesManager.djencoder import encodeToJSON 
     35from cedaMoles.MolesManager.djencoder import encodeToJSON 
    3636from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 
    37 from MolesManager.views.moles2gui import encodeCedaMoles2Json 
     37from cedaMoles.MolesManager.views.moles2gui import encodeCedaMoles2Json 
    3838 
    3939 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaPlatform.py

    r8409 r8486  
    66from django.shortcuts import render_to_response 
    77from django.core.context_processors import csrf 
    8 from MolesManager.forms.commons import ObjectById 
    9 from MolesManager.moles3epb import Moles3EPB 
    10 from MolesManager.djencoder import DJEncoder 
     8from cedaMoles.MolesManager.forms.commons import ObjectById 
     9from cedaMoles.MolesManager.moles3epb import Moles3EPB 
     10from cedaMoles.MolesManager.djencoder import DJEncoder 
    1111from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 
    1212 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaProjectView.py

    r8409 r8486  
    66from django.shortcuts import render_to_response 
    77from django.core.context_processors import csrf 
    8 from MolesManager.moles3epb import Moles3EPB 
    9 from MolesManager.djencoder import DJEncoder 
     8from cedaMoles.MolesManager.moles3epb import Moles3EPB 
     9from cedaMoles.MolesManager.djencoder import DJEncoder 
    1010from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 
    1111 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaSearch.py

    r8473 r8486  
    66from django.core.context_processors import csrf 
    77from django.shortcuts import render_to_response, redirect 
    8 from MolesManager.ceda_guid import CedaGUID 
     8from cedaMoles.MolesManager.ceda_guid import CedaGUID 
    99import cedaObservationView 
    1010import cedaObservationCollectionView 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedacat.py

    r8445 r8486  
    77from django.shortcuts import redirect 
    88 
    9 from MolesManager.views import cedaObservationView 
    10 from MolesManager.ceda_guid import CedaGUID 
     9from cedaMoles.MolesManager.views import cedaObservationView 
     10from cedaMoles.MolesManager.ceda_guid import CedaGUID 
    1111 
    1212def cedacat(request, guid): 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/index.py

    r8241 r8486  
    77from django.http import HttpResponse 
    88from django.shortcuts import render_to_response 
    9 import MolesManager.settings as settings 
     9import cedaMoles.MolesManager.settings as settings 
    1010from django.core.context_processors import csrf 
    1111 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/moles2gui/__init__.py

    r8480 r8486  
    66from ea_model.moles3_4.utilities.mo_organisation import MO_Organisation 
    77from ea_model.moles3_4.utilities.mo_individual import MO_Individual 
    8 from MolesManager.djencoder import escapeForJSON 
     8from cedaMoles.MolesManager.djencoder import escapeForJSON 
    99import operator 
    1010import inspect 
    11 from libs.epb import isPrimitive 
     11from cedaMoles.libs.epb import isPrimitive 
    1212 
    1313""" 
     
    1818 
    1919_encodeMapper = {'ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_instant.TM_Instant':  
    20                     ('MolesManager.views.moles2gui.om.instant', 'Instant'), 
     20                    ('cedaMoles.MolesManager.views.moles2gui.om.instant', 'Instant'), 
    2121                 'ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_period.TM_Period':  
    22                     ('MolesManager.views.moles2gui.om.period', 'Period'),                     
     22                    ('cedaMoles.MolesManager.views.moles2gui.om.period', 'Period'),                     
    2323                 'ea_model.moles3_4.utilities.mo_organisation.MO_Organisation':  
    24                     ('MolesManager.views.moles2gui.mo.party', 'Party'), 
     24                    ('cedaMoles.MolesManager.views.moles2gui.mo.party', 'Party'), 
    2525                 'ea_model.moles3_4.utilities.mo_individual.MO_Individual':  
    26                     ('MolesManager.views.moles2gui.mo.party', 'Party'), 
     26                    ('cedaMoles.MolesManager.views.moles2gui.mo.party', 'Party'), 
    2727                 'ea_model.moles3_4.utilities.mo_responsiblepartyinfo.MO_ResponsiblePartyInfo':  
    28                     ('MolesManager.views.moles2gui.mo.responsiblePartyInfo', 'ResponsiblePartyInfo'), 
     28                    ('cedaMoles.MolesManager.views.moles2gui.mo.responsiblePartyInfo', 'ResponsiblePartyInfo'), 
    2929                 'ea_model.ceda_metadatamodel.ceda_observation.ceda_observation.CEDA_Observation':  
    30                     ('MolesManager.views.moles2gui.ceda.observation', 'Observation')                     
     30                    ('cedaMoles.MolesManager.views.moles2gui.ceda.observation', 'Observation')                     
    3131                 } 
    3232 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/moles2gui/ceda/observation.py

    r8477 r8486  
    3131@author: mnagni 
    3232''' 
    33 from MolesManager.views.moles2gui import CedaMolesGuiAdapter 
     33from cedaMoles.MolesManager.views.moles2gui import CedaMolesGuiAdapter 
    3434from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 
    3535 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/moles2gui/mo/party.py

    r8477 r8486  
    3131@author: mnagni 
    3232''' 
    33 from MolesManager.views.moles2gui import CedaMolesGuiAdapter 
     33from cedaMoles.MolesManager.views.moles2gui import CedaMolesGuiAdapter 
    3434from ea_model.moles3_4.utilities.mo_individual import MO_Individual 
    3535from ea_model.moles3_4.utilities.mo_organisation import MO_Organisation 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/moles2gui/mo/responsiblePartyInfo.py

    r8477 r8486  
    3232''' 
    3333 
    34 from MolesManager.views.moles2gui import CedaMolesGuiAdapter 
     34from cedaMoles.MolesManager.views.moles2gui import CedaMolesGuiAdapter 
    3535from ea_model.moles3_4.utilities.mo_responsiblepartyinfo import MO_ResponsiblePartyInfo 
    3636 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/moles2gui/om/instant.py

    r8477 r8486  
    3131@author: mnagni 
    3232''' 
    33 from MolesManager.views.moles2gui import CedaMolesGuiAdapter, hasAttrNotNone 
     33from cedaMoles.MolesManager.views.moles2gui import CedaMolesGuiAdapter, hasAttrNotNone 
    3434from ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_instant import TM_Instant 
    3535 
  • mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/moles2gui/om/period.py

    r8477 r8486  
    3131@author: mnagni 
    3232''' 
    33 from MolesManager.views.moles2gui import CedaMolesGuiAdapter, unicodeToString 
     33from cedaMoles.MolesManager.views.moles2gui import CedaMolesGuiAdapter, unicodeToString 
    3434from ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_period import TM_Period 
    3535 
  • mauRepo/MolesManager/trunk/cedaMoles/libs/epb.py

    r8482 r8486  
    3434from sqlalchemy.sql.expression import text 
    3535from sqlalchemy.orm.util import identity_key 
    36 from MolesManager.djencoder import methodsWithDecorator 
     36from cedaMoles.MolesManager.djencoder import methodsWithDecorator 
    3737 
    3838class EPB(object): 
  • mauRepo/MolesManager/trunk/cedaMoles/libs/migration/InfodbEPB.py

    r8334 r8486  
    44@author: mnagni 
    55''' 
    6 from libs.epb import EPB 
     6from cedaMoles.libs.epb import EPB 
    77from sqlalchemy.sql.expression import text 
    88 
  • mauRepo/MolesManager/trunk/cedaMoles/libs/migration/MigrationEPB.py

    r8476 r8486  
    44@author: mnagni 
    55''' 
    6 from libs.migration.db.classes import DeploymentDataMigration, DataEntityMigration,\ 
     6from cedaMoles.libs.migration.db.classes import DeploymentDataMigration, DataEntityMigration,\ 
    77    DeploymentsMigration 
    88from sqlalchemy.sql.expression import asc 
    9 from libs.epb import EPB 
     9from cedaMoles.libs.epb import EPB 
    1010from sqlalchemy.orm.collections import InstrumentedList 
    1111 
  • mauRepo/MolesManager/trunk/cedaMoles/libs/migration/client.py

    r8433 r8486  
    3131@author: Maurizio Nagni 
    3232''' 
    33 from libs.migration.processor.loadResources import LoadResources 
    34 from libs.migration.processor.migrationProcess import MigrationProcess 
     33from cedaMoles.libs.migration.processor.loadResources import LoadResources 
     34from cedaMoles.libs.migration.processor.migrationProcess import MigrationProcess 
    3535 
    3636import threading 
    3737import time 
    3838from threading import Timer 
    39 from libs.migration.processor.EPBRepo import EPBRepo 
     39from cedaMoles.libs.migration.processor.EPBRepo import EPBRepo 
    4040from django.core.mail import send_mail 
    41 from MolesManager.settings import reportMigrationTo 
     41from cedaMoles.MolesManager.settings import reportMigrationTo 
    4242from datetime import datetime 
    4343 
  • mauRepo/MolesManager/trunk/cedaMoles/libs/migration/db/migrationTables.py

    r8195 r8486  
    77from sqlalchemy.types import TEXT, Integer, TIMESTAMP 
    88from sqlalchemy.orm import mapper 
    9 from libs.migration.db.classes import DeploymentDataMigration, DeploymentsMigration,\ 
     9from cedaMoles.libs.migration.db.classes import DeploymentDataMigration, DeploymentsMigration,\ 
    1010    DataEntityMigration 
    1111 
  • mauRepo/MolesManager/trunk/cedaMoles/libs/migration/processor/check/check.py

    r8235 r8486  
    44@author: mnagni 
    55''' 
    6 from libs.migration.exception.exceptions import Moles3ObjectException 
     6from cedaMoles.libs.migration.exception.exceptions import Moles3ObjectException 
    77def _updateParty(oldParty, newParty): 
    88    pass 
  • mauRepo/MolesManager/trunk/cedaMoles/libs/migration/processor/commons.py

    r8477 r8486  
    3535from xml.etree.ElementTree import XML, tostring 
    3636import time, datetime 
    37 from libs.migration.exception.exceptions import NoDataLineage 
     37from cedaMoles.libs.migration.exception.exceptions import NoDataLineage 
    3838from hashlib import md5 
    3939from xml.sax.saxutils import unescape, escape 
  • mauRepo/MolesManager/trunk/cedaMoles/libs/migration/processor/dataEntity.py

    r8481 r8486  
    3131@author: Maurizio Nagni 
    3232''' 
    33 from libs.migration.exception.exceptions import MigrationObjectException, NoAssociatedAuthor,\ 
     33from cedaMoles.libs.migration.exception.exceptions import MigrationObjectException, NoAssociatedAuthor,\ 
    3434    migrationObjectDescription, NoAssociatedDeployments,\ 
    3535    NoGeographicalExtensionException, NoCitationException 
    36 from libs.migration.processor.commons import findDeploymentsInDE,\ 
     36from cedaMoles.libs.migration.processor.commons import findDeploymentsInDE,\ 
    3737    createMD_Identifier, extractContent,\ 
    3838    hasMOSameHash, createCI_Citation, createCI_Date, findPublishedDate,\ 
     
    4242    createEX_GeographicBoundingBox, fromDateStringToPhenomenonTime,\ 
    4343    comparePhenomenonTimes, compareGeographicBoundingBoxes 
    44 from libs.migration.processor.deployment import DeploymentProcessor 
     44from cedaMoles.libs.migration.processor.deployment import DeploymentProcessor 
    4545from logging import StreamHandler 
    4646import logging 
    4747from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_datetypecode import CI_DateTypeCode 
    48 from MolesManager.ceda_guid import CedaGUID 
    49 from MolesManager.codelist import MM_ObservationPublicationStateValue,\ 
     48from cedaMoles.MolesManager.ceda_guid import CedaGUID 
     49from cedaMoles.MolesManager.codelist import MM_ObservationPublicationStateValue,\ 
    5050    getCLValue 
    5151from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection  
    52 from MolesManager.moles3epb import getUnifyObservationCollectionPhenomenonTime 
     52from cedaMoles.MolesManager.moles3epb import getUnifyObservationCollectionPhenomenonTime 
    5353CEDA_TITLE = 'ceda_title' 
    5454 
  • mauRepo/MolesManager/trunk/cedaMoles/libs/migration/processor/deployment.py

    r8476 r8486  
    3131@author: Maurizio Nagni 
    3232''' 
    33 from libs.migration.processor.commons import findMolesLineage,\ 
     33from cedaMoles.libs.migration.processor.commons import findMolesLineage,\ 
    3434    createMO_ResponsiblePartyInfo,\ 
    3535    DO_BADC, DO_NEODC, findAuthorsInResource, \ 
     
    5353    fromDateStringToPhenomenonTime, fromPhenomenonTimeToString,\ 
    5454    comparePhenomenonTimes, compareGeographicBoundingBoxes 
    55 from libs.epb import EPB 
    56 from libs.migration.processor.deployment_data import DeploymentDataProcessor 
    57 from libs.migration.exception.exceptions import NoDataLineage,\ 
     55from cedaMoles.libs.epb import EPB 
     56from cedaMoles.libs.migration.processor.deployment_data import DeploymentDataProcessor 
     57from cedaMoles.libs.migration.exception.exceptions import NoDataLineage,\ 
    5858    NoAssociatedAuthor, NoAssociatedDeployments,\ 
    5959    NoGeographicalExtensionException 
    60 from libs.migration.authors import authors 
     60from cedaMoles.libs.migration.authors import authors 
    6161from logging import StreamHandler 
    6262import logging 
     
    6767from copy import deepcopy 
    6868import datetime 
    69 from MolesManager.ceda_guid import CedaGUID 
     69from cedaMoles.MolesManager.ceda_guid import CedaGUID 
    7070from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_rolecode import CI_RoleCode 
    7171from ea_model.iso_19115_2006_metadata_corrigendum.maintenance_information.md_maintenancefrequencycode import MD_MaintenanceFrequencyCode 
    7272from ea_model.moles3_4.utilities.ceda_rolevalue import CEDA_RoleValue 
    7373from ea_model.moles3_4.observation.mo_observationpublicationstatevalue import MO_ObservationPublicationStateValue 
    74 from MolesManager.codelist import MM_RoleValue,\ 
     74from cedaMoles.MolesManager.codelist import MM_RoleValue,\ 
    7575    MM_ObservationPublicationStateValue, getCLValue 
    7676from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 
  • mauRepo/MolesManager/trunk/cedaMoles/libs/migration/processor/deployment_data.py

    r8481 r8486  
    3131@author: Maurizio Nagni 
    3232''' 
    33 from libs.migration.processor.commons import findSubTypeInDPT,\ 
     33from cedaMoles.libs.migration.processor.commons import findSubTypeInDPT,\ 
    3434    createCEDA_Processing, createCEDA_Instrument, createCEDA_Project,\ 
    3535    findSummary, findDocumentationInMigrationDocument, createCI_Citation,\ 
     
    3737    getAtomDocumentHashByMO, calculateHash, hasMOSameHash 
    3838from ea_model.moles3_4.utilities.ceda_publicationstatevalue import CEDA_PublicationStateValue 
    39 from MolesManager.codelist import getCLValue 
    40 from MolesManager.ceda_guid import CedaGUID 
     39from cedaMoles.MolesManager.codelist import getCLValue 
     40from cedaMoles.MolesManager.ceda_guid import CedaGUID 
    4141import logging 
    4242from logging import StreamHandler 
  • mauRepo/MolesManager/trunk/cedaMoles/libs/migration/processor/loadResources.py

    r8424 r8486  
    3131@author: Maurizio Nagni 
    3232''' 
    33 from libs.migration.processor.commons import DOC_STATUS, getCollectionRefs,\ 
     33from cedaMoles.libs.migration.processor.commons import DOC_STATUS, getCollectionRefs,\ 
    3434    findMolesCreationDate, findID, stringToTimestamp, buildExistTypePath,\ 
    3535    buildExistDocPath, DT_DATA_ENTITIES, DT_DEPLOYMENTS, DT_DEPLOYMENT_DATA,\ 
    3636    getOwnerRefs, getAtomDocumentAsElementtree 
    37 from libs.migration.exception.exceptions import NoCreationDate, NoDocumentID 
    38 from libs.migration.db.classes import DeploymentDataMigration,\ 
     37from cedaMoles.libs.migration.exception.exceptions import NoCreationDate, NoDocumentID 
     38from cedaMoles.libs.migration.db.classes import DeploymentDataMigration,\ 
    3939    DeploymentsMigration, DataEntityMigration 
    4040 
  • mauRepo/MolesManager/trunk/cedaMoles/libs/migration/processor/migrationProcess.py

    r8433 r8486  
    3131@author: Maurizio Nagni 
    3232''' 
    33 from libs.migration.processor.dataEntity import DataEntityProcessor 
     33from cedaMoles.libs.migration.processor.dataEntity import DataEntityProcessor 
    3434import logging 
    3535from logging import StreamHandler 
  • mauRepo/MolesManager/trunk/cedaMoles/tests/__init__.py

    r8476 r8486  
     1from cedaMoles.tests.cedamoles.mo.responsiblePartyInfo import ResponsiblePartyInfoTest as rit 
     2from cedaMoles.tests.moles2gui.mo.responsiblePartyInfo import ResponsiblePartyInfoTest as rit2  
     3from unittest import TestSuite 
     4  
     5def suite(): 
     6    suite = TestSuite() 
     7    suite.addTest(rit()) 
     8    suite.addTest(rit2()) 
     9    return suite 
     10 
     11 
     12 
  • mauRepo/MolesManager/trunk/cedaMoles/tests/cedamoles/mo/responsiblePartyInfo.py

    r8482 r8486  
    3232''' 
    3333from unittest import TestCase 
    34 from libs.commons_db import DbManager 
    35 from libs.migration.MigrationEPB import MigrationEPBFactory 
    36 from MolesManager.moles3epb import Moles3EPBFactory 
    37 from libs.migration.InfodbEPB import InfodbEPBFactory 
    38 from libs.migration.client import EPBRepo 
    39 from testconfig import MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT,\ 
     34from cedaMoles.libs.commons_db import DbManager 
     35from cedaMoles.libs.migration.MigrationEPB import MigrationEPBFactory 
     36from cedaMoles.MolesManager.moles3epb import Moles3EPBFactory 
     37from cedaMoles.libs.migration.InfodbEPB import InfodbEPBFactory 
     38from cedaMoles.libs.migration.client import EPBRepo 
     39from cedaMoles.tests.testconfig import MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT,\ 
    4040    MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT, INFO_DB_CONNECTION, EVENTS_DB 
    41 from libs.migration.processor.commons import createMO_ResponsiblePartyInfo,\ 
     41from cedaMoles.libs.migration.processor.commons import createMO_ResponsiblePartyInfo,\ 
    4242    createCI_OnlineResource, createCI_Address, createCI_Telephone,\ 
    4343    createCI_Contact, createMO_Organization 
    44 from MolesManager.codelist import getCLValue, MM_RoleValue 
     44from cedaMoles.MolesManager.codelist import getCLValue, MM_RoleValue 
    4545from ea_model.moles3_4.utilities.mo_organisation import MO_Organisation 
    4646from ea_model.moles3_4.utilities.mo_responsiblepartyinfo import MO_ResponsiblePartyInfo 
    47 from MolesManager.db.partyIndexes import PartyIndexes, createAssociateIndexes 
    48 from sqlalchemy.exc import InvalidRequestError, IntegrityError 
     47from cedaMoles.MolesManager.db.partyIndexes import PartyIndexes, createAssociateIndexes 
    4948 
    5049def _createResponsibleParty(): 
     
    6766    return createMO_ResponsiblePartyInfo(getCLValue(MM_RoleValue.cl_publisher), parties)     
    6867 
    69 class ResponsiblePartyInfo(TestCase): 
     68class ResponsiblePartyInfoTest(TestCase): 
    7069    ''' 
    7170    Exploits tests mainly over MO_ResponsiblePartyInfo instances.  
     
    7675     
    7776    def setUp(self): 
    78         if ResponsiblePartyInfo.initialized: 
     77        if ResponsiblePartyInfoTest.initialized: 
    7978            return 
    8079                 
     
    8786        migrationFactory = MigrationEPBFactory(migrationDB) 
    8887 
    89         ResponsiblePartyInfo.epbRepo = EPBRepo(moles3Factory.createEPB() , \ 
     88        ResponsiblePartyInfoTest.epbRepo = EPBRepo(moles3Factory.createEPB() , \ 
    9089                               migrationFactory.createEPB(), \ 
    9190                               infoFactory.createEPB()) 
    9291 
    93         ResponsiblePartyInfo.initialized = True 
     92        ResponsiblePartyInfoTest.initialized = True 
    9493 
    9594 
     
    110109        '''    
    111110        rp = _createResponsibleParty() 
    112         ResponsiblePartyInfo.epbRepo.moles3EPB.persistInstance(rp) 
     111        ResponsiblePartyInfoTest.epbRepo.moles3EPB.persistInstance(rp) 
    113112        self.assertTrue(len(rp.party) == 2, "Error") 
    114113        self.assertEqual(rp.role, getCLValue(MM_RoleValue.cl_publisher), "Error") 
     
    122121        #----------------------------- 
    123122        rpid = getattr(rp, 'id') 
    124         ResponsiblePartyInfo.epbRepo.moles3EPB.deleteInstance(rp) 
     123        ResponsiblePartyInfoTest.epbRepo.moles3EPB.deleteInstance(rp) 
    125124        self.assertEqual(self.epbRepo.moles3EPB.search(MO_ResponsiblePartyInfo, rpid), None, "Error") 
    126125        #----------------------------- 
     
    128127        # Verifies that the underlying parties has been deleted 
    129128        #---------------------------------------------------- 
    130         res = ResponsiblePartyInfo.epbRepo.moles3EPB.search(MO_Organisation, partyIds[0]) 
     129        res = ResponsiblePartyInfoTest.epbRepo.moles3EPB.search(MO_Organisation, partyIds[0]) 
    131130        self.assertTrue(res.id in partyIds, "Error") 
    132131        res = self.epbRepo.moles3EPB.search(MO_Organisation, partyIds[1]) 
     
    156155        pi.id = None 
    157156        try:         
    158             ResponsiblePartyInfo.epbRepo.moles3EPB.persistInstance(pi) 
     157            ResponsiblePartyInfoTest.epbRepo.moles3EPB.persistInstance(pi) 
    159158            self.fail("PartyIndexes.id cannot be None - PrimaryKey Error") 
    160159        except: 
    161             ResponsiblePartyInfo.epbRepo.moles3EPB.rollback() 
     160            ResponsiblePartyInfoTest.epbRepo.moles3EPB.rollback() 
    162161        #----------------------------------- 
    163162         
     
    165164        pi.id = 100 
    166165        try: 
    167             ResponsiblePartyInfo.epbRepo.moles3EPB.persistInstance(pi) 
     166            ResponsiblePartyInfoTest.epbRepo.moles3EPB.persistInstance(pi) 
    168167            self.fail("PartyIndexes.id has not associated MO_REsponsiblePartyInfo - ForeignKey Error") 
    169168        except: 
    170             ResponsiblePartyInfo.epbRepo.moles3EPB.rollback() 
     169            ResponsiblePartyInfoTest.epbRepo.moles3EPB.rollback() 
    171170        #----------------------------------- 
    172171         
    173172        #------------ Test 3 --------------- 
    174         ResponsiblePartyInfo.epbRepo.moles3EPB.persistInstance(rp) 
     173        ResponsiblePartyInfoTest.epbRepo.moles3EPB.persistInstance(rp) 
    175174        pi.id = getattr(rp, 'id') 
    176175        try: 
    177             ResponsiblePartyInfo.epbRepo.moles3EPB.persistInstance(pi) 
     176            ResponsiblePartyInfoTest.epbRepo.moles3EPB.persistInstance(pi) 
    178177            self.fail("PartyIndexes.id has not associated MO_REsponsiblePartyInfo - ForeignKey Error") 
    179178        except Exception as e: 
    180             ResponsiblePartyInfo.epbRepo.moles3EPB.rollback() 
     179            ResponsiblePartyInfoTest.epbRepo.moles3EPB.rollback() 
    181180        #----------------------------------- 
    182181         
    183182        #------------ Test 4 --------------- 
    184183        resId = getattr(rp, 'id') 
    185         ResponsiblePartyInfo.epbRepo.moles3EPB.expunge(rp) 
    186         res = ResponsiblePartyInfo.epbRepo.moles3EPB.search(MO_ResponsiblePartyInfo, resId) 
     184        ResponsiblePartyInfoTest.epbRepo.moles3EPB.expunge(rp) 
     185        res = ResponsiblePartyInfoTest.epbRepo.moles3EPB.search(MO_ResponsiblePartyInfo, resId) 
    187186        for party in res.party: 
    188187            self.assertTrue(party.party_order > -1, "MO_Party.party_order is not assigned - Error") 
     
    190189         
    191190        #------------ Test 5 --------------- 
    192         ResponsiblePartyInfo.epbRepo.moles3EPB.deleteInstance(res) 
    193         pi = ResponsiblePartyInfo.epbRepo.moles3EPB.search(PartyIndexes, resId) 
     191        ResponsiblePartyInfoTest.epbRepo.moles3EPB.deleteInstance(res) 
     192        pi = ResponsiblePartyInfoTest.epbRepo.moles3EPB.search(PartyIndexes, resId) 
    194193        self.assertTrue(pi is None, "PartyIndexes is not deleted after MO_ResponsiblePartyInfo is deleted - Error") 
    195194        #----------------------------------- 
  • mauRepo/MolesManager/trunk/cedaMoles/tests/migration/commontest.py

    r8476 r8486  
    55''' 
    66from unittest import TestCase 
    7 from libs.migration.processor.commons import isoDateTimeStringToTimeDate,\ 
     7from cedaMoles.libs.migration.processor.commons import isoDateTimeStringToTimeDate,\ 
    88    fromDateStringToPhenomenonTime, fromPhenomenonTimeToString,\ 
    99    comparePhenomenonTimes 
  • mauRepo/MolesManager/trunk/cedaMoles/tests/migration/deployment_tests.py

    r8476 r8486  
    55''' 
    66from  unittest import TestCase 
    7 from libs.migration.processor.deployment import DeploymentProcessor 
     7from cedaMoles.libs.migration.processor.deployment import DeploymentProcessor 
    88class DeploymentTest(TestCase): 
    99    ''' 
  • mauRepo/MolesManager/trunk/cedaMoles/tests/migration/infodbepbtests.py

    r8476 r8486  
    55''' 
    66import unittest 
    7 from libs.commons_db import DbManager 
     7from cedaMoles.libs.commons_db import DbManager 
    88from unittest import TestCase 
    99import logging 
    1010from logging import StreamHandler   
    11 from testconfig import INFO_DB_CONNECTION 
    12 from libs.migration.InfodbEPB import InfodbEPB 
    13 from sqlalchemy.sql.expression import text 
     11from cedaMoles.tests.testconfig import INFO_DB_CONNECTION 
    1412 
    1513 
  • mauRepo/MolesManager/trunk/cedaMoles/tests/migration/loadresource.py

    r8476 r8486  
    55''' 
    66from unittest import TestCase 
    7 from libs.commons_db import DbManager 
    8 from libs.migration.processor.loadResources import LoadResources 
    9 from libs.migration.db.classes import DataEntityMigration 
    10 from libs.migration.processor.commons import calculateHash 
    11 from testconfig import MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT 
     7from cedaMoles.libs.commons_db import DbManager 
     8from cedaMoles.libs.migration.processor.loadResources import LoadResources 
     9from cedaMoles.libs.migration.db.classes import DataEntityMigration 
     10from cedaMoles.libs.migration.processor.commons import calculateHash 
     11from cedaMoles.tests.testconfig import MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT 
    1212 
    1313class LoadResourceTest(TestCase): 
  • mauRepo/MolesManager/trunk/cedaMoles/tests/migration/migrationprocess.py

    r8476 r8486  
    3232''' 
    3333from unittest import TestCase 
    34 from libs.commons_db import DbManager 
    35 from libs.migration.MigrationEPB import MigrationEPBFactory 
    36 from libs.migration.processor.loadResources import LoadResources 
    37 from libs.migration.db.classes import MigrationObject 
    38 from libs.migration.processor.commons import DO_BADC, DS_pUBLISHED, DS_PUBLISHED,\ 
     34from cedaMoles.libs.commons_db import DbManager 
     35from cedaMoles.libs.migration.MigrationEPB import MigrationEPBFactory 
     36from cedaMoles.libs.migration.processor.loadResources import LoadResources 
     37from cedaMoles.libs.migration.db.classes import MigrationObject 
     38from cedaMoles.libs.migration.processor.commons import DO_BADC, DS_pUBLISHED, DS_PUBLISHED,\ 
    3939    DO_NEODC 
    40 from MolesManager.moles3epb import Moles3EPBFactory 
    41 from libs.migration.processor.migrationProcess import MigrationProcess 
    42 from libs.migration.InfodbEPB import InfodbEPBFactory 
    43 from libs.migration.client import EPBRepo, generateMigrationReport 
    44 from testconfig import MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT,\ 
     40from cedaMoles.MolesManager.moles3epb import Moles3EPBFactory 
     41from cedaMoles.libs.migration.processor.migrationProcess import MigrationProcess 
     42from cedaMoles.libs.migration.InfodbEPB import InfodbEPBFactory 
     43from cedaMoles.libs.migration.client import EPBRepo, generateMigrationReport 
     44from cedaMoles.tests.testconfig import MIGRATION_DB_CONNECTION, MIGRATION_DB_SCRIPT,\ 
    4545    MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT, INFO_DB_CONNECTION, EVENTS_DB 
    4646 
  • mauRepo/MolesManager/trunk/cedaMoles/tests/migration/moles3epbmothods.py

    r8476 r8486  
    55''' 
    66import unittest 
    7 from testconfig import MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT 
    8 from MolesManager.moles3epb import Moles3EPB, Moles3EPBFactory 
    9 from libs.commons_db import DbManager 
     7from cedaMoles.tests.testconfig import MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT 
     8from cedaMoles.MolesManager.moles3epb import Moles3EPB, Moles3EPBFactory 
     9from cedaMoles.libs.commons_db import DbManager 
    1010from unittest import TestCase 
    1111import logging 
    1212from logging import StreamHandler 
    1313from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 
    14 from migration.test_utils import createObservationCollection 
     14from cedaMoles.tests.migration.test_utils import createObservationCollection 
    1515 
    1616 
  • mauRepo/MolesManager/trunk/cedaMoles/tests/migration/moles3epbtests.py

    r8476 r8486  
    55''' 
    66import unittest 
    7 from MolesManager.moles3epb import Moles3EPB, Moles3EPBFactory 
    8 from libs.commons_db import DbManager 
     7from cedaMoles.MolesManager.moles3epb import Moles3EPB, Moles3EPBFactory 
     8from cedaMoles.libs.commons_db import DbManager 
    99from unittest import TestCase 
    1010import logging, datetime 
    1111from logging import StreamHandler 
    1212from sqlalchemy.exc import IntegrityError 
    13 from libs.migration.processor.commons import createCI_Date, createDateTime,\ 
     13from cedaMoles.libs.migration.processor.commons import createCI_Date, createDateTime,\ 
    1414    createDate, createTM_Position, createTM_Instant 
    1515from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_datetypecode import CI_DateTypeCode 
     
    1919from test_utils import createObservationCollection,\ 
    2020    createProject   
    21 from libs.migration.processor.EPBRepo import EPBRepo 
    22 from testconfig import MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT, EVENTS_DB 
     21from cedaMoles.libs.migration.processor.EPBRepo import EPBRepo 
     22from cedaMoles.tests.testconfig import MOLES3_DB_CONNECTION, MOLES3_DB_SCRIPT, EVENTS_DB 
    2323 
    2424 
  • mauRepo/MolesManager/trunk/cedaMoles/tests/migration/test_utils.py

    r8476 r8486  
    55''' 
    66from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection 
    7 from libs.migration.processor.commons import createCI_Citation,\ 
     7from cedaMoles.libs.migration.processor.commons import createCI_Citation,\ 
    88    createMD_Identifier 
    99from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 
  • mauRepo/MolesManager/trunk/cedaMoles/tests/moles2gui/ceda/observation.py

    r8477 r8486  
    3333import unittest 
    3434from json import loads, dumps 
    35 from MolesManager.views.moles2gui import encodeCedaMoles2Json,\ 
     35from cedaMoles.MolesManager.views.moles2gui import encodeCedaMoles2Json,\ 
    3636    decodeJson2CedaMoles, getData 
    37 from moles2gui.creationFactory import assembleObservation 
     37from cedaMoles.tests.moles2gui.creationFactory import assembleObservation 
    3838 
    3939 
     
    5454        Validates a simple encode/decode 
    5555        """ 
    56         observation = assembleObservation()  
     56        observation = assembleObservation() 
    5757        json = encodeCedaMoles2Json(observation) 
    5858        #----------------------- test ------------------------ 
     
    8282        self.assertEqual(getData(new_observation, 'relatedParty.role'), decJson['relatedParty']['role'], "Error") 
    8383        #---------------------------------------------------------                           
     84         
     85if __name__ == '__main__': 
     86    unittest.main() 
     87         
  • mauRepo/MolesManager/trunk/cedaMoles/tests/moles2gui/creationFactory.py

    r8477 r8486  
    3131@author: mnagni 
    3232''' 
    33 from libs.migration.processor.commons import createCI_OnlineResource,\ 
     33from cedaMoles.libs.migration.processor.commons import createCI_OnlineResource,\ 
    3434    createCI_Address, createCI_Telephone, createCI_Contact,\ 
    3535    createMO_Organization, createMO_Individual, createMO_ResponsiblePartyInfo,\ 
    3636    isoDateTimeStringToTimeDate, createDateTime, createTM_Position,\ 
    3737    createTM_Instant, fromDateStringToPhenomenonTime 
    38 from MolesManager.codelist import getCLValue, MM_RoleValue 
     38from cedaMoles.MolesManager.codelist import getCLValue, MM_RoleValue 
    3939from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 
    4040 
  • mauRepo/MolesManager/trunk/cedaMoles/tests/moles2gui/mo/party.py

    r8477 r8486  
    3232''' 
    3333import unittest 
    34 from moles2gui.creationFactory import assembleMO_Organization, assembleMO_Individual 
     34from cedaMoles.tests.moles2gui.creationFactory import assembleMO_Organization, assembleMO_Individual 
    3535from json import loads, dumps 
    36 from MolesManager.views.moles2gui import encodeCedaMoles2Json,\ 
     36from cedaMoles.MolesManager.views.moles2gui import encodeCedaMoles2Json,\ 
    3737    decodeJson2CedaMoles, getData 
    3838 
  • mauRepo/MolesManager/trunk/cedaMoles/tests/moles2gui/mo/responsiblePartyInfo.py

    r8477 r8486  
    3232''' 
    3333import unittest 
    34 from moles2gui.creationFactory import assembleMO_ResponsiblePartyInfo 
     34from cedaMoles.tests.moles2gui.creationFactory import assembleMO_ResponsiblePartyInfo 
    3535from json import loads 
    36 from MolesManager.views.moles2gui import encodeCedaMoles2Json,\ 
     36from cedaMoles.MolesManager.views.moles2gui import encodeCedaMoles2Json,\ 
    3737    decodeJson2CedaMoles, dictByID, _encodeCedaMoles2Adapter 
    38 from MolesManager.codelist import getCLValue, MM_RoleValue 
     38from cedaMoles.MolesManager.codelist import getCLValue, MM_RoleValue 
    3939 
    4040 
    41 class Test(unittest.TestCase): 
     41class ResponsiblePartyInfoTest(unittest.TestCase): 
    4242 
    4343 
  • mauRepo/MolesManager/trunk/cedaMoles/tests/moles2gui/om/instant.py

    r8477 r8486  
    3232''' 
    3333import unittest 
    34 from moles2gui.creationFactory import assembleTM_Instant 
    3534from json import loads, dumps 
    36 from MolesManager.views.moles2gui import encodeCedaMoles2Json,\ 
     35from cedaMoles.MolesManager.views.moles2gui import encodeCedaMoles2Json,\ 
    3736    decodeJson2CedaMoles, getData 
     37from cedaMoles.tests.moles2gui.creationFactory import assembleTM_Instant 
    3838 
    3939 
  • mauRepo/MolesManager/trunk/cedaMoles/tests/moles2gui/om/period.py

    r8477 r8486  
    3333import unittest 
    3434from json import loads, dumps 
    35 from MolesManager.views.moles2gui import encodeCedaMoles2Json,\ 
     35from cedaMoles.MolesManager.views.moles2gui import encodeCedaMoles2Json,\ 
    3636    decodeJson2CedaMoles, getData 
    37 from libs.migration.processor.commons import fromDateStringToPhenomenonTime 
     37from cedaMoles.libs.migration.processor.commons import fromDateStringToPhenomenonTime 
    3838 
    3939 
  • mauRepo/MolesManager/trunk/cedaMoles/tests/testconfig.py

    r8476 r8486  
    3636INFO_DB_CONNECTION = 'postgresql://cedainfo:ler239b@bora.badc.rl.ac.uk:5432/cedainfo' 
    3737 
    38 from libs.migration.db.migrationTables import doTables as doMigration 
     38from cedaMoles.libs.migration.db.migrationTables import doTables as doMigration 
    3939MIGRATION_DB_SCRIPT = doMigration 
    4040 
  • mauRepo/MolesManager/trunk/setup.py

    r8485 r8486  
    1616    author_email='maurizio.nagni@stfc.ac.uk', 
    1717    package_dir = {'cedaMoles':'cedaMoles'}, # tell distutils packages are under cedaMoles     
    18     packages=find_packages(exclude=['tests']), # include all packages under this directory     
     18    packages=find_packages(), # include all packages under this directory     
    1919    url='http://proj.badc.rl.ac.uk/svn/ndg/mauRepo/MolesManager',   
    2020    license='BSD licence, see LICENCE', 
     
    3131                        'django==1.3.1', \ 
    3232                        'html5lib==0.95', \ 
    33                         'ceda-moles-model==0.1.5'], 
     33                        'ceda-moles-model==0.1.5', 
     34                        'psycopg2'], 
    3435) 
    3536 
Note: See TracChangeset for help on using the changeset viewer.