diff --git a/pyproject.toml b/pyproject.toml index 9787c3bdf008a57ae3cb2e27a8261eb3f134ff73..2bf5ec8096be861930092d5f2f0188c6663e2913 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["setuptools", "wheel"] +requires = ["setuptools", "wheel", "Cython"] build-backend = "setuptools.build_meta" diff --git a/rocksdb/_rocksdb.pyx b/rocksdb/_rocksdb.pyx index 7a6c61a9689afa62ea547f8bca2736940a1f3d75..b37021ad26ff1ab5a7bf51a5b6bc45d966755243 100644 --- a/rocksdb/_rocksdb.pyx +++ b/rocksdb/_rocksdb.pyx @@ -590,7 +590,6 @@ cdef class BlockBasedTableFactory(PyTableFactory): block_size_deviation=None, block_restart_interval=None, whole_key_filtering=None, - enable_index_compression=None, cache_index_and_filter_blocks=None, format_version=None, ): @@ -643,12 +642,6 @@ cdef class BlockBasedTableFactory(PyTableFactory): else: table_options.whole_key_filtering = False - if enable_index_compression is not None: - if enable_index_compression: - table_options.enable_index_compression = True - else: - table_options.enable_index_compression = False - if cache_index_and_filter_blocks is not None: if cache_index_and_filter_blocks: table_options.cache_index_and_filter_blocks = True @@ -1365,12 +1358,6 @@ cdef class Options(ColumnFamilyOptions): def __set__(self, value): self.opts.max_background_compactions = value - property stats_history_buffer_size: - def __get__(self): - return self.opts.stats_history_buffer_size - def __set__(self, value): - self.opts.stats_history_buffer_size = value - property max_background_jobs: def __get__(self): return self.opts.max_background_jobs @@ -1751,7 +1738,6 @@ cdef class DB(object): copts.in_use = False del self.cf_options[:] with nogil: - st = self.db.Close() self.db = NULL if self.opts is not None: self.opts.in_use = False diff --git a/setup.cfg b/setup.cfg index 941785c9bd82b38952e79f1f3c27911c0feb6fb7..154eaa13037e88217f6f3cbde65b99b9126f22ca 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,9 +29,6 @@ package_dir = rocksdb = rocksdb include_package_data = True zip_safe = False -setup_requires = - cython >= 0.20 - setuptools >= 25 install_requires = setuptools >= 25 test_require = diff --git a/tox.ini b/tox.ini index 917b6eeea0ece10a16bfb50b74fe8f72109eaf57..a25ec96c126c50133833d843249e2465288b3d05 100644 --- a/tox.ini +++ b/tox.ini @@ -1,14 +1,10 @@ [tox] envlist = py35,py36,py37,py38,py39 minversion = 2.0 -skipsdist = True [testenv] -#skip_install = True -#deps = -# -e -# .[test] -commands = pytest-3 {posargs:rocksdb/tests} +deps = pytest +commands = pytest {posargs:rocksdb/tests} [testenv:docs] deps = .[doc]