From c487390de90d08d528a4582c8d17311fea76f098 Mon Sep 17 00:00:00 2001 From: Jesper Friis Date: Sun, 15 Dec 2024 15:54:01 +0100 Subject: [PATCH 1/6] Updated requirements --- requirements_dev.txt | 3 --- requirements_full.txt | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements_dev.txt b/requirements_dev.txt index 7b034e474..86d4ea91f 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -5,6 +5,3 @@ cmake==3.31.1 #setuptools==75.3.0; python_version>="3.9" setuptools==75.3.0 wheel==0.41.3 - -# Requirements for running tests -mongomock==4.2.0.post1 diff --git a/requirements_full.txt b/requirements_full.txt index a65808a7b..b41c8eec0 100644 --- a/requirements_full.txt +++ b/requirements_full.txt @@ -26,6 +26,9 @@ pydantic>=1.10.0,!=2.10.0,!=2.10.1,<2.10.2 typing_extensions>=4.1,<5; python_version<'3.9' fortran-language-server>=1.12.0,<1.13 +# Requirements for running tests +mongomock==4.2.0.post1 + # For TEM demo ##matplotlib>=3,<4 ##scikit-image>=0.19,<1 From f01e96fc698bcf116c4e7d77a4311ceaffe39c44 Mon Sep 17 00:00:00 2001 From: Jesper Friis Date: Mon, 16 Dec 2024 09:01:15 +0100 Subject: [PATCH 2/6] Updated tips and trics in the documentation --- doc/contributors_guide/tips_and_tricks.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/contributors_guide/tips_and_tricks.md b/doc/contributors_guide/tips_and_tricks.md index 971653f14..bec06f1f6 100644 --- a/doc/contributors_guide/tips_and_tricks.md +++ b/doc/contributors_guide/tips_and_tricks.md @@ -21,16 +21,15 @@ This can be done as follows: 2. Build the wheel - cd python - python setup.py bdist_wheel + cd dlite # root of source directory + pip wheel -w python/dist ./python 3. Install the wheel with pip in a newly created environment (the version numbers may differ for your case) - pip install dist/DLite_Python-0.5.22-cp311-cp311-linux_x86_64.whl + pip install python/dist/DLite_Python-0.5.26-cp311-cp311-linux_x86_64.whl 4. Finally, test by importing dlite in the standard manner - cd .. python >>> import dlite From 5b0770c1575ccf761f03bb0a39b9387210e5ce27 Mon Sep 17 00:00:00 2001 From: Jesper Friis Date: Mon, 16 Dec 2024 09:40:01 +0100 Subject: [PATCH 3/6] Updated dependencies --- requirements_dev.txt | 7 ++----- requirements_doc.txt | 4 ++-- requirements_full.txt | 3 +++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements_dev.txt b/requirements_dev.txt index 7b034e474..e7138a3c1 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,10 +1,7 @@ # Requirements building swig==4.3.0 -cmake==3.31.1 +cmake==3.31.2 #setuptools==67.5.0; python_version<"3.9" #setuptools==75.3.0; python_version>="3.9" setuptools==75.3.0 -wheel==0.41.3 - -# Requirements for running tests -mongomock==4.2.0.post1 +wheel==0.45.1 diff --git a/requirements_doc.txt b/requirements_doc.txt index 74b0f6ae5..e52dc0f69 100644 --- a/requirements_doc.txt +++ b/requirements_doc.txt @@ -4,9 +4,9 @@ breathe==4.35.0 docutils==0.21.2 lxml==5.3.0 myst-nb==1.1.2 -nbclient==0.10.0 +nbclient==0.10.1 Sphinx==7.4.7 -sphinx-autoapi==3.3.3 +sphinx-autoapi==3.4.0 sphinx-autobuild==2024.10.3 sphinx-book-theme==1.1.3 sphinx-copybutton==0.5.2 diff --git a/requirements_full.txt b/requirements_full.txt index a65808a7b..019e475fe 100644 --- a/requirements_full.txt +++ b/requirements_full.txt @@ -26,6 +26,9 @@ pydantic>=1.10.0,!=2.10.0,!=2.10.1,<2.10.2 typing_extensions>=4.1,<5; python_version<'3.9' fortran-language-server>=1.12.0,<1.13 +# Requirements for running tests +mongomock==4.3.0 + # For TEM demo ##matplotlib>=3,<4 ##scikit-image>=0.19,<1 From 7373c6f17ec1b9a38cee24a9e89d63920b30cc9e Mon Sep 17 00:00:00 2001 From: Jesper Friis Date: Sat, 11 Jan 2025 09:54:41 +0100 Subject: [PATCH 4/6] Fix doc as suggested by flb --- doc/contributors_guide/tips_and_tricks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributors_guide/tips_and_tricks.md b/doc/contributors_guide/tips_and_tricks.md index bec06f1f6..a76478c8f 100644 --- a/doc/contributors_guide/tips_and_tricks.md +++ b/doc/contributors_guide/tips_and_tricks.md @@ -17,11 +17,11 @@ This can be done as follows: python -m venv ~/.envs/testenv source ~/.envs/testenv/bin/activate pip install -U pip - pip install wheel -r requirements.txt 2. Build the wheel cd dlite # root of source directory + pip install wheel -r requirements.txt pip wheel -w python/dist ./python 3. Install the wheel with pip in a newly created environment (the version numbers may differ for your case) From bb712a1bc1e836f4c3b79c5c27beab7fc127a11f Mon Sep 17 00:00:00 2001 From: Jesper Friis Date: Sun, 12 Jan 2025 05:56:29 +0100 Subject: [PATCH 5/6] Update doc/contributors_guide/tips_and_tricks.md Co-authored-by: Francesca L. Bleken <48128015+francescalb@users.noreply.github.com> --- doc/contributors_guide/tips_and_tricks.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/contributors_guide/tips_and_tricks.md b/doc/contributors_guide/tips_and_tricks.md index a76478c8f..12c34d685 100644 --- a/doc/contributors_guide/tips_and_tricks.md +++ b/doc/contributors_guide/tips_and_tricks.md @@ -22,6 +22,7 @@ This can be done as follows: cd dlite # root of source directory pip install wheel -r requirements.txt + pip install wheel -r requirements.txt pip wheel -w python/dist ./python 3. Install the wheel with pip in a newly created environment (the version numbers may differ for your case) From 57a4ecb434c95c9ca2c15c0f2b83322c895405d2 Mon Sep 17 00:00:00 2001 From: Jesper Friis Date: Tue, 21 Jan 2025 01:28:26 +0100 Subject: [PATCH 6/6] Remove duplicated line --- doc/contributors_guide/tips_and_tricks.md | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/contributors_guide/tips_and_tricks.md b/doc/contributors_guide/tips_and_tricks.md index 12c34d685..a76478c8f 100644 --- a/doc/contributors_guide/tips_and_tricks.md +++ b/doc/contributors_guide/tips_and_tricks.md @@ -22,7 +22,6 @@ This can be done as follows: cd dlite # root of source directory pip install wheel -r requirements.txt - pip install wheel -r requirements.txt pip wheel -w python/dist ./python 3. Install the wheel with pip in a newly created environment (the version numbers may differ for your case)