Fixed missing (hidden) dependency

EnzymeML · Mar 4, 2022 · 095f685 · 095f685
1 parent ae2c946
commit 095f685
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 53 deletions.
diff --git a/pyenzyme/enzymeml/tools/validator.py b/pyenzyme/enzymeml/tools/validator.py
@@ -169,6 +169,9 @@ def generateValidationYAML(cls) -> str:
         requirements given in said database.
         """
 
+        # Prevent circular imports (Its dirty, I know, but it works)
+        from pyenzyme.enzymeml.core.enzymemldocument import EnzymeMLDocument
+
         # Get collection data
         cls = cls(scheme={})
         collection, _ = cls._get_cls_annotations(EnzymeMLDocument, level="document")

diff --git a/requirements.txt b/requirements.txt
@@ -18,4 +18,5 @@ numexpr
 seaborn
 plotly
 pysces
-lmfit
+lmfit
+xlsxwriter
diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-'''
+"""
 File: setup.py
 Project: PyEnzyme
 Author: Jan Range
@@ -8,65 +8,46 @@
 Modified By: Jan Range (<jan.range@simtech.uni-stuttgart.de>)
 -----
 Copyright (c) 2021 Institute of Biochemistry and Technical Biochemistry Stuttgart
-'''
+"""
 
 import setuptools
 from setuptools import setup
 
 setup(
-    name='PyEnzyme',
-    version='1.2.1',
-    description='Handling of EnzymeML files',
-    url='https://github.com/EnzymeML/PyEnzyme',
-    author='Range, Jan',
-    author_email='jan.range@simtech.uni-stuttgart.de',
-    license='BSD2 Clause',
+    name="PyEnzyme",
+    version="1.2.1",
+    description="Handling of EnzymeML files",
+    url="https://github.com/EnzymeML/PyEnzyme",
+    author="Range, Jan",
+    author_email="jan.range@simtech.uni-stuttgart.de",
+    license="BSD2 Clause",
     packages=setuptools.find_packages(),
     install_requires=[
-        'python-libsbml',
-        'numpy',
-        'pandas',
-        'python-libcombine',
-        'scipy',
-        'texttable',
-        'pydataverse',
-        'pydantic',
-        'deprecation',
-        'deepdiff',
-        'python-multipart',
-        'easyDataverse',
-        'pyDaRUS',
-        'openpyxl',
-        'numexpr',
-        'seaborn',
-        'plotly',
+        "python-libsbml",
+        "numpy",
+        "pandas",
+        "python-libcombine",
+        "scipy",
+        "texttable",
+        "pydataverse",
+        "pydantic",
+        "deprecation",
+        "deepdiff",
+        "python-multipart",
+        "easyDataverse",
+        "pyDaRUS",
+        "openpyxl",
+        "xlsxwriter",
+        "numexpr",
+        "seaborn",
+        "plotly",
     ],
     extras_require={
-        'test': [
-            'pytest-cov'
-        ],
-        'copasi': [
-            'python-copasi'
-        ],
-        'pysces': [
-            'pysces',
-            'lmfit'
-        ],
-        'rest': [
-            'fastapi',
-            'uvicorn'
-        ],
-        'modeling': [
-            'python-copasi',
-            'pysces',
-            'lmfit'
-        ],
-        'all': [
-            'python-copasi',
-            'pysces',
-            'lmfit',
-            'fastapi',
-            'uvicorn'
-        ]
+        "test": ["pytest-cov"],
+        "copasi": ["python-copasi"],
+        "pysces": ["pysces", "lmfit"],
+        "rest": ["fastapi", "uvicorn"],
+        "modeling": ["python-copasi", "pysces", "lmfit"],
+        "all": ["python-copasi", "pysces", "lmfit", "fastapi", "uvicorn"],
     },
 )