Skip to content

Commit 2d85d3d

Browse files
authored
Merge pull request #4 from aosingh/v0.9.99
V0.9.99
2 parents 95b3a1c + 6c29b45 commit 2d85d3d

33 files changed

+573
-639
lines changed

.coveragerc

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
[run]
2-
branch = False
32
parallel = True
4-
5-
source =
6-
sqlite_rx
7-
3+
branch = False
4+
source = sqlite_rx
5+
concurrency = multiprocessing
86
omit =
97
/*/tests/*
108
.env/*
11-
/sqlite_rx/cli
9+
./sqlite_rx/cli/__init__.py
1210
/home/travis/virtualenv/*
1311

1412
[report]

.dockerignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ dist
88
sqlite_rx.egg-info
99
.coveragerc
1010
docker_examples
11+
.coverage
12+
.pytest_cache
13+
.coverage

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ sqlite_rx.egg-info/
55
cover/
66
build/
77
dist/
8+
.coverage
9+
.pytest_cache
810
.coverage

.travis.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
language: python
2-
os:
3-
- linux
4-
python:
5-
- "3.6"
6-
- "3.7"
7-
- "3.8"
8-
- "pypy3"
2+
matrix:
3+
include:
4+
- os: linux
5+
python: 3.6
6+
- os: linux
7+
python: 3.7
8+
- os: linux
9+
python: 3.8
10+
- os: linux
11+
python: pypy3
12+
install:
13+
- pip install --upgrade pip
14+
- pip install pytest pytest-cov coverage coveralls
15+
- pip install -e .
916
script:
10-
- pip install nose
11-
- pip install coverage
12-
- pip install coveralls
13-
- python setup.py nosetests --with-coverage
14-
- coverage run --concurrency=multiprocessing -m unittest discover -s sqlite_rx/tests
17+
- coverage run -m pytest --verbose sqlite_rx/tests
18+
- coverage combine
1519
- coverage report -i -m
1620
- coveralls

README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,7 @@ def main():
5252
logging.config.dictConfig(get_default_logger_settings(logging.DEBUG))
5353
server = SQLiteServer(database=":memory:",
5454
bind_address="tcp://127.0.0.1:5000")
55-
try:
56-
server.start()
57-
except KeyboardInterrupt:
58-
server.stop()
59-
55+
server.start()
6056

6157
if __name__ == '__main__':
6258
main()

dockerfiles/Dockerfile_pypy3

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
FROM pypy:3-slim
2+
3+
RUN apt-get update
4+
RUN apt-get -y install g++
5+
RUN apt-get -y install libzmq3-dev
6+
7+
COPY . /sqlite_rx
8+
WORKDIR /sqlite_rx
9+
10+
RUN pypy3 -m pip install -r requirements.txt
11+
RUN pypy3 setup.py install

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
click
2-
msgpack-python
2+
msgpack
33
pyzmq
44
tornado

setup.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,9 @@ cover-package = sqlite_rx
66
cover-html = 1
77
tests = sqlite_rx/tests
88

9+
[coverage:run]
10+
branch = True
11+
concurrency = multiprocessing
12+
parallel = True
13+
source = sqlite_rx
914
[easy_install]

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
PACKAGES = ['sqlite_rx']
2222

23-
DEPENDENCIES = ['msgpack-python', 'pyzmq', 'tornado', 'click']
23+
DEPENDENCIES = ['msgpack', 'pyzmq', 'tornado', 'click']
2424

2525
classifiers = [
2626
'Development Status :: 4 - Beta',

sqlite_rx/__init__.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "0.9.98"
1+
__version__ = "0.9.99"
22
__author__ = "Abhishek Singh"
33
__authoremail__ = "[email protected]"
44

@@ -39,4 +39,8 @@ def get_default_logger_settings(level: str = "DEBUG"):
3939
'propagate': False
4040
},
4141
}
42-
}
42+
}
43+
44+
45+
def get_version():
46+
return __version__

0 commit comments

Comments
 (0)