From bf58b526d84d0f9815076b29fdcb1d7478d5c44a Mon Sep 17 00:00:00 2001 From: Zhi Ming Xu Date: Thu, 13 Nov 2025 12:57:56 -0500 Subject: [PATCH 1/4] chore: remove confutils pip install in ci now that its on cf --- .github/workflows/matrix-and-codecov-on-merge-to-main.yml | 2 -- .github/workflows/tests-on-pr.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml index c2bf183..9556c23 100644 --- a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml +++ b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml @@ -17,8 +17,6 @@ jobs: project: diffpy.srxplanar c_extension: false headless: false - run: | - pip install diffpy.srxconfutils secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/tests-on-pr.yml b/.github/workflows/tests-on-pr.yml index ff1914c..f55914f 100644 --- a/.github/workflows/tests-on-pr.yml +++ b/.github/workflows/tests-on-pr.yml @@ -12,7 +12,5 @@ jobs: c_extension: false headless: false python_version: 3.13 - run: | - pip install diffpy.srxconfutils secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} From 5bde25644c3b5c4602a226734a2f2c3171fd4761 Mon Sep 17 00:00:00 2001 From: Zhi Ming Xu Date: Thu, 13 Nov 2025 13:03:24 -0500 Subject: [PATCH 2/4] chore: match pyproject entry point for srxplanar with readme --- README.rst | 4 ++++ pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 35c983d..71bdb67 100644 --- a/README.rst +++ b/README.rst @@ -77,6 +77,10 @@ The following creates and activates a new environment named ``diffpy.srxplanar_e conda create -n diffpy.srxplanar_env diffpy.srxplanar conda activate diffpy.srxplanar_env +To confirm that the installation was successful, type :: + + python -c "import diffpy.srxplanar; print(diffpy.srxplanar.__version__)" + The output should print the latest version displayed on the badges above. If the above does not work, you can use ``pip`` to download and install the latest release from diff --git a/pyproject.toml b/pyproject.toml index 759efc0..70aa196 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) [project.scripts] -diffpy-srxplanar = "diffpy.srxplanar.srxplanar_app:main" +diffpy.srxplanar = "diffpy.srxplanar.srxplanar_app:main" [tool.setuptools.dynamic] dependencies = {file = ["requirements/pip.txt"]} From b28122e3db303134ce56795b9d591284e74fa3e2 Mon Sep 17 00:00:00 2001 From: Zhi Ming Xu Date: Thu, 13 Nov 2025 13:04:17 -0500 Subject: [PATCH 3/4] skpkg: add news file --- news/remove-pip.rst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 news/remove-pip.rst diff --git a/news/remove-pip.rst b/news/remove-pip.rst new file mode 100644 index 0000000..0540f5e --- /dev/null +++ b/news/remove-pip.rst @@ -0,0 +1,23 @@ +**Added:** + +* No news added: Remove confutils from pip install in ci. + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* + +**Security:** + +* From 161debe9bdf03a359dd3b8489321093463c58871 Mon Sep 17 00:00:00 2001 From: Zhi Ming Xu Date: Thu, 13 Nov 2025 13:09:28 -0500 Subject: [PATCH 4/4] chore: change back to diffpy-srxplanar --- README.rst | 4 ++-- pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 71bdb67..ab250a9 100644 --- a/README.rst +++ b/README.rst @@ -97,7 +97,7 @@ and run the following :: This package also provides command-line utilities. To check the software has been installed correctly, type :: - diffpy.srxplanar --version + diffpy-srxplanar --version You can also type the following command to verify the installation. :: @@ -106,7 +106,7 @@ You can also type the following command to verify the installation. :: To view the basic usage and available commands, type :: - diffpy.srxplanar -h + diffpy-srxplanar -h Getting Started --------------- diff --git a/pyproject.toml b/pyproject.toml index 70aa196..759efc0 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) [project.scripts] -diffpy.srxplanar = "diffpy.srxplanar.srxplanar_app:main" +diffpy-srxplanar = "diffpy.srxplanar.srxplanar_app:main" [tool.setuptools.dynamic] dependencies = {file = ["requirements/pip.txt"]}