From 394da36f1b612392d6596e11fff67e64282423a8 Mon Sep 17 00:00:00 2001 From: nisar Date: Thu, 4 Sep 2025 10:50:37 -0400 Subject: [PATCH 1/8] moved ruff>=0.4.0 from requirements.txt to requirements-dev.txt --- requirements-dev.txt | 1 + requirements.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index dabff92..675adeb 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,6 @@ codecov coveralls +ruff>=0.4.0 flake8 pytest pytest-flake8 diff --git a/requirements.txt b/requirements.txt index a6b1da2..b26e81f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ numpy -ruff>=0.4.0 + From 361a381cb630dd9f4c8450cf5a0716f37728eed7 Mon Sep 17 00:00:00 2001 From: nisar Date: Thu, 4 Sep 2025 10:58:12 -0400 Subject: [PATCH 2/8] removed obsolete packages flake8 and pytest-flake8 from requirements-dev.txt --- requirements-dev.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 675adeb..dec9bd8 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,8 +1,6 @@ codecov coveralls ruff>=0.4.0 -flake8 pytest -pytest-flake8 sphinx sphinx-bootstrap-theme From d475268c3624676a4c735e9f0547217f910f2fee Mon Sep 17 00:00:00 2001 From: nisar Date: Thu, 4 Sep 2025 11:17:49 -0400 Subject: [PATCH 3/8] deleted: requirements.txt, since the only entry 'numpy' is added to pyproject.toml --- requirements.txt | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index b26e81f..0000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -numpy - From e5e7aa6b36ddfbeb1d55e066ceb92a50546241a5 Mon Sep 17 00:00:00 2001 From: nisar Date: Thu, 4 Sep 2025 11:37:48 -0400 Subject: [PATCH 4/8] reinstate requirements.txt, since setup.py depend on this and will break the code compilation --- requirements.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..24ce15a --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +numpy From 429b762abd86abd9c930c103220f3874e9422904 Mon Sep 17 00:00:00 2001 From: nisar Date: Thu, 4 Sep 2025 15:53:25 -0400 Subject: [PATCH 5/8] The following is removed fron setup.cfg sice it is a legacy entry and is no longer necessary. [egg_info] tag_build = tag_svn_revision = 1 --- setup.cfg | 4 ---- 1 file changed, 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index 970f7bc..bc44d11 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,3 @@ -[egg_info] -tag_build = -tag_svn_revision = 1 - [tool:pytest] [build_sphinx] From c23eeacb2f1eacb5294e3dc6656872cd50f37359 Mon Sep 17 00:00:00 2001 From: nisar Date: Thu, 4 Sep 2025 16:01:15 -0400 Subject: [PATCH 6/8] Moved [tool:pytest] from setup.cfg to pyproject.toml --- pyproject.toml | 1 + setup.cfg | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c058f1c..6c65d6e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,3 +15,4 @@ exclude = [ "csxtools.egg-info", "__pycache__" ] +[tool:pytest] \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index bc44d11..f0efd8d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,3 @@ -[tool:pytest] - [build_sphinx] source-dir = doc/ build-dir = doc/_build From c1256ea44179117312a9bd93b390414a85911e55 Mon Sep 17 00:00:00 2001 From: nisar Date: Thu, 4 Sep 2025 16:09:12 -0400 Subject: [PATCH 7/8] pyproject.toml: [tool:pytest] modified to [tool.pytest.ini_options] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6c65d6e..1910e78 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,4 +15,4 @@ exclude = [ "csxtools.egg-info", "__pycache__" ] -[tool:pytest] \ No newline at end of file +[tool.pytest.ini_options] \ No newline at end of file From 3d2dc2db134f72cd56ac089c3830eb0df1577309 Mon Sep 17 00:00:00 2001 From: nisar Date: Thu, 4 Sep 2025 16:13:39 -0400 Subject: [PATCH 8/8] from setup.cfg following is removed: [versioneer] VCS = "git" style = "pep440" versionfile_source = "csxtools/_version.py" versionfile_build = "csxtools/_version.py" tag_prefix = "v" and following is added to pyproject.toml [tool.versioneer] VCS = "git" style = "pep440" versionfile_source = "csxtools/_version.py" versionfile_build = "csxtools/_version.py" tag_prefix = "v" parentdir_prefix = "csxtools-" --- pyproject.toml | 11 ++++++++++- setup.cfg | 7 +------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1910e78..a09f6f7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,4 +15,13 @@ exclude = [ "csxtools.egg-info", "__pycache__" ] -[tool.pytest.ini_options] \ No newline at end of file + +[tool.pytest.ini_options] + +[tool.versioneer] +VCS = "git" +style = "pep440" +versionfile_source = "csxtools/_version.py" +versionfile_build = "csxtools/_version.py" +tag_prefix = "v" +parentdir_prefix = "csxtools-" \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index f0efd8d..e97499c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,9 +6,4 @@ all_files = 1 [upload_sphinx] upload-dir = doc/_build/html -[versioneer] -VCS = git -style = pep440 -versionfile_source = csxtools/_version.py -versionfile_build = csxtools/_version.py -tag_prefix = v +