Skip to content

Commit

Permalink
Make ready for PiPY
Browse files Browse the repository at this point in the history
  • Loading branch information
eblade committed Jul 29, 2019
1 parent b57f3e0 commit 6464f2a
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 16 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ __pycache__
*.sw?
.cache
*.egg-info
dist
build
10 changes: 5 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Installation

You can `pip` (python 3) install this Github repository or a tag, like this:

$pip install https://github.com/eblade/jsondb/archive/0.2.tar.gz
$pip install lindh-jsondb


This will also install `blist` which is used to get the views faster.
Expand All @@ -41,7 +41,7 @@ To create a new database (a table if you think in relation database terms):

.. code:: python
>>> from jsondb import Database
>>> from lindh.jsondb import Database
>>> db = Database('/tmp/cars')
>>> db.clear() # for doctest purposes
Expand Down Expand Up @@ -80,7 +80,7 @@ looks like when it comes back:
As you can see, the structure closely mimic that of CouchDB, with the
``_id`` and ``_rev`` fields. The ``_rev`` field is important to keep intact
as updated requires it to be the latest (otherwise a ``jsondb.Conflict``
as updated requires it to be the latest (otherwise a ``lindh.jsondb.Conflict``
is raised). To update, it's quite easy to use save (but index-based
setting also works):

Expand Down Expand Up @@ -189,7 +189,7 @@ Further Reading
examples. Look into ``images6/system.py`` for instance to see how
the views are set up.

- Also the lib works quite well together with its sister, ``jsonobject``
- Also the lib works quite well together with its sister, ``lindh-jsonobject``
which is a Django-inspired serialization/deserialization lib for
complex python objects and json. It can be found here:
https://github.com/eblade/jsonobject.
Expand All @@ -198,4 +198,4 @@ Further Reading
Author
------

``jsondb`` is written and maintained by Johan Egneblad <[email protected]>.
``lindh.jsondb`` is written and maintained by Johan Egneblad <[email protected]>.
File renamed without changes.
File renamed without changes.
22 changes: 14 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,23 @@

from setuptools import setup

name_ = 'jsondb'
version_ = '0.2.0'
name_ = 'lindh-jsondb'
github_name = 'jsondb'
version_ = '0.3.0'
packages_ = [
'jsondb',
'lindh.jsondb',
]

with open("README.rst", "r") as fh:
long_description = fh.read()


classifiers = [
"Programming Language :: Python :: 3",
"Operating System :: OS Independent",
"Development Status :: 4 - Beta",
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Operating System :: POSIX",
"Operating System :: POSIX :: Linux",
"Programming Language :: Python :: 3",
]

setup(
Expand All @@ -24,10 +28,12 @@
author='Johan Egneblad',
author_email='[email protected]',
description='JSON based document database',
long_description=long_description,
long_description_content_type="text/x-rst",
license="MIT",
url='https://github.com/eblade/'+name_,
url='https://github.com/eblade/'+github_name,
download_url=('https://github.com/eblade/%s/archive/v%s.tar.gz'
% (name_, version_)),
% (github_name, version_)),
packages=packages_,
install_requires=[
"blist>=1.3.6",
Expand Down
2 changes: 1 addition & 1 deletion tests/test_basic.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import pytest
import logging
import tempfile
import jsondb
from lindh import jsondb


# Logging
Expand Down
2 changes: 1 addition & 1 deletion tests/test_comparable.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pytest
from jsondb import Comparable
from lindh.jsondb import Comparable


@pytest.mark.parametrize('a,b,expected', [
Expand Down
2 changes: 1 addition & 1 deletion tests/test_csv.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from jsondb import csv
from lindh.jsondb import csv


def test_read_csv():
Expand Down

0 comments on commit 6464f2a

Please sign in to comment.