Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Pandas, NumPy and SciPy versions #11

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include README.rst
include requirements.txt
12 changes: 6 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,10 @@ Alternatively, you can install the library directly using the source code in Git
**Required Dependencies:**


* Python 3.8
* numpy==1.23.5
* scikit-learn>=1.3.0
* scipy==1.10.0
* Python 3.9
* numpy==2.0.2
* scikit-learn==1.5.2
* scipy==1.13.1
* pyod==1.1.0
* combo==0.1.3

Expand All @@ -133,7 +133,7 @@ Alternatively, you can install the library directly using the source code in Git
* rrcf==0.4.3 (Only required for `pysad.models.robust_random_cut_forest.RobustRandomCutForest`)
* PyNomaly==0.3.3 (Only required for `pysad.models.loop.StreamLocalOutlierProbability`)
* mmh3==2.5.1 (Only required for `pysad.models.xstream.xStream`)
* pandas==2.0.3 (Only required for `pysad.utils.pandas_streamer.PandasStreamer`)
* pandas==2.2.3 (Only required for `pysad.utils.pandas_streamer.PandasStreamer`)

Quick Links
============
Expand Down Expand Up @@ -180,4 +180,4 @@ If you use PySAD for a scientific publication, please cite the following paper:
author={Yilmaz, Selim F and Kozat, Suleyman S},
journal={arXiv preprint arXiv:2009.02572},
year={2020}
}
}
6 changes: 3 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ trigger:

strategy:
matrix:
linux38:
imageName: "ubuntu-latest"
python.version: '3.8'
linux39:
imageName: "ubuntu-latest"
python.version: '3.9'
Expand All @@ -21,6 +18,9 @@ strategy:
linux311:
imageName: "ubuntu-latest"
python.version: '3.11'
linux312:
imageName: "ubuntu-latest"
python.version: '3.12'

maxParallel: 9

