Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spp 7526 thousand pound correction #61

Merged
merged 42 commits into from
Oct 18, 2023

Conversation

JasonBellONS
Copy link
Contributor

Synopsis

Creation of thousand pounds correction is completed and ready for UAT testing

Checklist

  • Documentation created/updated
  • Tests created/updated

Description

Add a more detailed description of the pr including any necessary background
information.

Sorry, something went wrong.

dllmorgan and others added 30 commits August 18, 2022 15:53
* Add code owners

* added a release note to the folder

* typo ammended

* sentences removed

* removed comma

* removed selective editing and date adjustment readmes as they are now located in the sml-supporting-info repo

* removed accidently added file

* changed release 1.0.0 title

* changed title of release notes and synopsis

* added new line between titles

* changed release title

* Upgrade the version of poetry used

- Also add missing pr template

* Update ci-checks.yaml

* Bump isort from 5.10.1 to 5.11.5

Bumps [isort](https://github.com/pycqa/isort) from 5.10.1 to 5.11.5.
- [Release notes](https://github.com/pycqa/isort/releases)
- [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md)
- [Commits](PyCQA/isort@5.10.1...5.11.5)

---
updated-dependencies:
- dependency-name: isort
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update CODEOWNERS

* Update CODEOWNERS

* Update CODEOWNERS

* Update CODEOWNERS

* Create LICENSE

* Add license info

* Add license info

* '->"

* '->""

* SPP-8287-Unit-Test-Results (#23)

* Updated the code within the CI checks YAML file to use Pytest to run the tests on the project, generate test results report & display them on the GitHub Actions Summary page. 

* Upgraded poetry to version 1.3.2.

* Update CODEOWNERS

* Spp 9253 totals and components (#39)

* Code commented and refactored

* Code commented

* ammended tests ready for Jasons refactored code

* Added more comments

* Running black, flake8 and pylint

* Added more comments

* Code formatted and more comments added

* Reading input data from CSV, passing CSV data into the T&C method and recieving return results from T&C method

* Amend total bug fixed

* Set up the code to write the T&C method return results to a CSV file

* Fixing grammar

* Original Components removed from output, black, flake8, pylint run

* changed test title

* Results data being written to the CSV file

* Code formatted

* changed tests to reflect expected results

* changed assert

* changed coverage

* Tests amended, code implemented to validate period and identifier

* changed test id

* Test added to check str() conversion throws error correctly

* flake8 corrections

* SPP-9451-update-output-values-s-n-m

* Python wrapper updated to work with the latest T&C method

* CSV function updated to work with the latest T&C method

* Reading in memory csv

* Can read in memory CSV, pass the data into the T&C method, recieve the processed return results and write that results to a CSV file

* In memory csv reading and writing to a csv file fully working/ functional

* changed tcc marker output list calculation and amended some tests

* isort clean up

* Testing for bugs

* Corrected bug

* clean up

* added more tests to verify markers absolute dofference and limit values

* clean up with isort

* Testing for bugs

* T&C working as it should

* identifier change

* Tests being updated

* added comments and linted

* Spp-9451-update-output-values-s-n-m

* merge conflicts and tests amendments

* tests fixed

* ammended test to spreadhsheet values (currently failing)

* removed abs-diff decimal correction

* Decimal module being used for all calculations

* Testing

* Testing

* Decimal module testing

* corrected tests

* Added the decimal function from the Decimal module for all calculations

* Taking the values out of the Decimal function into floats

* Decimal module integrated

* Testing

* Running isort

* All tests passing

* added precision tests

* Fixing merge conflicts

* Merging SPP-9410, amending doc srings

* Fixing tests

* Amended tests

* changed new test to test total

* Exceptions testing amended

* All tests passing except exception and decimal module integrated into T&C method code

* Code formatted

* Docstrings added

* Fixing exceptions errors within the tests

* Precision failing tests fixed

* updated tests and code to reflect new periodicity workflow

* typo

* end of day commit

* added and amended tests

* Converting the dates back into a string

* changed tests and conditional for prior period calculation

* added more periodicity tests

* lint

* clean up

* clean up

* clean up

* corrected doc strings, added comments and tidied vars

* Sorted Isort

* Sorted Isort

* latest changes

* Comments added to the periodicity tests

* added commetns for each test

* changed date values and periodicity to male tests more appropriate

* changed periodicity to period_onset

* period on_set to offset

* added period missing exception test

* more tests added and period ofset = none capability added

* Removed predicitve period , period offset from code and tests

* tidy up

* removed period from code and tests

* added more test

* lint

* isort

* updated docstrings

* ammend and lint docstrings

* isort check

* First draft of the python wrapper readme complete and python wrapper code cleanup complete

* moved and ammended comments

* made docstring and comment changes

* black and flake8

* Updated the python wrapper readme

* added identifier to error returned

* added tabulate back in

* Updated the python wrapper readme

* changed total condition for set predicitve

* end of day commit

* updating the documentation

* Markdown cleanup

* backup commit

* added in the default precision value

* removed unknown file

* removed duplicated test

* Updated

* Wrapper updated to work with the latest T&C method code

* Wrapper CSV functions updated to work with the latest T&C method code

* T&C output table updated

* Wrapper updated, T&C validate_input function updated and sum_components updated

* Fixed abs diff issue

* T&C tests 4 corrected and added test 5

* New tests added and T&C abs diff fix code refactored

* Code formatted and linter ran

* Output data examples added

* Comments added for test data

* T&C test 6 updated

* T&C test 6 updated

* Wrapper tested

* T&C test 6 comment updated

* Wrapper tested

* Abs diff fix code refactored/ refined and tests updated accordingly

* Duplicate file removed

* Comments added on top of the abs diff fix code

* Wrapper formatted

* Validate inpur function updated & tests updated accordingly

* Code formatted and linter ran

* lint

* Decimal(0) -> 0

* Local csv function updated to combine input and output data when outputting return data from T&C method into a new csv file

* In memory CSV function updated to combine input and output data

* Pandas wrapper for Totals and Components added

* Running isort, pylint

* additional fix from pylint

* Amending doc strings

* changed value error raising approach

* cleaned file

* Tests amended after removal of precision from output

* Amendments to precision usage

* amended precision optional status in sub-methods, amended unused import

* fixed doc strings

* Amending doc-strings

* amending tests post merge

* made the value error messages utils and updated the tests

* clean up

* end of day commit

* end of day commit

* added utils and changed tacexception errors and code to reference them

* var name change

* flake8

* valueerror test

* amending test N on validate

* corrected value errors

* clean up

* File structure amended to better match statistical methods library

* renaming fixture data

* print table moved to util

* clean up

* added comments

* comment change

* spacer variable added and comments changed

* changed var spacer to padding

* clean up

* Renaming

* pandas_example.py added

* Pandas wrapper section added in README and test data files renamed

* SPP-9712-empty-components-should-stop-method

* clean up

* clean up

* added more tests

* SPP-9708-automate-uat

* added comment for components is none

* added more tests

* removed duplicate code

* reverted comment

* grammer

* grammer

* added more tests

* formula correction

* test tidy up

* test 5 clean up

* test 5 clean up

* tests added

* Logging added to totals_and_components.py and common_utils.py

* Clean up

* Adding watchpoints to track tcc marker throughout method

* test check

* test failing due to mqd misalign commented for later correction

* clean up

* Clean up

* Removing watcher, adding in warnings when TCCMarker is set to STOP

* uncommented tests

* component test

* hand calcualtions for components

* added comments

* flake8

* Removing watcher, adding in warnings when TCCMarker is set to STOP, amendments to error output and adding examples

* amending log_file_path name in  common utils

* Reorder changes

* Tidy code comments and docstrings

* SPP-9704 Review Comments Cleanup

* SPP-9704 Update fileHandler Config to prevent file creation

* SPP-9253 Update paths to test files to fix CICD

* SPP-9253 Update list type issue to fix CICD

* SPP-9253 Update float|none issue to fix CICD

* SPP-9253 Update int issue to fix CICD

* SPP-9253 Update float|none to union to fix CICD

* SPP-9253 Update precision to fix CICD

* SPP-9253 Update precision types to fix CICD

* SPP-9253 Update tuple to Tuple to fix CICD

* SPP-9253 Update to Unions to fix CICD

* SPP-9253 Update tuple to Tuple to fix CICD

* SPP-9253 Update list to List to fix CICD

* SPP-9253 Update for List definition

---------

Co-authored-by: sanjeevz3009 <[email protected]>
Co-authored-by: jhmjam <[email protected]>
Co-authored-by: jasonbellONS <[email protected]>

* Updating poetry version in release-artifact CI (#40)

* adding initial pypi release code (#41)

* Spp 9474 pypi release (#42)

* adding initial pypi release code

* amend pypi release code

* amend pypi release code

* amend pypi release code

* amend pypi release code

* amend pypi release code

* removing outputs:

* removing outputs:

* amending pyproject

* amending pyproject

* amending release script to ignore rc releases for pypi upload

* amending release script to use new pypi account

* amending release script to use new pypi account

* amending archive script

* amending pyproject

* Testing complete, adding rc block back in

* Updating README

* adding exclusion files to pyproject.toml

* amending version

* amending version

* SPP-9888-Remove-Precision-Output (#43)

* Precision removed from the output in the example.py file, tabulate added to pyproject.toml, pyenv local version file ignored in gitignore and tabulate moved to dev dependencies.

* Spp9924 nan handling updates (#44)

* SPP-9924 Cater for NaN values

* SPP-9924 Add extra tests for UAT

* SPP-9924 Fix isort issues

* SPP-9924 Fix absolute difference type change

* Spp 9889 full coverage of uat tests (#45)

* SPP-xxxx-add-further-uat-tests

* added more tests

* added more tests

* added more test cases

* added more tests

* clean up

* SPP-9924 Cater for NaN values

* SPP-9924 Add extra tests for UAT

* SPP-9924 Fix isort issues

* SPP-9924 Fix absolute difference type change

* update with main

* clean up

* clean up

* fixture test

* clean up

* clean up

* clean up

* removed fxt conditions

* isort

* isort imports

---------

Co-authored-by: Steve Gibbard <[email protected]>
Co-authored-by: Steve Gibbard <[email protected]>

* Spin UAT release candidate (#46)

* Updating branch with main and refactor to allign with totals and components build

* updating pyproject

* updating pyproject, running black, isort, flake8

* amending coveragerc

* amending readme

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Adam Thompson <[email protected]>
Co-authored-by: jhmjam <[email protected]>
Co-authored-by: James Morgan <[email protected]>
Co-authored-by: David Lees <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Michael Candlin <[email protected]>
Co-authored-by: Sanjeev Srithevan <[email protected]>
Co-authored-by: Steve Gibbard <[email protected]>
Co-authored-by: sanjeevz3009 <[email protected]>
Co-authored-by: Steve Gibbard <[email protected]>
# Conflicts:
#	README.md
#	poetry.lock
#	pyproject.toml
#	tests/.coveragerc
* Initial commit, updating validation to run in one function, tests updated

* running black, isort, flake8

* Testing added

* Custom exception added, existing tests amended to match new tests

* fixing flake8

* fixing isort issue

* Amending issues raised in review

* running black, isort, flake8
* Logging introduced, docstrings added

* running black,flake8,isort

* running black, isort, flake8

* adding log table during exception
* amending pandas_wrapper

* initial poc with totals and components

* Thousand pounds method added, output logic created, type hints and doc strings added

* amending coveragerc so pandas wrapper/example dont trigger coverage failures

* Amending comments

* running flake8
* amending pandas_wrapper

* initial poc with totals and components

* Thousand pounds method added, output logic created, type hints and doc strings added

* amending coveragerc so pandas wrapper/example dont trigger coverage failures

* TpcMarker enum added and stop conditions implemented, method now creates Target_variable objects within method, tests + wrapper updated

* Running black, flake8, isort

* Amending comments

* running flake8

* PR amendments

* amending docstrings

* Adding warning logger when tpc marker is set to STOP
* amending pandas_wrapper

* initial poc with totals and components

* Thousand pounds method added, output logic created, type hints and doc strings added

* amending coveragerc so pandas wrapper/example dont trigger coverage failures

* TpcMarker enum added and stop conditions implemented, method now creates Target_variable objects within method, tests + wrapper updated

* Running black, flake8, isort

* Amending comments

* running flake8

* PR amendments

* initial commit

* Amendments to testing

* Tests amended

* amending aux_val removal

* Renaming principal_identifier to unique_identifier, removing original_principal_value from output
* amending config to make handler names more specific

* amending config to make handler names more specific
* Poetry install command changed & poetry check command added (#49)

* first draft of decimal conversion funciton

* added more code

* convert_input_to_decimal function mostly complete

* backup

* back up

* backup

* back up

* Finished making all the outouts decimal formats

* amending pandas_wrapper

* added NaN condition

* added new common utils code

* test updates

* fixed some tests

* adjusted rounding margin error

* adjusted rounding margin error

* all tests passing

* clean up code

* clean up floast in test file to decimal

* added docstring

* linting

* initial poc with totals and components

* pass nan as nan in the coversion function

* fixed bug for adding existing decimal

* PR comment corrections

* isort

* Thousand pounds method added, output logic created, type hints and doc strings added

* amending coveragerc so pandas wrapper/example dont trigger coverage failures

* TpcMarker enum added and stop conditions implemented, method now creates Target_variable objects within method, tests + wrapper updated

* Running black, flake8, isort

* Amending comments

* running flake8

* PR amendments

* SPP-9926 Add New Packages (#50)

* Bandit added to the repo, code formatted and dependencies are put in the correct groups

* initial commit

* Amendments to testing

* Tests amended

* added fine tune to component correction

* fixed tests

* lint and tidy

* Tidy up commenting

* amending aux_val removal

* clean up

* removed unused var

* Making optional values in T&C defualt when not input (#56)

* Renaming principal_identifier to unique_identifier, removing original_principal_value from output

* fixed missing precision

* var removal from docstrings

* Decimal processing implemented for thousand_pounds, precision validation in totals&components made generic

* updating poetry lock

* Running isort

* amendments

---------

Co-authored-by: Sanjeev Srithevan <[email protected]>
Co-authored-by: jhmjam <[email protected]>
Co-authored-by: sanjeevz3009 <[email protected]>
Co-authored-by: James Morgan <[email protected]>
* SPP-10072-thousand-pounds-uat-test-cases
---------

Co-authored-by: Sanjeev Srithevan <[email protected]>
Co-authored-by: sanjeevz3009 <[email protected]>
Co-authored-by: jasonbellONS <[email protected]>
Co-authored-by: JasonBellONS <[email protected]>
@JasonBellONS JasonBellONS requested a review from a team as a code owner October 12, 2023 12:35
JasonBellONS and others added 5 commits October 12, 2023 13:37
@jhmjam jhmjam requested review from sanjeevz3009 and jhmjam October 17, 2023 08:49
jhmjam and others added 7 commits October 17, 2023 11:31
* Add line length to config

* Add converage/test files to git ignore

* Add prototype method

* Tweak typing to support python 3.8 envs

* First cut of conversion from prototype and adding documentation

* Try new formula display approach

* Update display of 2nd formula

* Tweak 2nd formula

* Update documentation

* Update import order to stop isort check complaining

* Update main repo readme to include doc links

* Tweak formating in readme

* Update following review

* Further tweaks following feedback

* Consistency renaming

* Added csv output to example

* Updates following UAT discussions

* Tweaks following UAT

* Re-add case where adjustment takes place in example

* Allow checking of target variables when no adjustment

* Thousand pounds code allignment (#47)

* Add code owners

* added a release note to the folder

* typo ammended

* sentences removed

* removed comma

* removed selective editing and date adjustment readmes as they are now located in the sml-supporting-info repo

* removed accidently added file

* changed release 1.0.0 title

* changed title of release notes and synopsis

* added new line between titles

* changed release title

* Upgrade the version of poetry used

- Also add missing pr template

* Update ci-checks.yaml

* Bump isort from 5.10.1 to 5.11.5

Bumps [isort](https://github.com/pycqa/isort) from 5.10.1 to 5.11.5.
- [Release notes](https://github.com/pycqa/isort/releases)
- [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md)
- [Commits](PyCQA/isort@5.10.1...5.11.5)

---
updated-dependencies:
- dependency-name: isort
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update CODEOWNERS

* Update CODEOWNERS

* Update CODEOWNERS

* Update CODEOWNERS

* Create LICENSE

* Add license info

* Add license info

* '->"

* '->""

* SPP-8287-Unit-Test-Results (#23)

* Updated the code within the CI checks YAML file to use Pytest to run the tests on the project, generate test results report & display them on the GitHub Actions Summary page. 

* Upgraded poetry to version 1.3.2.

* Update CODEOWNERS

* Spp 9253 totals and components (#39)

* Code commented and refactored

* Code commented

* ammended tests ready for Jasons refactored code

* Added more comments

* Running black, flake8 and pylint

* Added more comments

* Code formatted and more comments added

* Reading input data from CSV, passing CSV data into the T&C method and recieving return results from T&C method

* Amend total bug fixed

* Set up the code to write the T&C method return results to a CSV file

* Fixing grammar

* Original Components removed from output, black, flake8, pylint run

* changed test title

* Results data being written to the CSV file

* Code formatted

* changed tests to reflect expected results

* changed assert

* changed coverage

* Tests amended, code implemented to validate period and identifier

* changed test id

* Test added to check str() conversion throws error correctly

* flake8 corrections

* SPP-9451-update-output-values-s-n-m

* Python wrapper updated to work with the latest T&C method

* CSV function updated to work with the latest T&C method

* Reading in memory csv

* Can read in memory CSV, pass the data into the T&C method, recieve the processed return results and write that results to a CSV file

* In memory csv reading and writing to a csv file fully working/ functional

* changed tcc marker output list calculation and amended some tests

* isort clean up

* Testing for bugs

* Corrected bug

* clean up

* added more tests to verify markers absolute dofference and limit values

* clean up with isort

* Testing for bugs

* T&C working as it should

* identifier change

* Tests being updated

* added comments and linted

* Spp-9451-update-output-values-s-n-m

* merge conflicts and tests amendments

* tests fixed

* ammended test to spreadhsheet values (currently failing)

* removed abs-diff decimal correction

* Decimal module being used for all calculations

* Testing

* Testing

* Decimal module testing

* corrected tests

* Added the decimal function from the Decimal module for all calculations

* Taking the values out of the Decimal function into floats

* Decimal module integrated

* Testing

* Running isort

* All tests passing

* added precision tests

* Fixing merge conflicts

* Merging SPP-9410, amending doc srings

* Fixing tests

* Amended tests

* changed new test to test total

* Exceptions testing amended

* All tests passing except exception and decimal module integrated into T&C method code

* Code formatted

* Docstrings added

* Fixing exceptions errors within the tests

* Precision failing tests fixed

* updated tests and code to reflect new periodicity workflow

* typo

* end of day commit

* added and amended tests

* Converting the dates back into a string

* changed tests and conditional for prior period calculation

* added more periodicity tests

* lint

* clean up

* clean up

* clean up

* corrected doc strings, added comments and tidied vars

* Sorted Isort

* Sorted Isort

* latest changes

* Comments added to the periodicity tests

* added commetns for each test

* changed date values and periodicity to male tests more appropriate

* changed periodicity to period_onset

* period on_set to offset

* added period missing exception test

* more tests added and period ofset = none capability added

* Removed predicitve period , period offset from code and tests

* tidy up

* removed period from code and tests

* added more test

* lint

* isort

* updated docstrings

* ammend and lint docstrings

* isort check

* First draft of the python wrapper readme complete and python wrapper code cleanup complete

* moved and ammended comments

* made docstring and comment changes

* black and flake8

* Updated the python wrapper readme

* added identifier to error returned

* added tabulate back in

* Updated the python wrapper readme

* changed total condition for set predicitve

* end of day commit

* updating the documentation

* Markdown cleanup

* backup commit

* added in the default precision value

* removed unknown file

* removed duplicated test

* Updated

* Wrapper updated to work with the latest T&C method code

* Wrapper CSV functions updated to work with the latest T&C method code

* T&C output table updated

* Wrapper updated, T&C validate_input function updated and sum_components updated

* Fixed abs diff issue

* T&C tests 4 corrected and added test 5

* New tests added and T&C abs diff fix code refactored

* Code formatted and linter ran

* Output data examples added

* Comments added for test data

* T&C test 6 updated

* T&C test 6 updated

* Wrapper tested

* T&C test 6 comment updated

* Wrapper tested

* Abs diff fix code refactored/ refined and tests updated accordingly

* Duplicate file removed

* Comments added on top of the abs diff fix code

* Wrapper formatted

* Validate inpur function updated & tests updated accordingly

* Code formatted and linter ran

* lint

* Decimal(0) -> 0

* Local csv function updated to combine input and output data when outputting return data from T&C method into a new csv file

* In memory CSV function updated to combine input and output data

* Pandas wrapper for Totals and Components added

* Running isort, pylint

* additional fix from pylint

* Amending doc strings

* changed value error raising approach

* cleaned file

* Tests amended after removal of precision from output

* Amendments to precision usage

* amended precision optional status in sub-methods, amended unused import

* fixed doc strings

* Amending doc-strings

* amending tests post merge

* made the value error messages utils and updated the tests

* clean up

* end of day commit

* end of day commit

* added utils and changed tacexception errors and code to reference them

* var name change

* flake8

* valueerror test

* amending test N on validate

* corrected value errors

* clean up

* File structure amended to better match statistical methods library

* renaming fixture data

* print table moved to util

* clean up

* added comments

* comment change

* spacer variable added and comments changed

* changed var spacer to padding

* clean up

* Renaming

* pandas_example.py added

* Pandas wrapper section added in README and test data files renamed

* SPP-9712-empty-components-should-stop-method

* clean up

* clean up

* added more tests

* SPP-9708-automate-uat

* added comment for components is none

* added more tests

* removed duplicate code

* reverted comment

* grammer

* grammer

* added more tests

* formula correction

* test tidy up

* test 5 clean up

* test 5 clean up

* tests added

* Logging added to totals_and_components.py and common_utils.py

* Clean up

* Adding watchpoints to track tcc marker throughout method

* test check

* test failing due to mqd misalign commented for later correction

* clean up

* Clean up

* Removing watcher, adding in warnings when TCCMarker is set to STOP

* uncommented tests

* component test

* hand calcualtions for components

* added comments

* flake8

* Removing watcher, adding in warnings when TCCMarker is set to STOP, amendments to error output and adding examples

* amending log_file_path name in  common utils

* Reorder changes

* Tidy code comments and docstrings

* SPP-9704 Review Comments Cleanup

* SPP-9704 Update fileHandler Config to prevent file creation

* SPP-9253 Update paths to test files to fix CICD

* SPP-9253 Update list type issue to fix CICD

* SPP-9253 Update float|none issue to fix CICD

* SPP-9253 Update int issue to fix CICD

* SPP-9253 Update float|none to union to fix CICD

* SPP-9253 Update precision to fix CICD

* SPP-9253 Update precision types to fix CICD

* SPP-9253 Update tuple to Tuple to fix CICD

* SPP-9253 Update to Unions to fix CICD

* SPP-9253 Update tuple to Tuple to fix CICD

* SPP-9253 Update list to List to fix CICD

* SPP-9253 Update for List definition

---------

Co-authored-by: sanjeevz3009 <[email protected]>
Co-authored-by: jhmjam <[email protected]>
Co-authored-by: jasonbellONS <[email protected]>

* Updating poetry version in release-artifact CI (#40)

* adding initial pypi release code (#41)

* Spp 9474 pypi release (#42)

* adding initial pypi release code

* amend pypi release code

* amend pypi release code

* amend pypi release code

* amend pypi release code

* amend pypi release code

* removing outputs:

* removing outputs:

* amending pyproject

* amending pyproject

* amending release script to ignore rc releases for pypi upload

* amending release script to use new pypi account

* amending release script to use new pypi account

* amending archive script

* amending pyproject

* Testing complete, adding rc block back in

* Updating README

* adding exclusion files to pyproject.toml

* amending version

* amending version

* SPP-9888-Remove-Precision-Output (#43)

* Precision removed from the output in the example.py file, tabulate added to pyproject.toml, pyenv local version file ignored in gitignore and tabulate moved to dev dependencies.

* Spp9924 nan handling updates (#44)

* SPP-9924 Cater for NaN values

* SPP-9924 Add extra tests for UAT

* SPP-9924 Fix isort issues

* SPP-9924 Fix absolute difference type change

* Spp 9889 full coverage of uat tests (#45)

* SPP-xxxx-add-further-uat-tests

* added more tests

* added more tests

* added more test cases

* added more tests

* clean up

* SPP-9924 Cater for NaN values

* SPP-9924 Add extra tests for UAT

* SPP-9924 Fix isort issues

* SPP-9924 Fix absolute difference type change

* update with main

* clean up

* clean up

* fixture test

* clean up

* clean up

* clean up

* removed fxt conditions

* isort

* isort imports

---------

Co-authored-by: Steve Gibbard <[email protected]>
Co-authored-by: Steve Gibbard <[email protected]>

* Spin UAT release candidate (#46)

* Updating branch with main and refactor to allign with totals and components build

* updating pyproject

* updating pyproject, running black, isort, flake8

* amending coveragerc

* amending readme

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Adam Thompson <[email protected]>
Co-authored-by: jhmjam <[email protected]>
Co-authored-by: James Morgan <[email protected]>
Co-authored-by: David Lees <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Michael Candlin <[email protected]>
Co-authored-by: Sanjeev Srithevan <[email protected]>
Co-authored-by: Steve Gibbard <[email protected]>
Co-authored-by: sanjeevz3009 <[email protected]>
Co-authored-by: Steve Gibbard <[email protected]>

* Spp 9939 validate input (#48)

* Initial commit, updating validation to run in one function, tests updated

* running black, isort, flake8

* Testing added

* Custom exception added, existing tests amended to match new tests

* fixing flake8

* fixing isort issue

* Amending issues raised in review

* running black, isort, flake8

* Spp 9970 introduce logging (#51)

* Logging introduced, docstrings added

* running black,flake8,isort

* running black, isort, flake8

* adding log table during exception

* Spp 9800 pandas wrapper (#53)

* amending pandas_wrapper

* initial poc with totals and components

* Thousand pounds method added, output logic created, type hints and doc strings added

* amending coveragerc so pandas wrapper/example dont trigger coverage failures

* Amending comments

* running flake8

* Spp 10021 stop marker and input types (#54)

* amending pandas_wrapper

* initial poc with totals and components

* Thousand pounds method added, output logic created, type hints and doc strings added

* amending coveragerc so pandas wrapper/example dont trigger coverage failures

* TpcMarker enum added and stop conditions implemented, method now creates Target_variable objects within method, tests + wrapper updated

* Running black, flake8, isort

* Amending comments

* running flake8

* PR amendments

* amending docstrings

* Adding warning logger when tpc marker is set to STOP

* Spp 9629 empty field processing (#55)

* amending pandas_wrapper

* initial poc with totals and components

* Thousand pounds method added, output logic created, type hints and doc strings added

* amending coveragerc so pandas wrapper/example dont trigger coverage failures

* TpcMarker enum added and stop conditions implemented, method now creates Target_variable objects within method, tests + wrapper updated

* Running black, flake8, isort

* Amending comments

* running flake8

* PR amendments

* initial commit

* Amendments to testing

* Tests amended

* amending aux_val removal

* Renaming principal_identifier to unique_identifier, removing original_principal_value from output

* Spp10168 amend logging config (#58)

* amending config to make handler names more specific

* amending config to make handler names more specific

* Spp 9969 decimal processing (#57)

* Poetry install command changed & poetry check command added (#49)

* first draft of decimal conversion funciton

* added more code

* convert_input_to_decimal function mostly complete

* backup

* back up

* backup

* back up

* Finished making all the outouts decimal formats

* amending pandas_wrapper

* added NaN condition

* added new common utils code

* test updates

* fixed some tests

* adjusted rounding margin error

* adjusted rounding margin error

* all tests passing

* clean up code

* clean up floast in test file to decimal

* added docstring

* linting

* initial poc with totals and components

* pass nan as nan in the coversion function

* fixed bug for adding existing decimal

* PR comment corrections

* isort

* Thousand pounds method added, output logic created, type hints and doc strings added

* amending coveragerc so pandas wrapper/example dont trigger coverage failures

* TpcMarker enum added and stop conditions implemented, method now creates Target_variable objects within method, tests + wrapper updated

* Running black, flake8, isort

* Amending comments

* running flake8

* PR amendments

* SPP-9926 Add New Packages (#50)

* Bandit added to the repo, code formatted and dependencies are put in the correct groups

* initial commit

* Amendments to testing

* Tests amended

* added fine tune to component correction

* fixed tests

* lint and tidy

* Tidy up commenting

* amending aux_val removal

* clean up

* removed unused var

* Making optional values in T&C defualt when not input (#56)

* Renaming principal_identifier to unique_identifier, removing original_principal_value from output

* fixed missing precision

* var removal from docstrings

* Decimal processing implemented for thousand_pounds, precision validation in totals&components made generic

* updating poetry lock

* Running isort

* amendments

---------

Co-authored-by: Sanjeev Srithevan <[email protected]>
Co-authored-by: jhmjam <[email protected]>
Co-authored-by: sanjeevz3009 <[email protected]>
Co-authored-by: James Morgan <[email protected]>

* Spp 10072 thousand pounds uat test cases (#59)

* SPP-10072-thousand-pounds-uat-test-cases
---------

Co-authored-by: Sanjeev Srithevan <[email protected]>
Co-authored-by: sanjeevz3009 <[email protected]>
Co-authored-by: jasonbellONS <[email protected]>
Co-authored-by: JasonBellONS <[email protected]>

* precision added to thousand pounds tests

* Updating release candidate number

* running black, isort, flake8

* SPP-10187-update-thousand-pounds-output-to-string

* lint

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dllmorgan <[email protected]>
Co-authored-by: JasonBellONS <[email protected]>
Co-authored-by: Adam Thompson <[email protected]>
Co-authored-by: David Lees <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Michael Candlin <[email protected]>
Co-authored-by: Sanjeev Srithevan <[email protected]>
Co-authored-by: Steve Gibbard <[email protected]>
Co-authored-by: sanjeevz3009 <[email protected]>
Co-authored-by: Steve Gibbard <[email protected]>
Co-authored-by: jasonbellONS <[email protected]>
@JasonBellONS JasonBellONS merged commit 7ae505f into main Oct 18, 2023
@JasonBellONS JasonBellONS deleted the SPP-7526-Thousand-Pound-Correction branch October 18, 2023 08:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants