Skip to content

Commit

Permalink
Merge pull request #5 from fugue-project/0.0.2.1
Browse files Browse the repository at this point in the history
update name
  • Loading branch information
goodwanghan committed Aug 31, 2021
2 parents d904cdb + 3d77da9 commit 52ab0f2
Show file tree
Hide file tree
Showing 21 changed files with 49 additions and 49 deletions.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -18,7 +18,7 @@ dev:
docs:
rm -rf docs/api
rm -rf docs/build
sphinx-apidoc --no-toc -f -t=docs/_templates -o docs/api pandasy/
sphinx-apidoc --no-toc -f -t=docs/_templates -o docs/api slide/
sphinx-build -b html docs/ docs/build/

lint:
Expand Down
14 changes: 7 additions & 7 deletions README.md
@@ -1,11 +1,11 @@
# pandasy
# slide

[![GitHub release](https://img.shields.io/github/release/fugue-project/pandasy.svg)](https://GitHub.com/fugue-project/pandasy)
[![PyPI pyversions](https://img.shields.io/pypi/pyversions/pandasy.svg)](https://pypi.python.org/pypi/pandasy/)
[![PyPI license](https://img.shields.io/pypi/l/pandasy.svg)](https://pypi.python.org/pypi/pandasy/)
[![PyPI version](https://badge.fury.io/py/pandasy.svg)](https://pypi.python.org/pypi/pandasy/)
[![Coverage Status](https://coveralls.io/repos/github/fugue-project/pandasy/badge.svg)](https://coveralls.io/github/fugue-project/pandasy)
[![Doc](https://readthedocs.org/projects/pandasy/badge)](https://pandasy.readthedocs.org)
[![GitHub release](https://img.shields.io/github/release/fugue-project/slide.svg)](https://GitHub.com/fugue-project/slide)
[![PyPI pyversions](https://img.shields.io/pypi/pyversions/slide.svg)](https://pypi.python.org/pypi/slide/)
[![PyPI license](https://img.shields.io/pypi/l/slide.svg)](https://pypi.python.org/pypi/slide/)
[![PyPI version](https://badge.fury.io/py/slide.svg)](https://pypi.python.org/pypi/slide/)
[![Coverage Status](https://coveralls.io/repos/github/fugue-project/slide/badge.svg)](https://coveralls.io/github/fugue-project/slide)
[![Doc](https://readthedocs.org/projects/slide/badge)](https://slide.readthedocs.org)

[![Slack Status](https://img.shields.io/badge/slack-join_chat-white.svg?logo=slack&style=social)](https://join.slack.com/t/fugue-project/shared_invite/zt-jl0pcahu-KdlSOgi~fP50TZWmNxdWYQ)

Expand Down
12 changes: 6 additions & 6 deletions RELEASE.md
Expand Up @@ -2,12 +2,12 @@

## 0.0.6

- [Early stop](https://github.com/fugue-project/pandasy/issues/22) for non iterative
- Work on local optimizer [1](https://github.com/fugue-project/pandasy/issues/18) [2](https://github.com/fugue-project/pandasy/issues/31)
- Added initialize and finalize [hooks](https://github.com/fugue-project/pandasy/issues/28) for monitors
- Improved realtime chart [rendering](https://github.com/fugue-project/pandasy/issues/19)
- Fixed [prerelease](https://github.com/fugue-project/pandasy/issues/27)
- Fixed report [timeout bug](https://github.com/fugue-project/pandasy/issues/20)
- [Early stop](https://github.com/fugue-project/slide/issues/22) for non iterative
- Work on local optimizer [1](https://github.com/fugue-project/slide/issues/18) [2](https://github.com/fugue-project/slide/issues/31)
- Added initialize and finalize [hooks](https://github.com/fugue-project/slide/issues/28) for monitors
- Improved realtime chart [rendering](https://github.com/fugue-project/slide/issues/19)
- Fixed [prerelease](https://github.com/fugue-project/slide/issues/27)
- Fixed report [timeout bug](https://github.com/fugue-project/slide/issues/20)

## Before 0.0.6

Expand Down
2 changes: 1 addition & 1 deletion docs/api.rst
Expand Up @@ -3,4 +3,4 @@ API Reference

.. toctree::

api/pandasy
api/slide
10 changes: 5 additions & 5 deletions docs/api/pandasy.rst → docs/api/slide.rst
@@ -1,5 +1,5 @@
pandasy
========
slide
======

.. |SchemaLikeObject| replace:: :ref:`Schema like object <tutorial:/tutorials/x-like.ipynb#schema>`
.. |ParamsLikeObject| replace:: :ref:`Parameters like object <tutorial:/tutorials/x-like.ipynb#parameters>`
Expand All @@ -21,10 +21,10 @@ pandasy



pandasy.dummy
-------------
slide.utils
-----------

.. automodule:: pandasy.dummy
.. automodule:: slide.utils
:members:
:undoc-members:
:show-inheritance:
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Expand Up @@ -16,12 +16,12 @@

sys.path.insert(0, os.path.abspath("../"))

from pandasy_version import __version__
from slide_version import __version__
import sphinx_rtd_theme

# -- Project information -----------------------------------------------------

project = "pandasy"
project = "slide"
version = __version__
copyright = "2021, Han Wang" # noqa: A001
author = "Han Wang"
Expand Down
4 changes: 2 additions & 2 deletions docs/index.rst
@@ -1,9 +1,9 @@
.. pandasy documentation master file, created by
.. slide documentation master file, created by
sphinx-quickstart on Sun May 17 21:49:44 2020.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
Pandasy Documentation
slide Documentation
=====================

.. toctree::
Expand Down
4 changes: 2 additions & 2 deletions docs/introduction.rst
@@ -1,7 +1,7 @@
Introduction
=============

What is pandasy?
What is slide?
----------------

pandasy contains a collection utitily functions that ensure the behaviors of pandas-like dataframes.
slide contains a collection utitily functions that ensure the behaviors of pandas-like dataframes.
8 changes: 0 additions & 8 deletions pandasy_pandas/utils.py

This file was deleted.

1 change: 0 additions & 1 deletion pandasy_version/__init__.py

This file was deleted.

2 changes: 1 addition & 1 deletion setup.cfg
Expand Up @@ -3,7 +3,7 @@ description-file = README.md

[tool:pytest]
addopts =
--cov=pandasy
--cov=slide
--cov-report=term-missing:skip-covered
-vvv
spark_options =
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -2,7 +2,7 @@

from setuptools import find_packages, setup

from pandasy_version import __version__
from slide_version import __version__

with open("README.md") as f:
LONG_DESCRIPTION = f.read()
Expand All @@ -29,7 +29,7 @@ def get_version() -> str:
author="Han Wang",
author_email="goodwanghan@gmail.com",
keywords="pandas sql",
url="http://github.com/fugue-project/pandasy",
url="http://github.com/fugue-project/slide",
install_requires=["triad", "pandas>=1.1.0", "numpy>=1.19"],
extras_require={
"dask": ["dask[dataframe]", "cloudpickle>=1.4.0"],
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion pandasy/utils.py → slide/utils.py
Expand Up @@ -12,7 +12,7 @@
_DEFAULT_DATETIME = datetime(2000, 1, 1)


class PandasyUtils(Generic[T]):
class SlideUtils(Generic[T]):
"""A collection of utils for general pandas like dataframes"""

def empty(self, df: T) -> bool:
Expand Down
File renamed without changes.
8 changes: 8 additions & 0 deletions slide_pandas/utils.py
@@ -0,0 +1,8 @@
import pandas as pd
from slide.utils import SlideUtils


class PandasUtils(SlideUtils[pd.DataFrame]):
"""A collection of pandas utils"""

pass
File renamed without changes.
10 changes: 5 additions & 5 deletions pandasy_test/suite.py → slide_test/suite.py
Expand Up @@ -7,16 +7,16 @@
import numpy as np
import pandas as pd
import pyarrow as pa
from pandasy.utils import PandasyUtils
from slide.utils import SlideUtils
from pytest import raises
from triad import Schema
from triad.utils.pandas_like import _DEFAULT_DATETIME
from triad.utils.pyarrow import expression_to_schema


class PandasyTestSuite(object):
class SlideTestSuite(object):
"""Pandas-like utils test suite.
Any new :class:`~pandasy.utils.PandasyUtils` should pass this test suite.
Any new :class:`~slide.utils.SlideUtils` should pass this test suite.
"""

class Tests(TestCase):
Expand All @@ -26,11 +26,11 @@ def setUpClass(cls):
cls._utils = cls.make_utils(cls)
pass

def make_utils(self) -> PandasyUtils:
def make_utils(self) -> SlideUtils:
raise NotImplementedError

@property
def utils(self) -> PandasyUtils:
def utils(self) -> SlideUtils:
return self._utils # type: ignore

@classmethod
Expand Down
1 change: 1 addition & 0 deletions slide_version/__init__.py
@@ -0,0 +1 @@
__version__ = "0.0.3"
File renamed without changes.
@@ -1,14 +1,14 @@
from triad.utils.pyarrow import expression_to_schema
from pandasy.utils import PandasyUtils
from pandasy_test.suite import PandasyTestSuite
from slide.utils import SlideUtils
from slide_test.suite import SlideTestSuite

from pandasy_pandas.utils import PandasUtils
from slide_pandas.utils import PandasUtils
import pandas as pd
from typing import Any


class PandasTests(PandasyTestSuite.Tests):
def make_utils(self) -> PandasyUtils:
class PandasTests(SlideTestSuite.Tests):
def make_utils(self) -> SlideUtils:
return PandasUtils()

def to_pd(self, data: Any) -> pd.DataFrame:
Expand Down

0 comments on commit 52ab0f2

Please sign in to comment.