From bd40bc337238aaa7f3af5c29777ace1ebf2a4bb7 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Tue, 19 Nov 2024 08:04:02 -0500 Subject: [PATCH 1/3] Reset conda, pip install requirements --- requirements/conda.txt | 5 +++++ requirements/pip.txt | 5 +++++ requirements/run-ext.txt | 1 - requirements/run.txt | 3 --- 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 requirements/conda.txt delete mode 100644 requirements/run-ext.txt delete mode 100644 requirements/run.txt diff --git a/requirements/conda.txt b/requirements/conda.txt new file mode 100644 index 00000000..92c40e18 --- /dev/null +++ b/requirements/conda.txt @@ -0,0 +1,5 @@ +scipy +numpy +matplotlib-base +diffpy.structure +pyobjcryst \ No newline at end of file diff --git a/requirements/pip.txt b/requirements/pip.txt index e69de29b..084dd842 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -0,0 +1,5 @@ +scipy +numpy +matplotlib +diffpy.structure +pyobjcryst \ No newline at end of file diff --git a/requirements/run-ext.txt b/requirements/run-ext.txt deleted file mode 100644 index 9cc306b0..00000000 --- a/requirements/run-ext.txt +++ /dev/null @@ -1 +0,0 @@ -diffpy.structure diff --git a/requirements/run.txt b/requirements/run.txt deleted file mode 100644 index 59149ac8..00000000 --- a/requirements/run.txt +++ /dev/null @@ -1,3 +0,0 @@ -scipy -numpy -matplotlib From df55434af0bf11a45d4a0a61f83acd3e43583ea7 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Tue, 19 Nov 2024 08:04:11 -0500 Subject: [PATCH 2/3] Add pip install --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index fe07f87d..d1cba809 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,7 +49,7 @@ exclude = [] # exclude packages matching these glob patterns (empty by default) namespaces = false # to disable scanning PEP 420 namespaces (true by default) [tool.setuptools.dynamic] -dependencies = {file = ["requirements/run.txt"]} +dependencies = {file = ["requirements/pip.txt"]} [tool.black] line-length = 115 From 8aed13aa1c6a7f2100ee55f95e7fa5acd398d5ef Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 13:10:14 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit hooks --- requirements/conda.txt | 2 +- requirements/pip.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/conda.txt b/requirements/conda.txt index 92c40e18..fc26856d 100644 --- a/requirements/conda.txt +++ b/requirements/conda.txt @@ -2,4 +2,4 @@ scipy numpy matplotlib-base diffpy.structure -pyobjcryst \ No newline at end of file +pyobjcryst diff --git a/requirements/pip.txt b/requirements/pip.txt index 084dd842..3a147642 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -2,4 +2,4 @@ scipy numpy matplotlib diffpy.structure -pyobjcryst \ No newline at end of file +pyobjcryst