chore: Merged with geometric-smote repo

georgedouzas · Oct 26, 2024 · f7df642 · f7df642
1 parent 1516061
commit f7df642
Show file tree

Hide file tree

Showing 51 changed files with 4,158 additions and 134 deletions.
diff --git a/.copier-answers.yml b/.copier-answers.yml
@@ -1,18 +1,16 @@
-_commit: 0.8.0
-_src_path: gh:georgedouzas/copier-pdm-nox.git
+_commit: 0.8.2
+_src_path: gh:georgedouzas/copier-pdm-nox
 author_email: gdouzas@icloud.com
 author_fullname: Georgios Douzas
 author_username: georgedouzas
-copyright_date: '2019'
+copyright_date: '2021'
 copyright_holder: Georgios Douzas
 copyright_holder_email: gdouzas@icloud.com
 copyright_license: MIT License
-project_description: Implementation of the Geometric SMOTE algorithm, a geometrically
-    enhanced drop-in replacement for SMOTE. It is compatible with scikit-learn and
-    imbalanced-learn.
-python_package_distribution_name: geometric-smote
-python_package_import_name: gsmote
-python_versions: '>=3.9, <3.12'
-repository_name: geometric-smote
+project_description: An implementation of novel oversampling algorithms.
+python_package_distribution_name: imbalanced-learn-extra
+python_package_import_name: imblearn_extra
+python_versions: '>=3.10, <3.13'
+repository_name: imbalanced-learn-extra
 repository_namespace: georgedouzas
 
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -7,7 +7,7 @@ body:
   attributes:
     value: >
       **Before submitting a bug, please make sure the issue hasn't been already addressed by searching
