Adacs dev #412

shiblisaleheen · 2020-11-09T23:20:53Z

Changes related to fixing the existing test cases, disabling the old ones, fixing the npm version and update readme.

… into adacs_dev

use django default for STATICFILES_STORAGE setting during testing (as per the django documentation)

github-actions

Congrats on your first PR: please assign the PR to a milestone, and to a reviewer if not auto-assigned. Add relevant labels if possible

srggrs

Thanks for the changes! Looks good over all. Just few questions below:

waht is the .idea file
why we need the .nvmrc file

INSTALL.md

PROFILE.md

Also cleaned up the code slightly

srggrs

Thank you for implementing the association tests! They seems great! I will get Adam to review them as well, as he understand more the association logic. Overall I commented few things, just to make more conform with the Django guidelines...

vast_pipeline/pipeline/association.py

vast_pipeline/tests/test_pipeline/test_association.py

ellawang44 · 2020-11-23T05:35:38Z

@srggrs @ajstewart I'm done with the changes in associate. Please review these tests.

ajstewart

These tests look fantastic, thank you!

I've look through all the logic of the tests and as far as I can see you've got it all correct for each test.

Just some minor things:

CSV new line warnings - doesn't really matter but would be neater to get rid of them (unless this is to make them be read easier?).
Function docstrings - recently we've been making sure that any new code has the correct docstrings implemented with the outputs and variables. It would be good if this could be followed for those functions which have variables or outputs (the format needs to be standardised in the code so you may see two different styles).
Please update CHANGELOG.md with the changes made.

vast_pipeline/tests/test_pipeline/data/skyc1_srcs_all.csv

vast_pipeline/tests/test_pipeline/test_association.py

Added new lines to csv, added more details to docstrings

ellawang44 · 2020-11-25T02:42:57Z

@ajstewart I made the requested changes, please review again and let me know if there's any other issues.

CHANGELOG.md

ajstewart · 2020-11-25T03:10:17Z

All looks good to me, just the conflict to sort out and then it should be good to go.

ajstewart · 2020-11-25T03:11:17Z

Not sure if @srggrs wants another look, a tag in case.

srggrs

Well done @shiblisaleheen @ellawang44 ! LGTM!

srggrs

Well done @shiblisaleheen @ellawang44 ! LGTM!

just merge master and send us the request for review for approval

ajstewart · 2020-11-25T05:53:36Z

Gah sorry I just merged one of the others! One more merge master and it will good, I won't touch it until this is done.

shiblisaleheen · 2020-11-25T06:20:40Z

Not a problem, I just merged back master into adacs_dev @ajstewart

ajstewart · 2020-11-26T00:04:08Z

Feel free to merge this!

shiblisaleheen · 2020-11-26T08:48:26Z

I don't have permission to merge this :(

ajstewart · 2020-11-26T08:49:20Z

I don't have permission to merge this :(

Whoops! I'll merge it now.

shiblisaleheen and others added 20 commits October 9, 2020 12:19

adding nvmrc to fix the version numbers

5fe0f4f

add .idea to gitignore

63941ba

add wayaround to fix npm start failure

43bcdbc

fix test paths (./pipeline/tests --> ./vast_pipeline/tests)

0a445b4

try to fix test

ca87f2a

Merge branch 'adacs_dev' of https://github.com/askap-vast/vast-pipeline…

7904bb0

… into adacs_dev

fix config with new defaults

1490b63

fixed webserver test error

c803f6d

use django default for STATICFILES_STORAGE setting during testing (as per the django documentation)

adding nvmrc to fix the version numbers

7f3de93

add .idea to gitignore

891c8e0

add wayaround to fix npm start failure

6f4121a

try to fix test

35ff104

fix test paths (./pipeline/tests --> ./vast_pipeline/tests)

0bfa49d

fix config with new defaults

276c995

fixed webserver test error

0431f7b

use django default for STATICFILES_STORAGE setting during testing (as per the django documentation)

merge

0fc7970

fix duplicate files test

c85db85

fixed test cases

9100480

activate all tests

