pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rerun formatter for pretty 3.6.6 numbers

Browse Source
This commit is contained in:
dandds 2018-09-27 14:09:24 -04:00
parent 74ab2151f8
commit 12307769d4
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
atst/domain/reports.py
View File

@ -123,10 +123,10 @@ CUMULATIVE_BUDGET_AARDVARK = {
"03/2018": {"spend": 7881, "cumulative": 17738}, "03/2018": {"spend": 7881, "cumulative": 17738},
"04/2018": {"spend": 14010, "cumulative": 31748}, "04/2018": {"spend": 14010, "cumulative": 31748},
"05/2018": {"spend": 43510, "cumulative": 75259}, "05/2018": {"spend": 43510, "cumulative": 75259},
"06/2018": {"spend": 41725, "cumulative": 116984}, "06/2018": {"spend": 41725, "cumulative": 116_984},
"07/2018": {"spend": 41328, "cumulative": 158312}, "07/2018": {"spend": 41328, "cumulative": 158_312},
"08/2018": {"spend": 47491, "cumulative": 205803}, "08/2018": {"spend": 47491, "cumulative": 205_803},
"09/2018": {"spend": 36028, "cumulative": 241831}, "09/2018": {"spend": 36028, "cumulative": 241_831},
} }
MONTHLY_SPEND_BELUGA = { MONTHLY_SPEND_BELUGA = {
@ -152,7 +152,7 @@ REPORT_FIXTURE_MAP = {
"Beluga": { "Beluga": {
"cumulative": CUMULATIVE_BUDGET_BELUGA, "cumulative": CUMULATIVE_BUDGET_BELUGA,
"monthly": MONTHLY_SPEND_BELUGA, "monthly": MONTHLY_SPEND_BELUGA,
"budget": 70_000, "budget": 70000,
}, },
} }

4
atst/domain/requests/requests.py
View File

@ -28,8 +28,8 @@ def create_revision_from_request_body(body):
class Requests(object): class Requests(object):
AUTO_APPROVE_THRESHOLD = 1000000 AUTO_APPROVE_THRESHOLD = 1_000_000
ANNUAL_SPEND_THRESHOLD = 1000000 ANNUAL_SPEND_THRESHOLD = 1_000_000
@classmethod @classmethod
def create(cls, creator, body): def create(cls, creator, body):

2
atst/eda_client.py
View File

@ -97,7 +97,7 @@ class MockEDAClient(EDAClientBase):
"location": "https://docsrv1.nit.disa.mil:443/eda/enforcer/C0414345.PDF?ver=1.4&loc=Y29udHJhY3RzL29nZGVuL3ZlbmRvci8xOTk4LzA5LzE0L0MwNDE0MzQ1LlBERg==&sourceurl=aHR0cHM6Ly9lZGE0Lm5pdC5kaXNhLm1pbC9wbHMvdXNlci9uZXdfYXBwLkdldF9Eb2M_cFRhYmxlX0lEPTImcFJlY29yZF9LZXk9OEE2ODExNjM2RUY5NkU2M0UwMzQwMDYwQjBCMjgyNkM=&uid=6CFC2B2322E86FD5E054002264936E3C&qid=19344159&signed=G&qdate=20180529194407GMT&token=6xQICrrrfIMciEJSpXmfsAYrToM=", "location": "https://docsrv1.nit.disa.mil:443/eda/enforcer/C0414345.PDF?ver=1.4&loc=Y29udHJhY3RzL29nZGVuL3ZlbmRvci8xOTk4LzA5LzE0L0MwNDE0MzQ1LlBERg==&sourceurl=aHR0cHM6Ly9lZGE0Lm5pdC5kaXNhLm1pbC9wbHMvdXNlci9uZXdfYXBwLkdldF9Eb2M_cFRhYmxlX0lEPTImcFJlY29yZF9LZXk9OEE2ODExNjM2RUY5NkU2M0UwMzQwMDYwQjBCMjgyNkM=&uid=6CFC2B2322E86FD5E054002264936E3C&qid=19344159&signed=G&qdate=20180529194407GMT&token=6xQICrrrfIMciEJSpXmfsAYrToM=",
"pay_dodaac": None, "pay_dodaac": None,
"pco_mod": "02", "pco_mod": "02",
"amount": 2000000, "amount": 2_000_000,
} }
else: else:
return None return None

4
tests/domain/test_requests.py
View File

@ -41,14 +41,14 @@ def test_new_request_has_started_status():
def test_auto_approve_less_than_1m(): def test_auto_approve_less_than_1m():
new_request = RequestFactory.create(initial_revision={"dollar_value": 999999}) new_request = RequestFactory.create(initial_revision={"dollar_value": 999_999})
request = Requests.submit(new_request) request = Requests.submit(new_request)
assert request.status == RequestStatus.PENDING_FINANCIAL_VERIFICATION assert request.status == RequestStatus.PENDING_FINANCIAL_VERIFICATION
def test_dont_auto_approve_if_dollar_value_is_1m_or_above(): def test_dont_auto_approve_if_dollar_value_is_1m_or_above():
new_request = RequestFactory.create(initial_revision={"dollar_value": 1000000}) new_request = RequestFactory.create(initial_revision={"dollar_value": 1_000_000})
request = Requests.submit(new_request) request = Requests.submit(new_request)
assert request.status == RequestStatus.PENDING_CCPO_ACCEPTANCE assert request.status == RequestStatus.PENDING_CCPO_ACCEPTANCE

14
tests/factories.py
View File

@ -119,7 +119,7 @@ class RequestFactory(Base):
) )
@classmethod @classmethod
def create_initial_revision(cls, request, dollar_value=1000000): def create_initial_revision(cls, request, dollar_value=1_000_000):
user = request.creator user = request.creator
default_data = dict( default_data = dict(
name=factory.Faker("domain_word"), name=factory.Faker("domain_word"),
@ -212,12 +212,12 @@ class TaskOrderFactory(Base):
random.randrange(1, 28), random.randrange(1, 28),
) )
) )
clin_0001 = random.randrange(100, 100000) clin_0001 = random.randrange(100, 100_000)
clin_0003 = random.randrange(100, 100000) clin_0003 = random.randrange(100, 100_000)
clin_1001 = random.randrange(100, 100000) clin_1001 = random.randrange(100, 100_000)
clin_1003 = random.randrange(100, 100000) clin_1003 = random.randrange(100, 100_000)
clin_2001 = random.randrange(100, 100000) clin_2001 = random.randrange(100, 100_000)
clin_2003 = random.randrange(100, 100000) clin_2003 = random.randrange(100, 100_000)
class WorkspaceFactory(Base): class WorkspaceFactory(Base):

2
tests/test_eda_client.py
View File

@ -12,7 +12,7 @@ def test_list_contracts():
def test_get_contract(): def test_get_contract():
result = client.get_contract("DCA10096D0052", "y") result = client.get_contract("DCA10096D0052", "y")
assert result["contract_no"] == "DCA10096D0052" assert result["contract_no"] == "DCA10096D0052"
assert result["amount"] == 2000000 assert result["amount"] == 2_000_000
def test_contract_not_found(): def test_contract_not_found():