Skip to content

Commit

Permalink
remove restriction on matplotlib (results in error)
Browse files Browse the repository at this point in the history
Signed-off-by: vsoch <[email protected]>
  • Loading branch information
vsoch committed Feb 8, 2020
1 parent 61a3619 commit 1bdc493
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and **Merged pull requests**. Critical items to know are:
Referenced versions in headers are tagged on Github, in parentheses are for pypi.

## [vxx](https://github.com/pydicom/deid/tree/master) (master)
- Removing matplotlib dependency (0.1.36)
- Adding black formatting, tests run in GitHub actions (0.1.35)
- Adding option to recursively replace sequences (0.1.34)
- adding pylint to clean up code (0.1.33)
Expand Down
8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
FROM continuumio/miniconda3

RUN apt-get update && apt-get install -y wget git pkg-config libfreetype6-dev
RUN /opt/conda/bin/conda install matplotlib==2.1.2
RUN pip install pydicom==1.1.0
RUN mkdir /code
ADD . /code
RUN apt-get update && apt-get install -y wget git pkg-config libfreetype6-dev g++
RUN conda install matplotlib
WORKDIR /code
ADD . /code
RUN python /code/setup.py install

RUN chmod 0755 /opt/conda/bin/deid
Expand Down
3 changes: 1 addition & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
include README.md LICENSE
recursive-include deid *
prune __pycache__
prune *.pyc
global-exclude __pycache__
prune *.pyc
prune deid/tests
prune *OLD
4 changes: 2 additions & 2 deletions deid/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"""

__version__ = "0.1.35"
__version__ = "0.1.36"
AUTHOR = "Vanessa Sochat"
AUTHOR_EMAIL = "[email protected]"
NAME = "deid"
Expand All @@ -32,7 +32,7 @@
LICENSE = "LICENSE"

INSTALL_REQUIRES = (
("matplotlib", {"max_version": "2.1.2"}),
("matplotlib", {"min_version": "2.1.2"}),
("pydicom", {"exact_version": "1.2.1"}),
("python-dateutil", {"min_version": None}),
)

0 comments on commit 1bdc493

Please sign in to comment.