Move to current pynetdicom

[Ed McDonagh]

Bitbucket will remove mercurial repositories (including https://bitbucket.org/edmcdonagh/pynetdicom on 1st June 2020.

I have no intention of maintaining that repository after that date, so we need to have moved onto https://github.com/pydicom/pynetdicom well before that date.

This implies moving also to https://github.com/pydicom/pydicom,

Python 2.7 stops being supported on 1st June 2020, with a final release in April 2020. Pip for 2.7 will also be deprecated at the same time. So we need to make that transition too.

[Ed McDonagh]

Attempted to change all dicom imports to pydicom. Refs #404, #530

→ <<cset 46f8ef095fd3>>

[Ed McDonagh]

Set tox to install pydicom 1.0.0a1 and edited pynetdicom from github when testing. Refs #404, #530

→ <<cset a902622e5de0>>

[Ed McDonagh]

Removing -e from pip install. Hoping it fixes pipeline egg request! Refs #404, #530

→ <<cset 929856ec22ff>>

[Ed McDonagh]

New pydicom doesn't fall over when reading invalid filter thicknesses, so have to look for commas instead. Refs #530

→ <<cset 62a378fd0a06>>

[Ed McDonagh]

First attempt to get pynetdicom3 working. Haven't changed storescp or test_dicom_qr properly. Refs #530

→ <<cset 15c16386aab5>>

[Ed McDonagh]

Major modification to store.py, not tested. Refs #530

→ <<cset 2aacaa6bdea5>>

[Ed McDonagh]

Small improvement to port error catching. Refs #530

→ <<cset 815cefa249a4>>

[Ed McDonagh]

Fixed hostname and echo response issues, various other minor changes, modified status field to allow longer statuses. Refs #530

→ <<cset 790b4fbb7000>>

[Ed McDonagh]

Not understanding how to use the QueryRetrieveSOPClassList - it doesn't get expanded into UIDs. Now works with specifying specific UIDs. Refs #530

→ <<cset c0b5ac08c3eb>>

[Ed McDonagh]

VerificationClass needed to be added to QRList, not added to a list. Now works. Refs #530

→ <<cset c4695e5391ec>>

[Ed McDonagh]

Commenting out the QR tests for now as they will need to be rewritten for pynetdicom3. Refs #530

→ <<cset 08598e005d19>>

[Ed McDonagh]

More logging. Refs #530

→ <<cset 7c77d6877dc1>>

[Ed McDonagh]

Now have correct storescp sop classes. Refs #530

→ <<cset ab29c2ad0fc0>>

[Ed McDonagh]

Query works, store works but doesn't seem to feed objects into import routines. Move doesn't work. Leaving here for now. Refs #530

→ <<cset e1a45346f1bc>>

[Ed McDonagh]

pynetdicom3 isn't ready (for example see this issue) that renders it unsuitable for python 2 currently.

Moving to the current patmun/pynetdicom would improve things, including access to DIMSE messages, but still relies on the unreleased pydicom v1.0 and doesn't offer any future as we'll need to move to pynetdicom3 to support python 3.

Therefore, for the sake of getting 0.8 through the door I plan to stick with the current pydicom and pynetdicom from my repo. Might need to specify pydicom version, or specify legacy version from pip.

[Ed McDonagh]

pydicom is now on release version 1.2.1 with regular updates and pynetdicom version 1.0.0 has now been released!

Hoorah! 👏🎉

[Ed McDonagh]

This thread discussing a pull request regarding incorporating support for structured reports in pydicom is quite exciting - it could change how we record things in the future, and how we then write new RDSRs too. No more cid tables... https://github.com/pydicom/pydicom/pull/824

[Ed McDonagh]

Setting target to next release, v 1.0

[Ed McDonagh]

Edited description to identify hard stop dates for migrating to pynetdicom.

[Ed McDonagh]

Disabled pynetdicom testing for now. All other tests pass. Need to work out Python 3 testing rig on bitbucket. Refs #404, #777, #457, #530 [skip ci] Not ready for testing. Next task - move to Django 1.9...

→ <<cset e13fda4c134e>>

[Ed McDonagh]

Added in pynetdicom to setup, updated C-ECHO function, started work on C-FIND function. Refs #530, [skip ci] as QR tests currently disabled.

→ <<cset 09e64968cf7e>>

[Ed McDonagh]

Replacing render_to_response with render in dicomviews. Refs #530, #457, [skip ci] as QR tests currently disabled.

→ <<cset 03aa4dc22cfc>>

[Ed McDonagh]

Added handler to echo function to get rejection reason, currently just printed. Refs #530, [skip ci] as QR tests currently disabled.

→ <<cset e287f0fc7310>>

[Ed McDonagh]

Minimum functioning version. I think. Refs #530, [skip ci] as QR tests currently disabled.

→ <<cset 1f3af3bf4642>>

[Ed McDonagh]

Reformatting form code for prettiness. Refs #530, [skip ci] as QR tests currently disabled.

→ <<cset ea4a33202a6d>>

[Ed McDonagh]

Updated reverse.js and other links to use new URLs. Interface QR now functions for find, not tested move yet. Refs #530, [skip ci] as QR tests currently disabled.

→ <<cset 57e16f0f2cb0>>

[Ed McDonagh]

Merged in p3django2.2 (pull request #337)

Update develop to Python 3, Django 2.2

Refs #530, fixes #404, #437, #457, #777

→ <<cset 1fc70f28f05e>>

[Ed McDonagh]

Echo reject now handled with message. Started getting message into interface. Refs #530 [skip ci] pynetdicom tests disabled

→ <<cset 5f28050d53ab>>

[Ed McDonagh]

Updated reverse.js again, replaced new URLs with names, replaced previous one that was missed too Reformatted verification html. Refs #530. [skip ci] netdicom testing disabled.

→ <<cset 3b3d3e41524c>>

[Ed McDonagh]

Updated DICOM network configuration page to work with the new statuses. Refs #530. [skip ci] netdicom testing disabled.

→ <<cset 31a2f288e5d9>>

[Ed McDonagh]

Removed commented out and redundant code from qrscu. Added echoscu style messaging to log and interface for QR association. Refs #530. [skip ci] netdicom testing disabled.

→ <<cset 38088243f0d3>>

[Ed McDonagh]

Updated study level query to follow example. Added more logging and some status messages to web interface. Refs #530. [skip ci] netdicom testing disabled.

→ <<cset aa5e8a70bb71>>

[Ed McDonagh]

Updated image and series queries to match form of study. Refs #530. [skip ci] netdicom testing disabled.

→ <<cset f5f37ca0e449>>

[Ed McDonagh]

Starting to work on movescu. Refs #530. [skip ci] netdicom testing disabled.

→ <<cset 40820cc0cff8>>

[Ed McDonagh]

movescu works, but yet to make use of any of the new status message information available. Refs #530. [skip ci] netdicom testing disabled.

→ <<cset 9ec2e011b50f>>

[Ed McDonagh]

Added table of sub-ops summary. Requires database migration. Refs #530. [skip ci] netdicom testing disabled.

→ <<cset 0c35ad148c0b>>

[Ed McDonagh]

Tidied up sub-ops summary, added to in-move msg. Refs #530. [skip ci] netdicom testing disabled.

→ <<cset afa9b7397f05>>

[Ed McDonagh]

Now get similar message during pending and final. Refs #530. [skip ci] netdicom testing disabled.

→ <<cset bc0d221fd900>>

[Ed McDonagh]

Added in all the other status codes. Refs #530. [skip ci] netdicom testing disabled.

→ <<cset 05b96696b2b8>>

[Ed McDonagh]

Added cancel status and full stops. Refs #530. [skip ci] netdicom testing disabled.

→ <<cset cd5ef76732f1>>

[Ed McDonagh]

Added UIDs to version.py. Refs #530. [skip ci] netdicom testing disabled.

→ <<cset be4ff09ca686>>

[Ed McDonagh]

Starting to reconstruct storescp based on current example. Refs #530. [skip ci] netdicom testing disabled.

→ <<cset 33c207da7ae3>>

[Ed McDonagh]

Start stop Store SCP now works. Need to reimplement the store handling. Refs #530. [skip ci] netdicom testing disabled.

→ <<cset aad338aedc2b>>

[Ed McDonagh]

Basic store handling now functioning. Refs #530. [skip ci] netdicom testing disabled.

→ <<cset e04667671f45>>

[Ed McDonagh]

Removing unicode markers. Refs #530. [skip ci] netdicom testing disabled.

→ <<cset 2c82e09de7ee>>

[Ed McDonagh]

Enabling and fixing DICOM QR tests again. Refs #530

→ <<cset 43222fd8b6c2>>

[Ed McDonagh]

Adding ref #530 to changes

→ <<cset 79431d1fcacd>>

[Ed McDonagh]

Removing handle_assoc as I think it is unnecessary - rejection is already handled. Refs #530

→ <<cset 418eaad32ce8>>

[Ed McDonagh]

Fixing some of the issues raised by Codacy. Refs #530

→ <<cset b868f60291af>>

[Ed McDonagh]

Specified Python version 3.6, 3.7 in the hope that the f string invalid syntax error goes away... Refs #530

→ <<cset 019970a154fc>>

[Ed McDonagh]

Tidied up some more Coadcy issues, deleted never-used storescu example. Refs #530

→ <<cset 8c469e8129ed>>

[Ed McDonagh]

New codacy config file to try and get f-strings allowed. Refs #530

→ <<cset 6b14b5939e5b>>

[Ed McDonagh]

Changed the inspectors as per Codacy advice. try again. Refs #530

→ <<cset 2d8c430d5934>>

[Ed McDonagh]

Merged in issue530pynetdicom (pull request #339)

Refs #530

→ <<cset 04f9711c5270>>

[Ed McDonagh]

Should have been marked fixed in commit 04f9711c5270 with PR #339

[Ed McDonagh]

We haven’t managed to release a version with new pynetdicom before the mercurial repository is to be deleted (even with the Covid 19 reprieve of extending to 1st July), but I have managed to move the mercurial repo (which will be deleted) and create a git repo with the same name and content which means 0.10 installs should still be possible!