update readme and pyproject

Author: skbill84

.github/workflows/build_wheels.yml

@@ -57,14 +57,14 @@ jobs:
       id: production
       if: startsWith(github.ref, 'refs/tags/v')
       run: |
-        echo 'OSES=["ubuntu-latest", "macos-latest", "windows-latest"]' >> $GITHUB_OUTPUT
+        echo 'OSES=["ubuntu-latest", "macos-latest"]' >> $GITHUB_OUTPUT
         echo 'CIBW_ARCHS_LINUX="auto aarch64"' >> $GITHUB_OUTPUT
 
   build_wheels:
     needs: [generate_matrix]
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    if: github.event_name == 'pull_request' || github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')
+    if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')
     strategy:
       matrix:
         os: ${{ fromJson(needs.generate_matrix.outputs.OSES) }}
@@ -81,7 +81,7 @@ jobs:
           platforms: all
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.0
+        uses: pypa/cibuildwheel@v2.17.0
         env:
           CIBW_ARCHS_MACOS: "x86_64 arm64"
           CIBW_ARCHS_LINUX: ${{ fromJson(needs.generate_matrix.outputs.CIBW_ARCHS_LINUX) }}
@@ -92,7 +92,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-${{ matrix.os }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
@@ -109,8 +109,8 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: wheels
-          path: dist/*.tar.gz
+          name: sdist
+          path: ./dist/*.tar.gz
 
   upload_pypi:
     needs: [build_wheels, build_sdist]
@@ -122,10 +122,21 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          # unpacks default artifact into dist/
-          # if `name: artifact` is omitted, the action will create extra parent dir
-          name: wheels
-          path: dist
+          name: wheels-*
+          path: dist/wheels
+          merge-multiple: true
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: sdist
+          path: dist/sdist
+
+      - name: Combine artifacts for PyPI upload
+        run: |
+          mkdir -p combined_dist
+          mv dist/wheels/* combined_dist/
+          mv dist/sdist/* combined_dist/
+          rm -rf dist/wheels dist/sdist
 
       - uses: pypa/[email protected]
         with:

README.md

@@ -87,17 +87,13 @@ for k, col in zip(unique_labels, colors):
     if k == -1:
         # Black used for noise.
         col = [0, 0, 0, 1]
-
     class_member_mask = (labels == k)
-
     xy = X[class_member_mask & core_samples_mask]
     plt.plot(xy[:, 0], xy[:, 1], 'o', markerfacecolor=tuple(col),
              markeredgecolor='k', markersize=14)
-
     xy = X[class_member_mask & ~core_samples_mask]
     plt.plot(xy[:, 0], xy[:, 1], 'o', markerfacecolor=tuple(col),
              markeredgecolor='k', markersize=6)
-
 plt.title('Estimated number of clusters: %d' % n_clusters_)
 plt.show()
 ```

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "dbscan"
 authors = [
-    {name = "Yiqiu Wang", email = "yiqiu_wang@icloud.com"}
+    {name = "Yiqiu Wang", email = "yiqiuwang.work@gmail.com"}
 ]
 maintainers = [
     {name = "Anirudh Vegesana", email = "[email protected]"}
@@ -11,24 +11,32 @@ readme = "README.md"
 keywords = ['cluster', 'clustering', 'density', 'dbscan']
 license = {text = "MIT"}
 classifiers = [
-    'Development Status :: 2 - Pre-Alpha',
+    'Development Status :: 4 - Beta',
     'Intended Audience :: Science/Research',
     'Intended Audience :: Developers',
     "License :: OSI Approved :: MIT License",
     'Programming Language :: C++',
-    'Programming Language :: Python :: 3',
+    'Programming Language :: Python :: 3.9',
+    'Programming Language :: Python :: 3.10',
+    'Programming Language :: Python :: 3.11',
+    'Programming Language :: Python :: 3.12',
+    "Operating System :: POSIX :: Linux",
+    "Operating System :: MacOS",
     'Topic :: Software Development',
     'Topic :: Scientific/Engineering',
 ]
 
-dynamic = ["version", "dependencies", "requires-python"]
+dynamic = ["version"]
 
-[project.optional-dependencies]
-scikit-learn = [
-    "scikit-learn"
+dependencies = [
+    "numpy>=2.0.0",
+    "scikit-learn>=1.0",
 ]
+
+requires-python = ">=3.9,<4.0" # Aligns with CIBW_BUILD and NumPy 2.0 support
+
+[project.optional-dependencies]
 example = [
-    "scikit-learn",
     "matplotlib"
 ]
 
@@ -37,8 +45,7 @@ homepage = "https://sites.google.com/view/yiqiuwang/dbscan"
 repository = "https://github.com/wangyiqiu/dbscan-python"
 
 [build-system]
-requires = ["setuptools", "setuptools_scm", "wheel", "numpy>=2.0.0"]
-backend = "setuptools.build_meta"
+requires = ["setuptools>=61", "setuptools_scm>=7", "wheel", "numpy>=2.0.0"]
 
 [tool.setuptools_scm]
 write_to = "pythonmodule/_version.py"