Merge pull request #74 from PRIDE-Archive/python3

merge
Rappsilber-Laboratory · Apr 9, 2024 · 3af2649 · 3af2649
2 parents 4e85bbb + 10ab85c
commit 3af2649
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 38 deletions.
diff --git a/config/config_parser.py b/config/config_parser.py
@@ -24,7 +24,7 @@ def get_conn_str():
     Get database related configurations
     """
     script_dir = os.path.dirname(os.path.abspath(__file__))
-    config = os.environ.get('DB_CONFIG', os.path.join(script_dir, "../database.ini"))
+    config = os.environ.get('DB_CONFIG', os.path.join(script_dir, "database.ini"))
     db_info = parse_config(config)
     hostname = os.environ.get('DB_HOST') or db_info.get("host")
     database = os.environ.get('DB_DATABASE_NAME') or db_info.get("database")

diff --git a/config/database.ini b/config/database.ini
@@ -11,3 +11,8 @@ api_key_value=${API_KEY_VALUE}
 base_url=${BASE_URL}
 
 
+[redis]
+host=$REDIS_HOST
+port=$REDIS_PORT
+password=$REDIS_PASSWORD
+peptide_per_protein=$PEPTIDE_PER_PROTEIN
diff --git a/pyproject.toml.bak b/pyproject.toml.bak
diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@ def get_version(rel_path):
 
 setup(
     name="xi-mzidentml-converter",
-    version="0.1.21",
+    version="0.1.23",
     description="xi-mzidentml-converter uses pyteomics (https://pyteomics.readthedocs.io/en/latest/index.html) to parse mzIdentML files (v1.2.0) and extract crosslink information. Results are written to a relational database (PostgreSQL or SQLite) using sqlalchemy.",
     long_description_content_type="text/markdown",
     long_description=long_description,