Browse Source

alpha19 HOTFIX (#81)

* Use relative paths in setup.py for RTD.

* Test absolute path for RTD.

* Test absolute path for RTD.

* Test absolute path for RTD.

* Test absolute path for RTD.

* Test absolute path for RTD.

* Test absolute path for RTD.

* Fix docker setup.

* Fix docker setup.

* Include header files for sdist.
Stefano Cossu 5 years ago
parent
commit
44ffaa97bd

+ 1 - 0
MANIFEST.in

@@ -1,6 +1,7 @@
 include README.rst
 include LICENSE
 include fcrepo
+graft ext
 graft lakesuperior/data/bootstrap
 graft lakesuperior/endpoints/templates
 graft lakesuperior/etc.defaults

+ 1 - 1
lakesuperior/__init__.py

@@ -4,7 +4,7 @@ from os import path
 
 
 version = '1.0 alpha'
-release = '1.0.0a18'
+release = '1.0.0a19'
 
 basedir = path.dirname(path.realpath(__file__))
 """

+ 5 - 3
lakesuperior/store/base_lmdb_store.c

@@ -3,7 +3,9 @@
 /* BEGIN: Cython Metadata
 {
     "distutils": {
-        "depends": [],
+        "depends": [
+            "/home/scossu/code/lsup/src/ext/include/lmdb.h"
+        ],
         "include_dirs": [
             "/home/scossu/code/lsup/src/ext/include",
             "/home/scossu/code/lsup/src/lakesuperior/cy_include"
@@ -1757,14 +1759,14 @@ static MDB_dbi __pyx_f_12lakesuperior_5store_15base_lmdb_store_13BaseLmdbStore_g
 static MDB_cursor *__pyx_f_12lakesuperior_5store_15base_lmdb_store_13BaseLmdbStore__cur_open(struct __pyx_obj_12lakesuperior_5store_15base_lmdb_store_BaseLmdbStore *__pyx_v_self, struct __pyx_opt_args_12lakesuperior_5store_15base_lmdb_store_13BaseLmdbStore__cur_open *__pyx_optional_args); /* proto*/
 static void __pyx_f_12lakesuperior_5store_15base_lmdb_store_13BaseLmdbStore__cur_close(CYTHON_UNUSED struct __pyx_obj_12lakesuperior_5store_15base_lmdb_store_BaseLmdbStore *__pyx_v_self, MDB_cursor *__pyx_v_cur); /* proto*/
 
-/* Module declarations from 'lakesuperior.cy_include' */
-
 /* Module declarations from 'libc.stdint' */
 
 /* Module declarations from 'posix.types' */
 
 /* Module declarations from 'lakesuperior.cy_include.cylmdb' */
 
+/* Module declarations from 'lakesuperior.cy_include' */
+
 /* Module declarations from 'libc' */
 
 /* Module declarations from 'libc.errno' */

+ 1 - 1
lakesuperior/store/base_lmdb_store.pxd

@@ -1,4 +1,4 @@
-from lakesuperior.cy_include cimport cylmdb as lmdb
+cimport lakesuperior.cy_include.cylmdb as lmdb
 
 cdef:
     int rc

+ 3 - 3
lakesuperior/store/ldp_rs/lmdb_triplestore.c

@@ -3,7 +3,9 @@
 /* BEGIN: Cython Metadata
 {
     "distutils": {
-        "depends": [],
+        "depends": [
+            "/home/scossu/code/lsup/src/ext/include/lmdb.h"
+        ],
         "extra_compile_args": [
             "-fopenmp"
         ],
@@ -2306,8 +2308,6 @@ static CYTHON_INLINE void __pyx_f_12lakesuperior_5store_6ldp_rs_16lmdb_triplesto
 static void __pyx_f_12lakesuperior_5store_6ldp_rs_16lmdb_triplestore_15LmdbTriplestore__append(struct __pyx_obj_12lakesuperior_5store_6ldp_rs_16lmdb_triplestore_LmdbTriplestore *__pyx_v_self, unsigned char *__pyx_v_value, size_t __pyx_v_vlen, __pyx_t_12lakesuperior_5store_6ldp_rs_16lmdb_triplestore_Key *__pyx_v_nkey, struct __pyx_opt_args_12lakesuperior_5store_6ldp_rs_16lmdb_triplestore_15LmdbTriplestore__append *__pyx_optional_args); /* proto*/
 static void __pyx_f_12lakesuperior_5store_6ldp_rs_16lmdb_triplestore_15LmdbTriplestore__next_key(CYTHON_UNUSED struct __pyx_obj_12lakesuperior_5store_6ldp_rs_16lmdb_triplestore_LmdbTriplestore *__pyx_v_self, unsigned char *__pyx_v_key, __pyx_t_12lakesuperior_5store_6ldp_rs_16lmdb_triplestore_Key *__pyx_v_nkey); /* proto*/
 
-/* Module declarations from 'lakesuperior.cy_include' */
-
 /* Module declarations from 'libc.stdint' */
 
 /* Module declarations from 'posix.types' */

+ 1 - 1
lakesuperior/store/ldp_rs/lmdb_triplestore.pyx

@@ -15,7 +15,7 @@ from cython.parallel import prange
 from libc.stdlib cimport free
 from libc.string cimport memcpy
 
-from lakesuperior.cy_include cimport cylmdb as lmdb
+cimport lakesuperior.cy_include.cylmdb as lmdb
 from lakesuperior.store.base_lmdb_store cimport (
         BaseLmdbStore, data_v, dbi, key_v)
 from lakesuperior.store.ldp_rs.term cimport serialize, deserialize

+ 0 - 1
setup.py

@@ -110,7 +110,6 @@ setup(
 
     description='A Linked Data Platform repository sever.',
     long_description=long_description,
-    long_description_content_type='text/x-rst; charset=UTF-8',
 
     url='https://lakesuperior.readthedocs.io',