Merge pull request #5 from king-alexander/develop

Manage dependencies

Dockerfile-admiral

@@ -35,14 +35,13 @@ RUN echo "cisa ALL=(root) NOPASSWD: /usr/bin/nmap" > /etc/sudoers.d/cisa_nmap \
 
 RUN python3 -m pip --no-cache-dir install --upgrade pip setuptools wheel
 
-RUN if [ -n "${INSTALL_IPYTHON}" ]; \
-  then python3 -m pip --no-cache-dir install ipython pytest; fi
-
 WORKDIR ${CISA_SRC}
 
 COPY src src
 COPY setup.py README.md ./
-RUN python3 -m pip --no-cache-dir install --editable .
+RUN if [ -n "${INSTALL_IPYTHON}" ]; \
+  then python3 -m pip --no-cache-dir install --editable .[test]; \
+  else python3 -m pip --no-cache-dir install --editable .; fi
 
 USER cisa
 WORKDIR ${CISA_HOME}

setup.py

@@ -88,7 +88,10 @@ def get_version(version_file):
     py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")],
     include_package_data=True,
     install_requires=[
-        "celery >= 4.3.0rc2",
+        # Celery 5.0 introduces breaking changes to the CLI. See
+        # https://docs.celeryq.dev/en/stable/history/whatsnew-5.0.html?highlight=command%20line%20options#new-command-line-interface
+        # for more information.
+        "celery >= 4.3.0,<5.0.0",
         "cryptography >= 2.4.2",
         "defusedxml",
         "dnspython",

src/admiral/_version.py

@@ -1,2 +1,2 @@
 """This file defines the version of this module."""
-__version__ = "0.1.0"
+__version__ = "0.2.0"