-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* release/0.2.0: (80 commits) Bump version: 0.2.1-dev -> 0.2.1 Bump version: 0.2.0 -> 0.2.1-dev Upload Pipfile.lock and docs. Add releasing checklist. Bump version: 0.2.0-dev -> 0.2.0 Bump version: 0.1.5-dev -> 0.2.0-dev Fix Makefile to install dicom3tools on Linux. Handle no patient_birthdate better. Migrate to importlib.resources. Update lock. Update codes from ADA-1107. Sync with ADA-1107 Add day MeasurementUnitsCodeSequence. Remove commented code. Add Longitudinal Termporal Event and Offset. Fix modifiers which were using body structures. Add UTF-8 Charachter set. Fix problems with Windows. Update SNOMED codes. update codes from ada-1107 ...
- Loading branch information
Showing
30 changed files
with
1,469 additions
and
1,193 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,3 +5,4 @@ build | |
*.pyc | ||
*.egg-info | ||
*.dcm | ||
modules/dicom3tools |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
|
||
MAIN = dicom4ortho | ||
D3TOOLS_DIR = modules/dicom3tools | ||
D3TOOLS_VERSION = 1.00.snapshot.20230225185712 | ||
D3TOOLS_BASE_URL = https://www.dclunie.com/dicom3tools/workinprogress/macexe/dicom3tools_ | ||
D3TOOLS_FILE = dicom3tools.zip | ||
|
||
ifeq ($(OS),Windows_NT) | ||
D3TOOLS_URL = $(D3TOOLS_BASE_URL)winexe_$(D3TOOLS_VERSION).zip | ||
else | ||
UNAME_S := $(shell uname -s) | ||
ifeq ($(UNAME_S),Darwin) | ||
D3TOOLS_URL = $(D3TOOLS_BASE_URL)macexe_$(D3TOOLS_VERSION).zip | ||
endif | ||
endif | ||
|
||
DIST = ./dist | ||
|
||
|
||
LINTER = $$(which pylint) --errors-only | ||
|
||
|
||
.PHONY: lint | ||
lint: | ||
$(LINTER) setup.py | ||
$(LINTER) $(MAIN) | ||
|
||
.PHONY: test | ||
test: install-dev | ||
python3 -m unittest | ||
|
||
.PHONY: clean | ||
clean: | ||
rm -rf $(DIST) | ||
echo "Cleaned up $(DIST) folder." | ||
rm -rf *.egg-info | ||
echo "Removed all .egg-info files." | ||
rm -f test/resources/*.dcm | ||
echo "Removed *.dcm files in test/resources." | ||
find . -path "*/__pycache*" -delete | ||
echo "Deleted all __pycache files." | ||
rm -rf $(D3TOOLS_DIR) | ||
|
||
$(DIST): | ||
mkdir $@ | ||
|
||
.PHONY: build | ||
build: lint test $(DIST) | ||
python3 -m setup sdist | ||
|
||
.PHONY: deploy | ||
deploy: | ||
echo "Deplyoing to PyPi." | ||
echo "To deploy, make sure you have a token saved in ~/.pypirc . See https://pypi.org/manage/account/token/?selected_project=dicom4ortho" | ||
python3 -m twine upload --repository pypi dist/* | ||
|
||
.PHONY: all | ||
all: clean build | ||
|
||
.PHONY: install-dev | ||
install-dev: $(D3TOOLS_DIR) | ||
ifeq ($(UNAME_S),Linux) | ||
install-dev: | ||
sudo apt-get -y install dicom3tools | ||
rm -f $(D3TOOLS_DIR)/dciodvfy | ||
ln -s /usr/bin/dciodvfy $(D3TOOLS_DIR) | ||
else | ||
install-dev: | ||
cd $(D3TOOLS_DIR) && curl $(D3TOOLS_URL) -o $(D3TOOLS_FILE) && unzip $(D3TOOLS_FILE) && rm $(D3TOOLS_FILE) | ||
endif | ||
|
||
$(D3TOOLS_DIR): | ||
mkdir -p $@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.