From febd25dc416d24829d8744bb7be56bbb17b4aac1 Mon Sep 17 00:00:00 2001 From: sureshhewa Date: Fri, 5 Apr 2024 09:57:58 +0100 Subject: [PATCH 1/3] version release --- config/config_parser.py | 2 +- pyproject.toml.bak | 36 ------------------------------------ setup.py | 2 +- 3 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 pyproject.toml.bak diff --git a/config/config_parser.py b/config/config_parser.py index 18eaa10..ef98564 100644 --- 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/pyproject.toml.bak b/pyproject.toml.bak deleted file mode 100644 index e6cc1ea..0000000 --- a/pyproject.toml.bak +++ /dev/null @@ -1,36 +0,0 @@ -[project] -name = "xi-mzidentml-converter" -version = "0.1.2" -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." -readme = "README.md" -dependencies = [ -'python >= 3.10', -'fastapi>=0.68.0,<0.69.0', -'uvicorn<=0.16.0,>=0.15.0', -'lxml>=4.9.1', -'numpy>=1.14.3', -'pandas>=0.21.0', -'pymzml>=0.7.8', -'pyteomics>=3.4.2', -'requests>=2.20.1', -'urllib3>=1.24.2', -'pytest', -'psycopg2-binary', -'sqlalchemy==2.0.21', -'sqlalchemy-utils', -'obonet', -'python-multipart', -'python-jose', -'passlib', -'jose' - ] - -[build-system] -requires = ["setuptools>=61.0", "wheel"] -build-backend = "setuptools.build_meta" - -[project.scripts] -process = "process:main" - -[tool.setuptools.packages] -find = {} \ No newline at end of file diff --git a/setup.py b/setup.py index 78b46b2..146e9aa 100644 --- 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.22", 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, From 8310e5edb85d2b8aab57072423382ca7bcc380af Mon Sep 17 00:00:00 2001 From: sureshhewa Date: Fri, 5 Apr 2024 11:13:18 +0100 Subject: [PATCH 2/3] add redis config --- config/database.ini | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/database.ini b/config/database.ini index 2c7c5f0..1a504cc 100644 --- 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 \ No newline at end of file From 10ab85c5afd9158ef3e5acd53b7cc94e5249fcc4 Mon Sep 17 00:00:00 2001 From: sureshhewa Date: Mon, 8 Apr 2024 13:24:25 +0100 Subject: [PATCH 3/3] release 0.1.23v --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 146e9aa..9938371 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ def get_version(rel_path): setup( name="xi-mzidentml-converter", - version="0.1.22", + 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,