-      through [the past issues](https://github.com/georgedouzas/geometric-smote/issues).**
+      through [the past issues](https://github.com/georgedouzas/imbalanced-learn-extra/issues).**
 - type: textarea
   attributes:
     label: Describe the bug
@@ -52,7 +52,7 @@ body:
     description: |
       Please provide the following information.
     placeholder: >
-      `geometric-smote` version
+      `imbalanced-learn-extra` version
       Python version
       OS
   validations:

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,11 +1,11 @@
 blank_issues_enabled: true
 contact_links:
   - name: Discussions
-    url: https://github.com/georgedouzas/geometric-smote/discussions
+    url: https://github.com/georgedouzas/imbalanced-learn-extra/discussions
     about: Ask questions and discuss with other community members
   - name: Gitter
-    url: https://gitter.im/geometric-smote/community
+    url: https://gitter.im/imbalanced-learn-extra/community
     about: Users and developers can sometimes be found on the gitter channel
   - name: Blank issue
-    url: https://github.com/georgedouzas/geometric-smote/issues/new
+    url: https://github.com/georgedouzas/imbalanced-learn-extra/issues/new
     about: Please note that Github Discussions should be used in most cases instead
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,7 +4,7 @@
 
 Please check the following:
 
-- [ ] You have checked the [Pull Request guidelines](https://github.com/georgedouzas/geometric-smote/blob/master/.github/CONTRIBUTING.md).
+- [ ] You have checked the [Pull Request guidelines](https://github.com/georgedouzas/imbalanced-learn-extra/blob/master/.github/CONTRIBUTING.md).
 - [ ] Tests for bug fixes or new features have been added.
 - [ ] Docs have been added or updated.
 

diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml
@@ -15,7 +15,6 @@ jobs:
         os:
         - ubuntu-latest
         - macos-latest
-        - windows-latest
 
     runs-on: ${{ matrix.os }}
 
@@ -29,7 +28,7 @@ jobs:
         python-version: |
             3.10
             3.11
-            
+            3.12
 
     - name: Set up PDM
       uses: pdm-project/setup-pdm@v3
@@ -56,7 +55,6 @@ jobs:
         os:
         - ubuntu-latest
         - macos-latest
-        - windows-latest
 
     runs-on: ${{ matrix.os }}
 
@@ -70,7 +68,7 @@ jobs:
         python-version: |
             3.10
             3.11
-            
+            3.12
 
     - name: Set up PDM
       uses: pdm-project/setup-pdm@v3
@@ -90,7 +88,7 @@ jobs:
 
     strategy:
       matrix:
-          python-version: ['3.10', '3.11']
+          python-version: ['3.10', '3.11', '3.12']
 
     steps:
     - name: Checkout

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,6 @@ jobs:
         os:
         - ubuntu-latest
         - macos-latest
-        - windows-latest
 
     runs-on: ${{ matrix.os }}
 
@@ -28,6 +27,7 @@ jobs:
         python-version: |
             3.10
             3.11
+            3.12
             
     - name: Set up PDM
       uses: pdm-project/setup-pdm@v3
@@ -54,7 +54,6 @@ jobs:
         os:
         - ubuntu-latest
         - macos-latest
-        - windows-latest
 
     runs-on: ${{ matrix.os }}
 
@@ -68,6 +67,7 @@ jobs:
         python-version: |
             3.10
             3.11
+            3.12
             
     - name: Set up PDM
       uses: pdm-project/setup-pdm@v3

diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,4 @@ __pypackages__/
 .ruff_cache
 .vscode
 .DS_Store
+.tool-versions
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,45 +6,107 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 <!-- insertion marker -->
-## [0.2.3](https://github.com/georgedouzas/geometric-smote/releases/tag/0.2.3) - 2023-12-02
+## [0.7.0](https://github.com/georgedouzas/imbalanced-learn-extra/releases/tag/0.7.0) - 2024-06-28
 
-<small>[Compare with 0.2.2](https://github.com/georgedouzas/geometric-smote/compare/0.2.2...0.2.3)</small>
+<small>[Compare with 0.6.0](https://github.com/georgedouzas/imbalanced-learn-extra/compare/0.6.0...0.7.0)</small>
+
+### Features
+
+- Merge `geometric-smote` and `cluster-over-sampling` projects ([37ea792](https://github.com/georgedouzas/imbalanced-learn-extra/commit/37ea792249d8bc33c50b662f97d41f3ba00711c7) by georgedouzas).
 
 ### Docs
 
-- Fix scikit-learn link ([26d9c99](https://github.com/georgedouzas/geometric-smote/commit/26d9c993102677e55d134bb8eabce022188b283a) by georgedouzas).
+- Split long docstrings ([d54699c](https://github.com/georgedouzas/imbalanced-learn-extra/commit/d54699cecd6a4c7c96b339a1ab23883dbb7e727f) by georgedouzas).
+- Modify expression ([7237221](https://github.com/georgedouzas/imbalanced-learn-extra/commit/7237221689d64a36526ea344e053c68adfff0dd0) by georgedouzas).
+
+### Chore
+
+- Update copier template ([9b9ae8c](https://github.com/georgedouzas/imbalanced-learn-extra/commit/9b9ae8cc8b824a84b6134c94cb1365dd532242d1) by georgedouzas).
+
+## [0.6.0](https://github.com/georgedouzas/imbalanced-learn-extra/releases/tag/0.6.0) - 2023-10-02
 
-## [0.2.2](https://github.com/georgedouzas/geometric-smote/releases/tag/0.2.2) - 2023-12-02
+<small>[Compare with 0.5.1](https://github.com/georgedouzas/imbalanced-learn-extra/compare/0.5.1...0.6.0)</small>
 
-<small>[Compare with 0.2.1](https://github.com/georgedouzas/geometric-smote/compare/0.2.1...0.2.2)</small>
+### Features
+
+- Include SOM in `clusterer` module ([4c6a8af](https://github.com/georgedouzas/imbalanced-learn-extra/commit/4c6a8af3fd89ee272487fdb807fb9347f0fcb55c) by georgedouzas).
 
 ### Docs
 
-- Fix typo ([84f4738](https://github.com/georgedouzas/geometric-smote/commit/84f4738bcf3d28b342c7d7ddd07e0d32856d25e3) by georgedouzas).
+- Remove geometric-smote as optional dependency ([24968c2](https://github.com/georgedouzas/imbalanced-learn-extra/commit/24968c272f11cec3ffe5551c028a99c6e0cd14bc) by georgedouzas).
+- Silence warning for initialization ([ed4fed2](https://github.com/georgedouzas/imbalanced-learn-extra/commit/ed4fed22c5ff6b8c30e66a57806bb8468362380f) by georgedouzas).
+
+### Tests
+
+- Update tests and fix bugs ([e81c837](https://github.com/georgedouzas/imbalanced-learn-extra/commit/e81c837738f34bd326bf35de003e561cc3466146) by georgedouzas).
 
 ### Chore
 
-- Release 0.2.2 ([7aa8d9c](https://github.com/georgedouzas/geometric-smote/commit/7aa8d9c94372b83195b79ba357a21d74ec1aa1a6) by georgedouzas).
+- Release 0.6.0 ([a5040dc](https://github.com/georgedouzas/imbalanced-learn-extra/commit/a5040dc5db70c2eabf939de435b4130330d0724e) by georgedouzas).
+- Ignore PDM local config file ([ed0cca2](https://github.com/georgedouzas/imbalanced-learn-extra/commit/ed0cca2d4f8adc50119bb205071443a67c52d75b) by georgedouzas).
+- Install conda to tests jobs ([02fce3d](https://github.com/georgedouzas/imbalanced-learn-extra/commit/02fce3ddba653ef0d8bfbc57233012cf95168de1) by georgedouzas).
+- Update copier template ([5680a3e](https://github.com/georgedouzas/imbalanced-learn-extra/commit/5680a3e41a075a2101ec4570b8d2416a6709d332) by georgedouzas).
+- Use conda backend ([1253427](https://github.com/georgedouzas/imbalanced-learn-extra/commit/12534274eb82abe9ade5f3a60a946114125c7489) by georgedouzas).
+
+## [0.5.1](https://github.com/georgedouzas/imbalanced-learn-extra/releases/tag/0.5.1) - 2023-04-13
+
+<small>[Compare with 0.4.0](https://github.com/georgedouzas/imbalanced-learn-extra/compare/0.4.0...0.5.1)</small>
+
+### Features
+
+- Restructure project using copier template ([57293ae](https://github.com/georgedouzas/imbalanced-learn-extra/commit/57293aee12332ae0ca7f8b8f862e8b143d11bed6) by georgedouzas).
+
+### Docs
+
+- Update changelog for version 0.5.0 ([375e79e](https://github.com/georgedouzas/imbalanced-learn-extra/commit/375e79e3bbc95d175f68d8a4ac1e79e628aaaeeb) by georgedouzas).
+- Fix example ([438d6a5](https://github.com/georgedouzas/imbalanced-learn-extra/commit/438d6a579d8bc9d175e1fc5656fe38acc4868253) by georgedouzas).
+
+### Style
 
-## [0.2.1](https://github.com/georgedouzas/geometric-smote/releases/tag/0.2.1) - 2023-12-02
+- Add a blank line after docstring ([ce7524d](https://github.com/georgedouzas/imbalanced-learn-extra/commit/ce7524d5db989c672c7e2994ce33b8a18847c20f) by georgedouzas).
 
-<small>[Compare with 0.2.0](https://github.com/georgedouzas/geometric-smote/compare/0.2.0...0.2.1)</small>
+### Code Refactoring
+
+- Add stack level for warning ([c5925db](https://github.com/georgedouzas/imbalanced-learn-extra/commit/c5925db18cdff1a45852bd0851b2a567daa481a1) by georgedouzas).
 
 ### Chore
 
-- Release 0.2.1 ([8734fb6](https://github.com/georgedouzas/geometric-smote/commit/8734fb609f65586c007f2f9d8cea8915d10625fe) by georgedouzas).
-- Remove Python 3.9 from CI ([c1aeb9b](https://github.com/georgedouzas/geometric-smote/commit/c1aeb9be9e4004ced4c50627ca0284d4c71dc6f7) by georgedouzas).
-- Restructure project with copier template ([73b3280](https://github.com/georgedouzas/geometric-smote/commit/73b32804165ef6875382c85c42a5000ad27e53b4) by georgedouzas).
+- Update copier template ([d20c7dc](https://github.com/georgedouzas/imbalanced-learn-extra/commit/d20c7dc9ec73127cd41ecda69505b5b8adb07f23) by georgedouzas).
+- Release 0.5.0 ([080a2bb](https://github.com/georgedouzas/imbalanced-learn-extra/commit/080a2bb01f9315bf876f71463625ceee1e89db3d) by georgedouzas).
+
+## [0.4.0](https://github.com/georgedouzas/imbalanced-learn-extra/releases/tag/0.4.0) - 2023-02-16
+
+<small>[Compare with 0.2.5](https://github.com/georgedouzas/imbalanced-learn-extra/compare/0.2.5...0.4.0)</small>
+
+## [0.2.5](https://github.com/georgedouzas/imbalanced-learn-extra/releases/tag/0.2.5) - 2020-07-24
+
+<small>[Compare with 0.2.4](https://github.com/georgedouzas/imbalanced-learn-extra/compare/0.2.4...0.2.5)</small>
+
+## [0.2.4](https://github.com/georgedouzas/imbalanced-learn-extra/releases/tag/0.2.4) - 2020-07-21
+
+<small>[Compare with 0.2.3](https://github.com/georgedouzas/imbalanced-learn-extra/compare/0.2.3...0.2.4)</small>
+
+## [0.2.3](https://github.com/georgedouzas/imbalanced-learn-extra/releases/tag/0.2.3) - 2020-07-21
+
+<small>[Compare with 0.2.2](https://github.com/georgedouzas/imbalanced-learn-extra/compare/0.2.2...0.2.3)</small>
+
+## [0.2.2](https://github.com/georgedouzas/imbalanced-learn-extra/releases/tag/0.2.2) - 2020-04-08
+
+<small>[Compare with 0.2.1](https://github.com/georgedouzas/imbalanced-learn-extra/compare/0.2.1...0.2.2)</small>
+
+## [0.2.1](https://github.com/georgedouzas/imbalanced-learn-extra/releases/tag/0.2.1) - 2020-04-08
+
+<small>[Compare with 0.2.0](https://github.com/georgedouzas/imbalanced-learn-extra/compare/0.2.0...0.2.1)</small>
 
-## [0.2.0](https://github.com/georgedouzas/geometric-smote/releases/tag/0.2.0) - 2022-03-12
+## [0.2.0](https://github.com/georgedouzas/imbalanced-learn-extra/releases/tag/0.2.0) - 2020-04-07
 
-<small>[Compare with 0.1.3](https://github.com/georgedouzas/geometric-smote/compare/0.1.3...0.2.0)</small>
+<small>[Compare with 0.1.2](https://github.com/georgedouzas/imbalanced-learn-extra/compare/0.1.2...0.2.0)</small>
 
-## [0.1.3](https://github.com/georgedouzas/geometric-smote/releases/tag/0.1.3) - 2019-12-13
+## [0.1.2](https://github.com/georgedouzas/imbalanced-learn-extra/releases/tag/0.1.2) - 2020-03-30
 
-<small>[Compare with 0.1.2](https://github.com/georgedouzas/geometric-smote/compare/0.1.2...0.1.3)</small>
+<small>[Compare with 0.1.1](https://github.com/georgedouzas/imbalanced-learn-extra/compare/0.1.1...0.1.2)</small>
 
-## [0.1.2](https://github.com/georgedouzas/geometric-smote/releases/tag/0.1.2) - 2019-07-09
+## [0.1.1](https://github.com/georgedouzas/imbalanced-learn-extra/releases/tag/0.1.1) - 2019-08-17
 
-<small>[Compare with first commit](https://github.com/georgedouzas/geometric-smote/compare/801d7f49ebce70a48a7d9e30d5820765b5a1d511...0.1.2)</small>
+<small>[Compare with first commit](https://github.com/georgedouzas/imbalanced-learn-extra/compare/e209568f6d0b02df1f1d06d5e79ba2300f2f4d23...0.1.1)</small>
 
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Georgios Douzas
+Copyright (c) 2021 Georgios Douzas
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal