diff --git a/setup.py b/setup.py index b05ec23..22913ef 100644 --- a/setup.py +++ b/setup.py @@ -60,7 +60,7 @@ # requirements files see: # https://packaging.python.org/en/latest/requirements.html install_requires=[ - 'mammoth >= 0.3.19, < 0.3.31', + 'mammoth >= 0.3.19', 'beautifulsoup4 >= 4.8.2', ], diff --git a/tests/test_questions.py b/tests/test_questions.py index 50dc2e9..9f233e6 100644 --- a/tests/test_questions.py +++ b/tests/test_questions.py @@ -37,7 +37,7 @@ def test_extract_from_document(self): assert_equal('36/1/4/1/201500010\n\nNATIONAL ASSEMBLY\n\n\n\nFOR WRITTEN REPLY\n\n\n\nQUESTION 126\n\n\n\nDATE OF PUBLICATION IN INTERNAL QUESTION PAPER: 12 FEBRUARY 2015 \n\n(INTERNAL QUESTION PAPER NO 1-2015)\n\n\n\n126. Ms D Kohler (DA) to ask the Minister of Police:\n\nWith reference to the reply to question 228 on 18 March 2014, (a) how much discontinued ammunition is still in circulation in the SA Police Service in each province and (b) what action is to be taken to remove this ammunition from use?\n\nNW131E\n\nREPLY:\n\nTotal discontinued ammunition still in circulation in the SA Police Service:\n\n\n\nPROVINCE\n\nPREVIOUS QUANTITY\n\nCURRENT QUANTITY\n\nWestern Cape\n\n68,542\n\n74,627\n\nEastern Cape\n\n538,937\n\n594,806\n\nNorthern Cape\n\n104,459\n\n38,326\n\nFree State\n\n410,981\n\n135,065\n\nKwaZulu-Natal\n\n523,978\n\n228,164\n\nNorth West\n\n233,850\n\n24,120\n\nMpumalanga\n\n296,479\n\n92,676\n\nLimpopo\n\n35,080\n\n10,446\n\nGauteng\n\n71,764\n\n63,209\n\nHead Office Divisions\n\n2,061,456\n\n1,704,286\n\nTOTAL: \n\n4,345,526\n\n2,965,725\n\nThis ammunition may only be used for training purposes. However, this ammunition is still in use by Specialized Units within the SAPS for training, ballistic testing of firearms and IBIS test firing purposes. \n\nAn instruction to withdraw all such ammunition was issued from the Divisional Commissioner, Supply Chain Management on 12 September 2006, which also instructed that such ammunition may not be issued any longer as from this date.\n\nRecently another instruction in regard was issued by the Divisional Commissioner, Supply Chain Management to all Provisional Commissioners and Divisional Commissioners to immediately withdraw all non-standard, obsolete and unserviceable ammunition not in use, from their respective provinces and divisions.\n\nAll non-standard, obsolete and unserviceable ammunition is being sent on a continuous basis to the Ammunition Store at the Division Supply Chain Management for disposal and this is being monitored to ensure compliance.\n\n\n\n\n\n\n\n\n\n', text) - assert_equal('

36/1/4/1/201500010

NATIONAL ASSEMBLY

FOR WRITTEN REPLY

QUESTION 126

DATE OF PUBLICATION IN INTERNAL QUESTION PAPER: 12 FEBRUARY 2015

(INTERNAL QUESTION PAPER NO 1-2015)

126. Ms D Kohler (DA) to ask the Minister of Police:

With reference to the reply to question 228 on 18 March 2014, (a) how much discontinued ammunition is still in circulation in the SA Police Service in each province and (b) what action is to be taken to remove this ammunition from use?

NW131E

REPLY:

  1. Total discontinued ammunition still in circulation in the SA Police Service:

PROVINCE

PREVIOUS QUANTITY

CURRENT QUANTITY

Western Cape

68,542

74,627

Eastern Cape

538,937

594,806

Northern Cape

104,459

38,326

Free State

410,981

135,065

KwaZulu-Natal

523,978

228,164

North West

233,850

24,120

Mpumalanga

296,479

92,676

Limpopo

35,080

10,446

Gauteng

71,764

63,209

Head Office Divisions

2,061,456

1,704,286

TOTAL:

4,345,526

2,965,725

This ammunition may only be used for training purposes. However, this ammunition is still in use by Specialized Units within the SAPS for training, ballistic testing of firearms and IBIS test firing purposes.

  1. An instruction to withdraw all such ammunition was issued from the Divisional Commissioner, Supply Chain Management on 12 September 2006, which also instructed that such ammunition may not be issued any longer as from this date.

Recently another instruction in regard was issued by the Divisional Commissioner, Supply Chain Management to all Provisional Commissioners and Divisional Commissioners to immediately withdraw all non-standard, obsolete and unserviceable ammunition not in use, from their respective provinces and divisions.

All non-standard, obsolete and unserviceable ammunition is being sent on a continuous basis to the Ammunition Store at the Division Supply Chain Management for disposal and this is being monitored to ensure compliance.

', html) + assert_equal('

36/1/4/1/201500010

NATIONAL ASSEMBLY

FOR WRITTEN REPLY

QUESTION 126

DATE OF PUBLICATION IN INTERNAL QUESTION PAPER: 12 FEBRUARY 2015

(INTERNAL QUESTION PAPER NO 1-2015)

126. Ms D Kohler (DA) to ask the Minister of Police:

With reference to the reply to question 228 on 18 March 2014, (a) how much discontinued ammunition is still in circulation in the SA Police Service in each province and (b) what action is to be taken to remove this ammunition from use?

NW131E

REPLY:

  1. Total discontinued ammunition still in circulation in the SA Police Service:

PROVINCE

PREVIOUS QUANTITY

CURRENT QUANTITY

Western Cape

68,542

74,627

Eastern Cape

538,937

594,806

Northern Cape

104,459

38,326

Free State

410,981

135,065

KwaZulu-Natal

523,978

228,164

North West

233,850

24,120

Mpumalanga

296,479

92,676

Limpopo

35,080

10,446

Gauteng

71,764

63,209

Head Office Divisions

2,061,456

1,704,286

TOTAL:

4,345,526

2,965,725

This ammunition may only be used for training purposes. However, this ammunition is still in use by Specialized Units within the SAPS for training, ballistic testing of firearms and IBIS test firing purposes.

  1. An instruction to withdraw all such ammunition was issued from the Divisional Commissioner, Supply Chain Management on 12 September 2006, which also instructed that such ammunition may not be issued any longer as from this date.

Recently another instruction in regard was issued by the Divisional Commissioner, Supply Chain Management to all Provisional Commissioners and Divisional Commissioners to immediately withdraw all non-standard, obsolete and unserviceable ammunition not in use, from their respective provinces and divisions.

All non-standard, obsolete and unserviceable ammunition is being sent on a continuous basis to the Ammunition Store at the Division Supply Chain Management for disposal and this is being monitored to ensure compliance.

', html) def test_extract_answer_from_html(self): html = '

36/1/4/1/201500010

NATIONAL ASSEMBLY

FOR WRITTEN REPLY

QUESTION 126

DATE OF PUBLICATION IN INTERNAL QUESTION PAPER: 12 FEBRUARY 2015

(INTERNAL QUESTION PAPER NO 1-2015)

126. Ms D Kohler (DA) to ask the Minister of Police:

With reference to the reply to question 228 on 18 March 2014, (a) how much discontinued ammunition is still in circulation in the SA Police Service in each province and (b) what action is to be taken to remove this ammunition from use?

NW131E

REPLY:

  1. Total discontinued ammunition still in circulation in the SA Police Service:

PROVINCE

PREVIOUS QUANTITY

CURRENT QUANTITY

Western Cape

68,542

74,627

Eastern Cape

538,937

594,806

Northern Cape

104,459

38,326

Free State

410,981

135,065

KwaZulu-Natal

523,978

228,164

North West

233,850

24,120

Mpumalanga

296,479

92,676

Limpopo

35,080

10,446

Gauteng

71,764

63,209

Head Office Divisions

2,061,456

1,704,286

TOTAL:

4,345,526

2,965,725

This ammunition may only be used for training purposes. However, this ammunition is still in use by Specialized Units within the SAPS for training, ballistic testing of firearms and IBIS test firing purposes.

  1. An instruction to withdraw all such ammunition was issued from the Divisional Commissioner, Supply Chain Management on 12 September 2006, which also instructed that such ammunition may not be issued any longer as from this date.

Recently another instruction in regard was issued by the Divisional Commissioner, Supply Chain Management to all Provisional Commissioners and Divisional Commissioners to immediately withdraw all non-standard, obsolete and unserviceable ammunition not in use, from their respective provinces and divisions.

All non-standard, obsolete and unserviceable ammunition is being sent on a continuous basis to the Ammunition Store at the Division Supply Chain Management for disposal and this is being monitored to ensure compliance.

'