From e1ed6737e53666dd1d2eb61387a0a8d17fa9f8fb Mon Sep 17 00:00:00 2001 From: SharanRP Date: Sun, 3 Mar 2024 23:42:36 +0530 Subject: [PATCH 1/6] issue fixed --- src/aiida/storage/psql_dos/utils.py | 4 +++- tests/cmdline/commands/test_setup.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/aiida/storage/psql_dos/utils.py b/src/aiida/storage/psql_dos/utils.py index 8fa50053b1..dfb5f97289 100644 --- a/src/aiida/storage/psql_dos/utils.py +++ b/src/aiida/storage/psql_dos/utils.py @@ -32,16 +32,18 @@ def create_sqlalchemy_engine(config: PsqlConfig): more info. """ from sqlalchemy import create_engine + from urllib.parse import quote_plus # The hostname may be `None`, which is a valid value in the case of peer authentication for example. In this case # it should be converted to an empty string, because otherwise the `None` will be converted to string literal "None" hostname = config['database_hostname'] or '' separator = ':' if config['database_port'] else '' + password = quote_plus(config['database_password']) engine_url = 'postgresql://{user}:{password}@{hostname}{separator}{port}/{name}'.format( separator=separator, user=config['database_username'], - password=config['database_password'], + password=password, hostname=hostname, port=config['database_port'], name=config['database_name'], diff --git a/tests/cmdline/commands/test_setup.py b/tests/cmdline/commands/test_setup.py index 613e77dbb6..6f5a693c6e 100644 --- a/tests/cmdline/commands/test_setup.py +++ b/tests/cmdline/commands/test_setup.py @@ -207,7 +207,7 @@ def test_setup(self): postgres.determine_setup() db_name = 'aiida_test_setup' db_user = 'aiida_test_setup' - db_pass = 'aiida_test_setup' + db_pass = '@aiida_test_setup' postgres.create_dbuser(db_user, db_pass) postgres.create_db(db_user, db_name) From b89dec936dfb2984b4c1499d056eec62462c3436 Mon Sep 17 00:00:00 2001 From: SharanRP Date: Tue, 5 Mar 2024 22:36:03 +0530 Subject: [PATCH 2/6] logo updated --- docs/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 8f527ca8be..7c525a5f56 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -146,7 +146,7 @@ { 'name': 'Twitter', 'url': 'https://www.twitter.com/aiidateam', - 'icon': 'fa-brands fa-twitter-square', + 'icon': 'fa-brands fa-square-x-twitter', 'type': 'fontawesome', }, ], From c51cdabd4dbbe0d61967dd52fd467d45893f3adf Mon Sep 17 00:00:00 2001 From: Sharan poojari <136159249+SharanRP@users.noreply.github.com> Date: Tue, 5 Mar 2024 22:49:22 +0530 Subject: [PATCH 3/6] Update utils.py --- src/aiida/storage/psql_dos/utils.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/aiida/storage/psql_dos/utils.py b/src/aiida/storage/psql_dos/utils.py index f400e751e1..b8c9f6e4be 100644 --- a/src/aiida/storage/psql_dos/utils.py +++ b/src/aiida/storage/psql_dos/utils.py @@ -33,8 +33,7 @@ def create_sqlalchemy_engine(config: PsqlConfig): """ from urllib.parse import quote_plus - from sqlalchemy import create_engine - from urllib.parse import quote_plus + from sqlalchemy import create_engines # The hostname may be `None`, which is a valid value in the case of peer authentication for example. In this case # it should be converted to an empty string, because otherwise the `None` will be converted to string literal "None" From 26dd544e2ecdaf2f6897f059624af92479ae7844 Mon Sep 17 00:00:00 2001 From: SharanRP Date: Tue, 5 Mar 2024 22:51:10 +0530 Subject: [PATCH 4/6] logo updated --- src/aiida/storage/psql_dos/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/aiida/storage/psql_dos/utils.py b/src/aiida/storage/psql_dos/utils.py index dfb5f97289..f1bf0aa4dd 100644 --- a/src/aiida/storage/psql_dos/utils.py +++ b/src/aiida/storage/psql_dos/utils.py @@ -31,9 +31,10 @@ def create_sqlalchemy_engine(config: PsqlConfig): See https://docs.sqlalchemy.org/en/13/core/engines.html?highlight=create_engine#sqlalchemy.create_engine for more info. """ - from sqlalchemy import create_engine from urllib.parse import quote_plus + from sqlalchemy import create_engine + # The hostname may be `None`, which is a valid value in the case of peer authentication for example. In this case # it should be converted to an empty string, because otherwise the `None` will be converted to string literal "None" hostname = config['database_hostname'] or '' From 698fc110eaa6f44ccc3a837baf69d72d6660fb4a Mon Sep 17 00:00:00 2001 From: Sharan poojari <136159249+SharanRP@users.noreply.github.com> Date: Tue, 5 Mar 2024 22:52:15 +0530 Subject: [PATCH 5/6] Update utils.py --- src/aiida/storage/psql_dos/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aiida/storage/psql_dos/utils.py b/src/aiida/storage/psql_dos/utils.py index b8c9f6e4be..f1bf0aa4dd 100644 --- a/src/aiida/storage/psql_dos/utils.py +++ b/src/aiida/storage/psql_dos/utils.py @@ -33,7 +33,7 @@ def create_sqlalchemy_engine(config: PsqlConfig): """ from urllib.parse import quote_plus - from sqlalchemy import create_engines + from sqlalchemy import create_engine # The hostname may be `None`, which is a valid value in the case of peer authentication for example. In this case # it should be converted to an empty string, because otherwise the `None` will be converted to string literal "None" From c97f623ccdba76de34b4219516e4b95d2aa32a1f Mon Sep 17 00:00:00 2001 From: SharanRP Date: Wed, 6 Mar 2024 09:28:11 +0530 Subject: [PATCH 6/6] version updated --- pyproject.toml | 2 +- requirements/requirements-py-3.10.txt | 2 +- requirements/requirements-py-3.11.txt | 2 +- requirements/requirements-py-3.12.txt | 2 +- requirements/requirements-py-3.9.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 51a8ebbb8e..2982a26cae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -191,7 +191,7 @@ bpython = [ 'bpython~=0.18.0' ] docs = [ - 'pydata-sphinx-theme~=0.13.3', + 'pydata-sphinx-theme~=0.15.1', 'sphinx~=7.2', 'sphinx-copybutton~=0.5.0', 'sphinx-design~=0.5.0', diff --git a/requirements/requirements-py-3.10.txt b/requirements/requirements-py-3.10.txt index fed50236ae..e9c9e0a079 100644 --- a/requirements/requirements-py-3.10.txt +++ b/requirements/requirements-py-3.10.txt @@ -133,7 +133,7 @@ pybtex==0.24.0 pycifrw==4.4.5 pycparser==2.21 pydantic==2.4.0 -pydata-sphinx-theme==0.13.3 +pydata-sphinx-theme==0.15.1 pygments==2.15.1 pymatgen==2023.9.25 pympler==1.0.1 diff --git a/requirements/requirements-py-3.11.txt b/requirements/requirements-py-3.11.txt index b6402242f7..183e5181b9 100644 --- a/requirements/requirements-py-3.11.txt +++ b/requirements/requirements-py-3.11.txt @@ -132,7 +132,7 @@ pybtex==0.24.0 pycifrw==4.4.5 pycparser==2.21 pydantic==2.4.0 -pydata-sphinx-theme==0.13.3 +pydata-sphinx-theme==0.15.1 pygments==2.15.1 pymatgen==2023.9.25 pympler==1.0.1 diff --git a/requirements/requirements-py-3.12.txt b/requirements/requirements-py-3.12.txt index 4e634d5a09..71786d7003 100644 --- a/requirements/requirements-py-3.12.txt +++ b/requirements/requirements-py-3.12.txt @@ -130,7 +130,7 @@ pybtex==0.24.0 pycifrw==4.4.5 pycparser==2.21 pydantic==2.4.0 -pydata-sphinx-theme==0.13.3 +pydata-sphinx-theme==0.15.1 pygments==2.16.1 pymatgen==2023.10.11 pympler==1.0.1 diff --git a/requirements/requirements-py-3.9.txt b/requirements/requirements-py-3.9.txt index 2d77497e31..214a70f8d9 100644 --- a/requirements/requirements-py-3.9.txt +++ b/requirements/requirements-py-3.9.txt @@ -135,7 +135,7 @@ pybtex==0.24.0 pycifrw==4.4.5 pycparser==2.21 pydantic==2.4.0 -pydata-sphinx-theme==0.13.3 +pydata-sphinx-theme==0.15.1 pygments==2.15.1 pymatgen==2023.9.25 pympler==1.0.1