Skip to content

Commit 6464f2a

Browse files
committed
Make ready for PiPY
1 parent b57f3e0 commit 6464f2a

File tree

8 files changed

+24
-16
lines changed

8 files changed

+24
-16
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ __pycache__
55
*.sw?
66
.cache
77
*.egg-info
8+
dist
9+
build

README.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Installation
2727

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

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

3232

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

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

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

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

201-
``jsondb`` is written and maintained by Johan Egneblad <[email protected]>.
201+
``lindh.jsondb`` is written and maintained by Johan Egneblad <[email protected]>.
File renamed without changes.
File renamed without changes.

setup.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,23 @@
33

44
from setuptools import setup
55

6-
name_ = 'jsondb'
7-
version_ = '0.2.0'
6+
name_ = 'lindh-jsondb'
7+
github_name = 'jsondb'
8+
version_ = '0.3.0'
89
packages_ = [
9-
'jsondb',
10+
'lindh.jsondb',
1011
]
1112

13+
with open("README.rst", "r") as fh:
14+
long_description = fh.read()
15+
16+
1217
classifiers = [
18+
"Programming Language :: Python :: 3",
19+
"Operating System :: OS Independent",
1320
"Development Status :: 4 - Beta",
1421
"Intended Audience :: Developers",
1522
"License :: OSI Approved :: MIT License",
16-
"Operating System :: POSIX",
17-
"Operating System :: POSIX :: Linux",
18-
"Programming Language :: Python :: 3",
1923
]
2024

2125
setup(
@@ -24,10 +28,12 @@
2428
author='Johan Egneblad',
2529
author_email='[email protected]',
2630
description='JSON based document database',
31+
long_description=long_description,
32+
long_description_content_type="text/x-rst",
2733
license="MIT",
28-
url='https://github.com/eblade/'+name_,
34+
url='https://github.com/eblade/'+github_name,
2935
download_url=('https://github.com/eblade/%s/archive/v%s.tar.gz'
30-
% (name_, version_)),
36+
% (github_name, version_)),
3137
packages=packages_,
3238
install_requires=[
3339
"blist>=1.3.6",

tests/test_basic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import pytest
22
import logging
33
import tempfile
4-
import jsondb
4+
from lindh import jsondb
55

66

77
# Logging

tests/test_comparable.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import pytest
2-
from jsondb import Comparable
2+
from lindh.jsondb import Comparable
33

44

55
@pytest.mark.parametrize('a,b,expected', [

tests/test_csv.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from jsondb import csv
1+
from lindh.jsondb import csv
22

33

44
def test_read_csv():

0 commit comments

Comments
 (0)