Merge pull request #79 from gorserg/add_pytz

add schematics to setup
openprocurement · Sep 30, 2016 · e1a9006 · e1a9006
2 parents b529a71 + ca24ff2
commit e1a9006
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/openprocurement/tender/competitivedialogue/databridge.py b/openprocurement/tender/competitivedialogue/databridge.py
@@ -24,8 +24,10 @@
 
 from openprocurement_client.client import TendersClient, TendersClientSync
 from yaml import load
-from pytz import timezone
-from openprocurement.tender.competitivedialogue.models import CD_UA_TYPE, CD_EU_TYPE, STAGE_2_EU_TYPE, STAGE_2_UA_TYPE, STAGE2_STATUS
+
+from openprocurement.tender.competitivedialogue.models_constants import (
+    CD_UA_TYPE, CD_EU_TYPE, STAGE_2_EU_TYPE, STAGE_2_UA_TYPE, STAGE2_STATUS
+)
 from openprocurement.tender.competitivedialogue.journal_msg_ids import (
     DATABRIDGE_RESTART, DATABRIDGE_GET_CREDENTIALS, DATABRIDGE_GOT_CREDENTIALS,
     DATABRIDGE_FOUND_NOLOT,

diff --git a/openprocurement/tender/competitivedialogue/models.py b/openprocurement/tender/competitivedialogue/models.py
@@ -30,15 +30,9 @@
 from schematics.transforms import whitelist, blacklist
 from openprocurement.tender.competitivedialogue.utils import (validate_features_custom_weight)
 
-# constants for procurementMethodtype
-CD_UA_TYPE = "competitiveDialogueUA"
-CD_EU_TYPE = "competitiveDialogueEU"
-STAGE_2_EU_TYPE = "competitiveDialogueEU.stage2"
-STAGE_2_UA_TYPE = "competitiveDialogueUA.stage2"
-
-STAGE2_STATUS = 'draft.stage2'
-
-FEATURES_MAX_SUM = 0.99
+from openprocurement.tender.competitivedialogue.models_constants import (
+    CD_UA_TYPE, CD_EU_TYPE, STAGE_2_EU_TYPE, STAGE_2_UA_TYPE, STAGE2_STATUS, FEATURES_MAX_SUM
+)
 
 edit_role_ua = edit_role + blacklist('enquiryPeriod', 'status')
 edit_stage2_pending = whitelist('status')

diff --git a/openprocurement/tender/competitivedialogue/models_constants.py b/openprocurement/tender/competitivedialogue/models_constants.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+
+# constants for procurementMethodtype
+CD_UA_TYPE = "competitiveDialogueUA"
+CD_EU_TYPE = "competitiveDialogueEU"
+STAGE_2_EU_TYPE = "competitiveDialogueEU.stage2"
+STAGE_2_UA_TYPE = "competitiveDialogueUA.stage2"
+
+STAGE2_STATUS = 'draft.stage2'
+
+FEATURES_MAX_SUM = 0.99
diff --git a/setup.py b/setup.py
@@ -36,8 +36,7 @@
     'gevent',
     'LazyDB',
     'ExtendedJournalHandler',
-    'openprocurement_client>=1.0b2',
-    'pytz==2014.10'
+    'openprocurement_client>=1.0b2'
 ]
 
 here = os.path.abspath(os.path.dirname(__file__))