Compare commits

...

6 commits

Author SHA1 Message Date
Jack Robison
3c1664f8dd
manylinux_2_24_x86_64 2022-03-27 14:17:04 -04:00
Jack Robison
cd0f5f3f15
fix build 2022-03-26 16:25:57 -04:00
Jack Robison
66d25e9554
update setup.py 2022-03-26 16:25:57 -04:00
Jack Robison
2528ace020
codeql 2022-03-26 15:19:52 -04:00
Jack Robison
1f80cc90b3
update tox to run unit tests 2022-03-26 15:19:13 -04:00
Jack Robison
fa611addc4
remove ununsed dockerfile 2022-03-26 15:18:48 -04:00
6 changed files with 10 additions and 46 deletions

View file

@ -6,6 +6,7 @@ on:
push: push:
branches: branches:
- master - master
- github-actions
jobs: jobs:
manylinux: manylinux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -26,7 +27,7 @@ jobs:
src/rocksdb/libz.a src/rocksdb/libz.a
src/rocksdb/librocksdb.a src/rocksdb/librocksdb.a
- name: Install requirements - 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 - name: Make static library files
if: steps.build-cache.outputs.cache-hit != 'true' if: steps.build-cache.outputs.cache-hit != 'true'
run: make clean && make run: make clean && make

View file

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

View file

@ -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

View file

@ -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

View file

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

12
tox.ini
View file

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