Expand Down
4 changes: 2 additions & 2 deletions deploy.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
rm -rf ./build/ ./dist/ ./pysad.egg-info/
python setup.py sdist bdist_wheel
python3 -m twine upload dist/*
python3 -m build
python3 -m twine upload dist/*
16 changes: 8 additions & 8 deletions docs/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -169,14 +169,14 @@ Postprocessors
:template: class.rst
:toctree: generated

pysad.transform.postprocessing.AveragePostprocessor
pysad.transform.postprocessing.MaxPostprocessor
pysad.transform.postprocessing.MedianPostprocessor
pysad.transform.postprocessing.ZScorePostprocessor
pysad.transform.postprocessing.RunningAveragePostprocessor
pysad.transform.postprocessing.RunningMaxPostprocessor
pysad.transform.postprocessing.RunningMedianPostprocessor
pysad.transform.postprocessing.RunningZScorePostprocessor
transform.postprocessing.AveragePostprocessor
transform.postprocessing.MaxPostprocessor
transform.postprocessing.MedianPostprocessor
transform.postprocessing.ZScorePostprocessor
transform.postprocessing.RunningAveragePostprocessor
transform.postprocessing.RunningMaxPostprocessor
transform.postprocessing.RunningMedianPostprocessor
transform.postprocessing.RunningZScorePostprocessor


Statistics
Expand Down
5 changes: 3 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,8 @@

html_theme_options = {
'canonical_url': '',
'analytics_id': 'UA-XXXXXXX-1', # Provided by Google in your dashboard
'logo_only': True,
'display_version': False,
'version_selector': False,
'prev_next_buttons_location': 'bottom',
'style_external_links': False,
#'vcs_pageview_mode': '',
Expand Down Expand Up @@ -112,3 +111,5 @@
# 'matplotlib': ('https://matplotlib.org/', None),
#'sklearn': ('https://scikit-learn.org/stable', None)
}

bibtex_bibfiles = ['refs.bib']
10 changes: 5 additions & 5 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ Alternatively, you can install the library directly using the source code in Git
**Required Dependencies:**


* Python 3.8
* numpy==1.23.5
* scikit-learn>=1.3.0
* scipy==1.10.0
* Python 3.9
* numpy==2.0.2
* scikit-learn==1.5.2
* scipy==1.13.1
* pyod==1.1.0
* combo==0.1.3

Expand All @@ -36,4 +36,4 @@ Alternatively, you can install the library directly using the source code in Git
* rrcf==0.4.3 (Only required for :class:`pysad.models.robust_random_cut_forest.RobustRandomCutForest`)
* PyNomaly==0.3.3 (Only required for :class:`pysad.models.loop.StreamLocalOutlierProbability`)
* mmh3==2.5.1 (Only required for :class:`pysad.models.xstream.xStream`)
* pandas==2.0.3 (Only required for :class:`pysad.utils.pandas_streamer.PandasStreamer`)
* pandas==2.2.3 (Only required for :class:`pysad.utils.pandas_streamer.PandasStreamer`)
58 changes: 58 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
[build-system]
requires = ["setuptools"]
build-backend = "setuptools.build_meta"

[project]
name = "pysad"
version = "0.2.0"
dependencies = [
"numpy",
"scikit-learn",
"scipy",
"pyod==1.1.0",
"combo==0.1.3",
]
requires-python = ">=3.9"
authors = [
{name = "Selim Firat Yilmaz", email = "[email protected]"},
]
maintainers = [
{name = "Selim Firat Yilmaz", email = "[email protected]"}
]
description = "PySAD is an open-source python framework for anomaly detection on streaming multivariate data."
readme = "README.rst"
license = {file = "LICENSE"}
keywords = ["outlier detection", "anomaly detection", "machine learning"]
classifiers = [
'Development Status :: 2 - Pre-Alpha',
'Intended Audience :: Education',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Developers',
'Intended Audience :: Science/Research',
'Intended Audience :: Information Technology',
"Topic :: Scientific/Engineering",
"Topic :: Scientific/Engineering :: Artificial Intelligence",
"Topic :: Software Development",
"License :: OSI Approved :: BSD License",
'Operating System :: Unix',
'Operating System :: MacOS',
'Operating System :: Microsoft :: Windows',
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]

[project.optional-dependencies]
rrcf = ["rrcf==0.4.3"]
slop = ["PyNomaly==0.3.3"]
xStream = ["mmh3==2.5.1"]
pandas = ["pandas"]

[project.urls]
Homepage = "https://github.com/selimfirat/pysad"
Documentation = "https://pysad.readthedocs.io/"
Repository = "https://github.com/selimfirat/pysad.git"
"Bug Tracker" = "https://github.com/selimfirat/pysad/issues"
Changelog = "https://github.com/selimfirat/pysad/blob/master/CHANGES.txt"

4 changes: 2 additions & 2 deletions pysad/models/kitnet_model/dA.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ def __init__(self, params):
self.params.n_hidden = int(numpy.ceil(self.params.n_visible*self.params.hiddenRatio))

# for 0-1 normlaization
self.norm_max = numpy.ones((self.params.n_visible,)) * -numpy.Inf
self.norm_min = numpy.ones((self.params.n_visible,)) * numpy.Inf
self.norm_max = numpy.ones((self.params.n_visible,)) * -numpy.inf
self.norm_min = numpy.ones((self.params.n_visible,)) * numpy.inf
self.n = 0

self.rng = numpy.random.RandomState(1234)
Expand Down
11 changes: 6 additions & 5 deletions requirements-ci.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
numpy==1.23.5
scikit-learn>=1.3.0
scipy==1.10.0
numpy==2.0.2
scikit-learn==1.5.2
scipy==1.13.1
pyod==1.1.0
pandas==2.0.3
pandas==2.2.3
rrcf==0.4.3
PyNomaly==0.3.3
mmh3==2.5.1
combo==0.1.3
combo==0.1.3
setuptools>=49.6.0
24 changes: 12 additions & 12 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
sphinx_rtd_theme==0.5.0
sphinx==6.2.1
sphinx_rtd_theme==3.0.1
sphinx==8.1.3
sphinxcontrib-fulltoc==1.2.0
pytest==5.2.1
pytest-cov==2.10.0
coveralls==2.1.1
sphinx-copybutton==0.3.0
sphinxcontrib-bibtex==1.0.0
numpy==1.23.5
pandas==2.0.3
scipy==1.10.0
pytest==8.3.3
pytest-cov==6.0.0
coveralls==4.0.1
sphinx-copybutton==0.5.2
sphinxcontrib-bibtex==2.6.3
numpy==2.0.2
pandas==2.2.3
scipy==1.13.1
pyod==1.1.0
rrcf==0.4.3
PyNomaly==0.3.3
mmh3==2.5.1
scikit-learn==1.3.0
scikit-learn==1.5.2
setuptools>=49.6.0
wheel>=0.35.1
twine>=3.2.0
combo==0.1.3
combo==0.1.3
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
numpy==1.23.5
scikit-learn>=1.3.0
scipy==1.10.0
numpy==2.0.2
scikit-learn==1.5.2
scipy==1.13.1
pyod==1.1.0
combo==0.1.3
combo==0.1.3
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
'Operating System :: Unix',
'Operating System :: MacOS',
'Operating System :: Microsoft :: Windows',
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
],
python_requires=">=3.8"
python_requires=">=3.9"
)