Skip to content

Commit

Permalink
Merge production into nmaster
Browse files Browse the repository at this point in the history
  • Loading branch information
ktarasz committed Jul 4, 2016
2 parents 492f5ee + 8f8af77 commit 473ba1f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions openprocurement/tender/openuadefense/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
from schematics.types.compound import ModelType
from schematics.types.serializable import serializable
from zope.interface import implementer
from openprocurement.api.models import ITender, Period, get_now,TZ
from openprocurement.tender.openua.models import (
Tender as BaseTender, EnquiryPeriod, Lot as BaseLot, get_tender, calc_auction_end_time, validate_lots_uniq,
)
from openprocurement.api.models import ITender, Period, get_now, TZ

from openprocurement.tender.openua.utils import calculate_business_date


Expand All @@ -18,7 +19,7 @@
CLAIM_SUBMIT_TIME = timedelta(days=3)
COMPLAINT_SUBMIT_TIME = timedelta(days=2)
COMPLAINT_OLD_SUBMIT_TIME = timedelta(days=3)
COMPLAINT_OLD_SUBMIT_TIME_BEFORE = datetime(2016, 7, 4, 13, 0, 0, tzinfo=TZ)
COMPLAINT_OLD_SUBMIT_TIME_BEFORE = datetime(2016, 7, 5, tzinfo=TZ)
TENDER_PERIOD = timedelta(days=6)
ENQUIRY_PERIOD_TIME = timedelta(days=3)
TENDERING_EXTRA_PERIOD = timedelta(days=2)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
import os

version = '2.3.0'
version = '2.3.1'

requires = [
'setuptools',
Expand Down

0 comments on commit 473ba1f

Please sign in to comment.