develop
| Author | Commit | Message | Date | Builds |
|---|---|---|---|---|
|
4374b6c
M
|
Merged in issue839removetroubleshooting (pull request #386)
Fixes #839
|
|
|
|
|
6f8381d
M
|
Merge remote-tracking branch 'origin/issue839removetroubleshooting' into issue839removetroubleshooting
|
|
|
|
|
Adding ref
|
|
||
|
|
3d52e0e
M
|
Merged develop into issue839removetroubleshooting
|
|
|
|
|
3d4169c
M
|
Merged in issue849brokerURL (pull request #384)
Fixes #849
|
|
|
|
|
Should have run Black on pull request #385 before merging... Minor change to chart_functions.py
|
|
||
|
|
Adding using up when .env file changes. Refs
|
|
||
|
|
69bc7bf
M
|
Merged in issue831chartsNotWorkingInDocker (pull request #385)
refs #831
Approved-by: Ed McDonagh
|
|
|
|
|
f7b9bd9
M
|
Fixing conflict in chart_functions.py. References issue #831
|
|
|
|
|
Updating debug mode docs for docker/non-docker. Need to check if a simple docker-compose up will suffice after changin .env.prod... Refs
|
|
||
|
|
Removing troubleshooting docs that are superseded by using current pydicom. Refs
|
|
||
|
|
|
|||
|
|
Added ref
|
|
||
|
|
Created BROKER_URL variable. Refs
|
|
||
|
|
93751a9
M
|
Merge branch 'issue847copybutton' into develop
|
|
|
|
|
e896738
M
|
Merged in issue847copybutton (pull request #382)
Fixes #847
All the docs will need a thorough work through, check nothing bad happens when copy pasted as presented etc.
|
|
|
|
|
Correcting a mismatch between docs and env file. Doesn't really ref
|
|
||
|
|
Added ref
|
|
||
|
|
Some markup corrections, more breaking up of commands. Refs
|
|
||
|
|
Updating more docs to use the new style. Broken up some for safety. Refs
|
|
||
|
|
Breaking up the code block to make it more difficult to accidentally delete all the data! Refs
|
|
||
|
|
Adding prompt to console commands in troubleshooting. Refs
|
|
||
|
|
Adding prompt to console commands. Refs
|
|
||
|
|
Confused - prompt missing... Refs
|
|
||
|
|
See if console looks nicer with prompt. Refs
|
|
||
|
|
Didn't work. Changing regex to match their conf file. Refs
|
|
||
|
|
Adding regex for prompt. Refs
|
|
||
|
|
Adding code blocks. Checking current prompt settings. Refs
|
|
||
|
|
Adding copy button to docs. Refs
|
|
||
|
|
Nginx now moved into bind folder in docker repo. Fixes
|
|
||
|
|
Adding to changes and fixing
|
|
||
|
|
|
|||
|
|
|
|||
|
|
f5a5e61
M
|
Merged in issue844pipelines (pull request #381)
refs #844
|
|
|
|
|
That worked, but we don't need that step. Will merge in. Refs
|
|
||
|
|
Added deploy to develop again. Added to the default branch to see if you can amend with a manual trigger. Refs
|
|
||
|
|
Mis-named deployment step - changing to avoid confusion! demo is from master, dev is from develop.
|
|
||
|
|
First step of now custom pipeline can't be manual.
|
|
||
|
|
Last commit broke pipelines - parallel steps can't have manual triggers. Now moving deployments to custom pipelines instead.
|
|
||
|
|
Attempting to make sure we can run the quality gateway test and set reasonable quality requirements, but not have it prevent merge or deployment if it fails.
|
|
||
|
|
ec00068
M
|
Merge remote-tracking branch 'origin/develop' into develop
|
|
|
|
|
Setting the flake8 step as manual so it doesn't need to be run on every commit. Expect to run it on pull requests, but not otherwise unless desired to save run minutes.
|
|
||
|
|
b584514
M
|
Merged in issue843blankphishing (pull request #380)
Attempting to close phishing vuln, hopefully improving security rating on sonarcloud.
Fixes #843 hopefully, seems sonarcloud only tells you about the changed code, not the project with that code in.
|
|
|
|
|
Missed two. Refs
|
|
||
|
|
Attempting to close phishing vuln, hopefully improving security rating on sonarcloud. Refs
|
|
||
|
|
b54a2f4
M
|
Merged in issue841BlackDocs (pull request #379)
Fixes #841
More work needs to be done on the developer docs, contribution guidelines etc, but can be done later.
|
|
|
|
|
Have to do django tests first else there is no coverage report! Refs
|
|
||
|
|
Adding text to developer docs regarding using Black. Developer docs need more attention! Refs
|
|
||
|
|
Black formatting changes that were missed previously. Refs
|
|
||
|
|
Adding Sonar Cloud badges - will remove the Codacy and coveralls in due course. [skip ci] docs only
|
|
||
|
|
ff50f63
M
|
Merged in issue841testblack (pull request #377)
Refs #841 but doesn't fix it because I need to add some developer docs for black.
Runs flake8 report first, then creates code quality report for everything, then runs a quality gate check before finally running the django tests. Quality gate is currently set at a low bar for now. Not sure which of code quality or django tests are more likely to fail - whichever it is should go first to save pipel…
|
|
|
|
|
I think this works, appears to locally. Refs
|
|
||
|
|
0aa49b6
M
|
Merged in isssue842event_type (pull request #378)
Fixes #842
|
|
|
|
|
Not going to fix lack of issues going to sonarcloud, but might be faster. Refs
|
|
||
|
|
Creating directory. Explicitly adding report as artifact. Refs
|
|
||
|
|
Writing flake8 report. Refs
|
|
||
|
|
Added exit-zero so it will continue even with errors. Refs
|
|
||
|
|
For the moment, no report. Refs
|
|
||
|
|
First attempt at running flake8 in the pipeline. Refs
|
|
||
|
|
Putting the memory use back in, hoping it will pass without additional minutes being charged. Refs
|
|
||
|
|
Making docker service memory really low. Refs
|
|
||
|
|
Updating gitignore for sonarsource files. Refs
|
|
||
|
|
Changed sonarcloud qualitygate so last pipeline passed. Trying now with std memory. Refs
|
|
||
|
|
Memory setting but not size doubling. Refs
|
|
||
|
|
Try and work out where I got to. Setting everything big. Refs
|
|
||
|
|
changes [skip cli]
|
|
||
|
|
contextID code meaning to display dx properties, related to refs
|
|
||
|
|
syntax error Refs
|
|
||
|
|
final permutation for tonight... Refs
|
|
||
|
|
See if doubling the size helps... Refs
|
|
||
|
|
Setting debug to true to see if it indicates why it fails. Refs
|
|
||
|
|
soundcloud-scan now works, but sonarcloud-quality-gate fails on memor error. Seeing if splitting them makes a difference (and works). Refs
|
|
||
|
|
Increasing docker memory from 2048 to max (I think) of 3072. Refs
|
|
||
|
|
Need to create artifact to pass coverage report between steps. Refs
|
|
||
|
|
Failed due to OpenREM not being installed. Try installing as -e. Refs
|
|
||
|
|
Moving Django tests directly into pipeline rather than using tox. Refs
|
|
||
|
|
Correcting previous fix! Refs
|
|
||
|
|
refs
|
|
||
|
|
UTF-8 characters have become corrupted somewhere along the way. Refs
|
|
||
|
|
Added the docker memory setting back in. Refs
|
|
||
|
|
Didn't work. adding debug and hopefully docker image cache. Refs
|
|
||
|
|
88ebe05
M
|
Merge remote-tracking branch 'origin/issue841testblack' into issue841testblack
|
|
|
|
|
Removing the size tweaks to see if it builds and if sonar cache is working. Refs
|
|
||
|
|
2fad3ab
M
|
Merged develop into issue841testblack
|
|
|
|
|
Last failed for memory error. Tweaking. Refs
|
|
||
|
|
Adding sonarcloud test to pipeline. Refs
|
|
||
|
|
Build link needed to be to a branch to make sense; set to develop.
[skip ci] readme changes only.
|
|
||
|
|
Adding a builds badge too :)
|
|
||
|
|
Wanted to update badges to show Python 3!
|
|
||
|
|
2bdaabd
M
|
Merged in issue829offlinedocker (pull request #375)
Fixes #829 but will need testing later.
|
|
|
|
|
caa075a
M
|
Merged in issue841useblack (pull request #376)
Use black
Refs #841 but doesn't close it - I'll work on docs and checks for black/flake8 too.
|
|
|
|
|
Running black on skin map array again. Refs
|
|
||
|
|
Reverting reformatting of skin map array. Refs
|
|
||
|
|
Ignoring logging-fstring-interpolation W1203 for the same reason.
Refs #841
|
|
||
|
|
Ignoring logging-format-interpolation W1202 because I don't agree with it! Refs
|
|
||
|
|
Ignoring bad-continuation C0330 as black disagrees with pylint. Refs
|
|
||
|
|
Fixing basestring reference found in ref
|
|
||
|
|
Using Adafruits list of disable for pylint to see if it is happier. Refs
|
|
||
|
|
|
|||
|
|
Minor edit to doc. Added ref
|
|
||
|
|
Missed link to doc. Refs
|
|
||
|
|
First draft of offline install. Refs
|
|
||
|
|
4d1d6a5
M
|
Merged in issue834nonDockerDocs (pull request #374)
fixes #834
I'm happy that the changes are good enough for now. All the docs will need to be tested when we have a beta release to test with.
|
|
|
|
|
Tidying up, minor changes. Refs
|
|
||
|
|
Fresh non-Docker install docs first review complete. This and upgrade now set to isntall and use Python 3.8, same as Docker. Refs
|
|
||
|
|
Revised non-Docker Ubuntu upgrade docs. Started non-Docker Ubuntu install docs. Refs
|
|
||
|
|
a737c89
M
|
Merge branch 'develop' into issue834nonDockerDocs
|
|
|
|
|
819d29c
M
|
Merged in issue836updatepynetdicom (pull request #373)
FIxes #836
|
|
|
|
|
Marked a couple of files to be updated/deleted. Added ref
|
|
||
|
|
b610c0b
M
|
Merge branch 'develop' into issue836updatepynetdicom
|
|
|
|
|
Removing errant print statement that shouldn't be there. Refs
|
|
||
|
|
Pynetdicom 1.5.1 released allowing install alongside pydicom 2.0.0. Removing other refs to git version.
|
|
||
|
|
827ff29
M
|
Merge branch 'develop' into issue836updatepynetdicom
|
|
|
|
|
c3e6fb4
M
|
Merged in issue838multivalue (pull request #371)
Fixes #838
Approved-by: Luuk
|
|
|
|
|
Final Codacy issue. Refs
|
|
||
|
|
94f37bf
M
|
Merge remote-tracking branch 'origin/issue838multivalue' into issue838multivalue
# Conflicts:
# openrem/remapp/tools/get_values.py
|
|
|
|
|
Addressing more Codacy issues. Deleted replace_comma function as was unused. Refs
|
|
||
|
|
Addressing more Codacy issues. Refs
|
|
||
|
|
Fixing Codacy identified issue. Refs
|
|
||
|
|
Happy now. Created name hash with Python 2.7, old pydicom, OpenREM 0.10; added test in this code; result matches. Also enabled multivalue names to be hashed without error. Refs
|
|
||
|
|
Not the right hash ID at this point, but added test which unfortunately shows my changes don't work! Refs
|
|
||
|
|
Added ref
|
|
||
|
|
Fixing concatenation of multivalue PersonNames for pydicom 2.0. Also for hashing Names, which might change matching of pre and post upgrade hashed names. Refs
|
|
||
|
|
Installs pynetdicom 1.5 and pydicom 2.0 in docker container, but complains due to dependency requirement. Refs
|
|
||
|
|
Completed first draft of Ubuntu upgrade to 1.0. Needs testing. Refs
|
|
||
|
|
@edmcdonagh does this fix the problem that you had with your DX chart? I am unable to replicate the error that you have seen. References issue #831
|
|
||
|
|
Fixed the problem where radiographic charts of kVp etc over time failed if some data values were None. CT study DLP over time still has no data, and haven't addressed Ed's referenced-before-assignment problem yet. References issue #831
|
|
||
|
|
Starting the Ubuntu upgrade docs. Refs
|
|
||
|
|
7548572
M
|
Merged in Issue827openskin2openrem (pull request #369)
Make summary results openskin available in openrem and make alert triggering possible
Fixes #827
Approved-by: Ed McDonagh
Approved-by: David Platten
|
|
|
|
|
|
|||
|
|
Replacing Python 2.x `basestring` with Python 3.x `str`. Charts working now, with the exception of the CT chart of study DLP over time: does it work for anyone else? The radiographic chart of kVp over time works, so this seems to be CT-specific. References issue #831
|
|
||
|
|
9605cf2
M
|
Merged in issue813dbmigration (pull request #370)
I think the database migration looks ok now, but testing it has shown up lots of other issues! Same needs to be done for non-docker Ubuntu instructions; will deal with them in issue ref #834.
This PR fixes Issue ref #813
|
|
|
|
|
Minor change to point out backup filename needs to match reality. Refs
|
|
||
|
|
Confirmed database name and password don't have to match previous. Added options to mean user doesn't either. Refs
|
|
||
|
|
Adding copying of skin dose map pickle files. Needs testing. Refs
|
|
||
|
|
Correcting mistakes David found. Refs
|
|
||
|
|
Refs issue
|
|
||
|
|
|
|||
|
|
Adding Toshiba import config to docker_orthanc.rst. Refs #823 [skip ci] docs only
|
|
||
|
|
Instructions for exporting from 0.10 install postgres and importing and upgrading to 1.0 docker install. Refs
|
|
||
|
|
|
|||
|
|
Starting upgrade to docker docs. Refs
|
|
||
|
|
|
|||
|
|
|
|||
|
|
f265890
M
|
Merge remote-tracking branch 'origin/Issue827openskin2openrem' into Issue827openskin2openrem
|
|
|
|
|
Refs
|
|
||
|
|
4a7bd4f
M
|
Merged develop into Issue827openskin2openrem
|
|
|
|
|
f65b2ed
M
|
Merge remote-tracking branch 'origin/develop' into Issue827openskin2openrem
|
|
|
|
|
4753a22
M
|
Merged in issue823dockerdocs (pull request #368)
Refs #823
Issue remains open, much more to do.
|
|
|
|
|
788d25f
M
|
Merged in issue824dicomdocker (pull request #367)
Fixes #824
|
|
|
|
|
Refs
|
|
||
|
|
Changing interface to reflect using real ports rather than 4242 for DICOM store. Changed default to 104 too. Refs
|
|
||
|
|
|
|||
|
|
A little tidying plus stump for additional Orthanc settings. Refs #823
[skip ci] Docs only
|
|
||
|
|
Finished changing format of env_variables. New docker orthanc config doc. Refs #823
[skip ci] Docs only
|
|
||
|
|
Added the remaining variables, trying a new format. Refs #823
[skip ci] Docs only
|
|
||
|
|
Syntax didn't work, trying again. Refs #823
[skip ci] Docs only
|
|
||
|
|
Added email settings, trying a different format. Refs #823
|
|
||
|
|
Fixing mistakes in last commit.
Refs #823
|
|
||
|
|
Starting to populate env config docs. Refs #823
|
|
||
|
|
rst content for holding file; added env use for regionalisation settings. Ignored virtual directory for now. Refs #823
|
|
||
|
|
Starting to rework install docs for version 1.0 with Docker. Added email settings to env file. Lots more settings to move. Refs #823
|
|
||
|
|
Codacy issues. Refs
|
|
||
|
|
b1870c9
M
|
Merge branch 'develop' into issue824dicomdocker
|
|
|
|
|
12d6250
M
|
Merged in issue744sizeimport (pull request #365)
Fixes #744
|
|
|
|
|
Added ref
|
|
||
|
|
Enabled declaration of Docker Orthanc. New env variable for docker DOCKER_INSTALL. StoreSCP now takes peer variable. Refs
|
|
||
|
|
Codacy fixes, including refactor of passing the size variables. Refs
|
|
||
|
|
Adding to changes and normalising name in different functions. Refs
|
|
||
|
|
Now works through the web interface too, could do with being prettier. Refs
|
|
||
|
|
Fixed tests and various missing data for web interface of previous upload logs. Refs
|
|
||
|
|
Overwrite now available and working from command line. Needs docs. Need to add to web interface. Refs
|
|
||
|
|
Import of model when called from script can't be relative, must be remapp.models. Refs #744
|
|
||
|
|
Changing script import to match other scripts, no functional change. Refs #744
|
|
||
|
|
Minor change to make app name more explicit.
|
|
||
|
|
Hopefully will now write log to database from shell, plus print to shell if verbose. Refs #744
|
|
||
|
|
PEP8 changes to variable names. Refs #744
|
|
||
|
|
ca12479
M
|
Merged in issue826reduceViewsSize (pull request #364)
Fixes #826
Refs #744
|
|
|
|
|
Added ref #826 to changes in preparation for PR
|
|
||
|
|
Fixed mistake in last commit, refs #826.
|
|
||
|
|
Fixing hard coded URLs brought to life by ref #826.
|
|
||
|
|
Reverting last change. #826
|
|
||
|
|
Review failed import URLS aren't working, trying different syntax. #826
|
|
||
|
|
469a05c
M
|
Merge branch 'develop' into issue826reduceViewsSize
|
|
|
|
|
bbf480a
M
|
Merged in Issue817OpenSkinPEP8Compliant (pull request #358)
Fixes issue #817 make OpenSkin PEP8 Compliant
Approved-by: Ed McDonagh
|
|
|
|
|
Update reference in tests to reset_dual. Refs #744, #826
|
|
||
|
|
Update reference to _create_admin_dict. Refs #744, #826
|
|
||
|
|
Cut views in half with new views_admin.py. New branch to test it. Refs #744, #826
|
|
||
|
|
Another 4K down by moving DICOM related views to dicomviews.py. Refs #744, #826
|
|
||
|
|
Factored out Size related views to import views. Only down to 193K from 203K. Refs #744, #826
|
|
||
|
|
e87b65e
M
|
Merge branch 'develop' into Issue817OpenSkinPEP8Compliant
# Conflicts:
# CHANGES.rst
# docs/changes.rst
|
|
|
|
|
Tidying up size import related views. Refs #744
|
|
||
|
|
Adding more tests. Not sure if this works with CSVs with and without the BOM. Refs #744
|
|
||
|
|
Removing binary for csv file and log file. Refs #744
|
|
||
|
|
Updating views to nominally work, though actual h+w updates aren't. Refs #744
|
|
||
|
|
Refactoring so we can start adding tests... Refs #744
|
|
||
|
|
Fixing indent, conveting some to f-strings. Refs #744
|
|
||
|
|
Tidying up before making changes for ref #744
|
|
||
|
|
fc97179
M
|
Merged in issue820sphinxissues (pull request #362)
Fixes #820
|
|
|
|
|