1c95a12

Add profile notes

bb5160e

shiblisaleheen requested a review from srggrs November 9, 2020 23:20

github-actions bot added this to In progress in Pipeline Backlog Nov 9, 2020

github-actions bot reviewed Nov 9, 2020

View reviewed changes

srggrs reviewed Nov 10, 2020

View reviewed changes

INSTALL.md Show resolved Hide resolved

PROFILE.md Show resolved Hide resolved

Ella Wang added 4 commits November 17, 2020 13:45

Swapped return df order to match docstring

d35e8f4

Add some tests and test data for association.py

43cf785

Minor cleanup of code

5cc0a36

Add tests for many_to_many_advanced

705f518

Also cleaned up the code slightly

srggrs requested changes Nov 18, 2020

View reviewed changes

Pipeline Backlog automation moved this from In progress to Review in progress Nov 18, 2020

ajstewart requested changes Nov 24, 2020

View reviewed changes

vast_pipeline/tests/test_pipeline/data/skyc1_srcs_all.csv Outdated Show resolved Hide resolved

vast_pipeline/tests/test_pipeline/test_association.py Outdated Show resolved Hide resolved

Pipeline Backlog automation moved this from In progress to Review in progress Nov 24, 2020

Update changelog

e8d4594

Added new lines to csv, added more details to docstrings

ajstewart reviewed Nov 25, 2020

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

Reordered changelog

5f94be4

srggrs self-requested a review November 25, 2020 05:09

srggrs approved these changes Nov 25, 2020

View reviewed changes

srggrs self-requested a review November 25, 2020 05:12

srggrs requested changes Nov 25, 2020

View reviewed changes

Merge branch 'master' into adacs_dev

92e86ea

shiblisaleheen requested review from ajstewart and srggrs November 25, 2020 05:17

srggrs previously approved these changes Nov 25, 2020

View reviewed changes

merge master to adacs_dev

a72c44f

shiblisaleheen dismissed srggrs’s stale review via a72c44f November 25, 2020 06:17

shiblisaleheen requested a review from srggrs November 25, 2020 06:18

ajstewart approved these changes Nov 25, 2020

View reviewed changes

Pipeline Backlog automation moved this from Review in progress to Reviewer approved Nov 25, 2020

ajstewart merged commit fca4bcc into master Nov 26, 2020

Pipeline Backlog automation moved this from Reviewer approved to Done Nov 26, 2020

ajstewart deleted the adacs_dev branch November 26, 2020 08:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adacs dev #412

Adacs dev #412

shiblisaleheen commented Nov 9, 2020

github-actions bot left a comment

srggrs left a comment •

edited

srggrs left a comment

ellawang44 commented Nov 23, 2020

ajstewart left a comment

ellawang44 commented Nov 25, 2020

ajstewart commented Nov 25, 2020

ajstewart commented Nov 25, 2020

srggrs left a comment

srggrs left a comment

ajstewart commented Nov 25, 2020

shiblisaleheen commented Nov 25, 2020

ajstewart commented Nov 26, 2020

shiblisaleheen commented Nov 26, 2020

ajstewart commented Nov 26, 2020

Adacs dev #412

Adacs dev #412

Conversation

shiblisaleheen commented Nov 9, 2020

github-actions bot left a comment

Choose a reason for hiding this comment

srggrs left a comment • edited

Choose a reason for hiding this comment

srggrs left a comment

Choose a reason for hiding this comment

ellawang44 commented Nov 23, 2020

ajstewart left a comment

Choose a reason for hiding this comment

ellawang44 commented Nov 25, 2020

ajstewart commented Nov 25, 2020

ajstewart commented Nov 25, 2020

srggrs left a comment

Choose a reason for hiding this comment

srggrs left a comment

Choose a reason for hiding this comment

ajstewart commented Nov 25, 2020

shiblisaleheen commented Nov 25, 2020

ajstewart commented Nov 26, 2020

shiblisaleheen commented Nov 26, 2020

ajstewart commented Nov 26, 2020

srggrs left a comment •

edited