manylinux_2_24_x86_64

.github/workflows/build.yml

@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - master
+      - github-actions
 jobs:
   manylinux:
     runs-on: ubuntu-latest
@@ -26,7 +27,7 @@ jobs:
             src/rocksdb/libz.a
             src/rocksdb/librocksdb.a
       - name: Install requirements
-        run: sudo apt-get install build-essential binutils cmake python3-cffi
+        run: sudo apt-get install build-essential binutils cmake python3-cffi python3.8-dev python3.9-dev
       - name: Make static library files
         if: steps.build-cache.outputs.cache-hit != 'true'
         run: make clean && make

.github/workflows/codeql-analysis.yml

@@ -32,7 +32,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'cpp', 'python' ]
+        language: [ 'python' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
 

Dockerfile

@@ -1,33 +0,0 @@
-FROM ubuntu:18.04
-ENV SRC /home/tester/src
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update -y && apt-get install -qy \
-        locales \
-        git \
-        wget \
-        python \
-        python3 \
-        python-dev \
-        python3-dev \
-        python-pip \
-        librocksdb-dev \
-        libsnappy-dev \
-        zlib1g-dev \
-        libbz2-dev \
-        liblz4-dev \
-        && rm -rf /var/lib/apt/lists/*
-
-#NOTE(sileht): really no utf-8 in 2017 !?
-ENV LANG en_US.UTF-8
-RUN update-locale
-RUN locale-gen $LANG
-
-#NOTE(sileht): Upgrade python dev tools
-RUN pip install -U pip tox virtualenv
-
-RUN groupadd --gid 2000 tester
-RUN useradd --uid 2000 --gid 2000 --create-home --shell /bin/bash tester
-USER tester
-
-WORKDIR $SRC

scripts/build.sh

@@ -1 +1 @@
-docker run --rm -v $(pwd):/lbry-rocksdb quay.io/pypa/manylinux2014_x86_64 /bin/bash lbry-rocksdb/scripts/make-wheels.sh
+docker run --rm -v $(pwd):/lbry-rocksdb quay.io/pypa/manylinux_2_24_x86_64 /bin/bash lbry-rocksdb/scripts/make-wheels.sh

setup.py

@@ -73,7 +73,7 @@ else:
 setup(
     name="lbry-rocksdb",
     version=version,
-    keywords=['rocksdb', 'static', 'build'],
+    keywords=['rocksdb', 'lbry-rocksdb', 'python-rocksdb', 'leveldb', 'embedded', 'database'],
     description="Python bindings for RocksDB",
     long_description=open("README.md").read(),
     long_description_content_type='text/markdown',
@@ -83,7 +83,7 @@ setup(
     license='BSD License',
     python_requires=">=3.7.0",
     package_dir={'rocksdb': 'rocksdb'},
-    packages=find_packages('.'),
+    packages=find_packages(exclude=('tests',)),
     ext_modules=cythonize([Extension(
         'rocksdb._rocksdb',
         SOURCES,

tox.ini

@@ -2,18 +2,14 @@
 envlist = py37,py38,py39
 minversion = 3.7
 skipsdist = True
+skip_missing_interpreters = true
 
 [testenv]
 skip_install = True
-deps =
-    -e
-    .[test]
-commands = pytest {posargs:rocksdb/tests}
+deps = -e .
+commands = python -m unittest discover . -v
+norecursedirs = .tox
 
 [testenv:docs]
 deps = .[doc]
 commands = python setup.py build_sphinx -W
-
-[pytest]
-addopts = --verbose
-norecursedirs = .tox