Skip to content

Separate properties module #17590

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Sep 22, 2017
Merged

Separate properties module #17590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c9f29d
Separate properties module
jbrockmendel Sep 19, 2017
74bfb1f
remove defunct src/properties.pyx
jbrockmendel Sep 21, 2017
dd377af
import cache_readonly and AxisProperty directly from _libs.properties
jbrockmendel Sep 21, 2017
3ad2512
Merge branch 'master' of https://github.com/pandas-dev/pandas into pr…
jbrockmendel Sep 21, 2017
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
1 change: 0 additions & 1 deletion pandas/_libs/lib.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1907,5 +1907,4 @@ cdef class BlockPlacement:


include "reduce.pyx"
include "properties.pyx"
include "inference.pyx"
5 changes: 4 additions & 1 deletion pandas/_libs/src/properties.pyx → pandas/_libs/properties.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@

from cython cimport Py_ssize_t

from cpython cimport (
PyDict_Contains, PyDict_GetItem, PyDict_GetItem, PyDict_SetItem)
PyDict_Contains, PyDict_GetItem, PyDict_SetItem)


cdef class cache_readonly(object):
Expand Down
4 changes: 2 additions & 2 deletions pandas/core/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import numpy as np
import pandas as pd

from pandas._libs import tslib, lib
from pandas._libs import tslib, lib, properties
from pandas.core.dtypes.common import (
_ensure_int64,
_ensure_object,
Expand Down Expand Up @@ -258,7 +258,7 @@ def _setup_axes(cls, axes, info_axis=None, stat_axis=None, aliases=None,
if build_axes:

def set_axis(a, i):
setattr(cls, a, lib.AxisProperty(i))
setattr(cls, a, properties.AxisProperty(i))
cls._internal_names_set.add(a)

if axes_are_reversed:
Expand Down
2 changes: 1 addition & 1 deletion pandas/util/_decorators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from pandas.compat import callable, signature
from pandas._libs.lib import cache_readonly # noqa
from pandas._libs.properties import cache_readonly # noqa
import types
import warnings
from textwrap import dedent
Expand Down
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ def get_tag(self):
cmdclass['build_src'] = DummyBuildSrc
cmdclass['build_ext'] = CheckingBuildExt

lib_depends = ['reduce', 'inference', 'properties']
lib_depends = ['reduce', 'inference']


def srcpath(name=None, suffix='.pyx', subdir='src'):
Expand Down Expand Up @@ -478,6 +478,7 @@ def pxd(name):
ext_data = {
'_libs.lib': {'pyxfile': '_libs/lib',
'depends': lib_depends + tseries_depends},
'_libs.properties': {'pyxfile': '_libs/properties', 'include': []},
'_libs.hashtable': {'pyxfile': '_libs/hashtable',
'pxdfiles': ['_libs/hashtable'],
'depends': (['pandas/_libs/src/klib/khash_python.h']
Expand Down