Skip to content

Commit e53b7ff

Browse files
committed
minor doc improvements
1 parent dd397c4 commit e53b7ff

File tree

3 files changed

+15
-20
lines changed

3 files changed

+15
-20
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,4 +174,3 @@ Tests are run using tox. Simply install it and run:
174174
tox
175175

176176
And that's all.
177-

setup.py

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,23 @@ def get_version(version_tuple):
1818
VERSION = get_version(eval(version_line.split('=')[-1]))
1919

2020
INSTALL_REQUIRES = []
21-
22-
try:
23-
from pypandoc import convert
24-
25-
def read_md(f):
26-
return convert(f, 'rst')
27-
28-
except ImportError:
29-
convert = None
30-
print(
31-
"warning: pypandoc module not found, could not convert Markdown to RST"
32-
)
33-
34-
def read_md(f):
35-
return open(f, 'r').read() # noqa
36-
3721
README = os.path.join(os.path.dirname(__file__), 'README.md')
3822
PACKAGES = find_packages('src')
3923
PACKAGE_DIR = {'': 'src'}
4024

25+
26+
def readme():
27+
return open(README, 'r').read() # noqa
28+
29+
4130
setup(
4231
name='solrq',
4332
version=VERSION,
4433
author='Michał Jaworski',
4534
author_email='swistakm@gmail.com',
4635
description='Python Solr query utility',
47-
long_description=read_md(README),
36+
long_description=readme(),
37+
long_description_content_type='text/markdown',
4838

4939
packages=PACKAGES,
5040
package_dir=PACKAGE_DIR,
@@ -68,6 +58,12 @@ def read_md(f):
6858
'Programming Language :: Python :: 3.3',
6959
'Programming Language :: Python :: 3.4',
7060
'Programming Language :: Python :: 3.5',
61+
'Programming Language :: Python :: 3.6',
62+
'Programming Language :: Python :: 3.7',
63+
'Programming Language :: Python :: 3.8',
64+
'Programming Language :: Python :: 3.9',
65+
'Programming Language :: Python :: 3.10',
66+
'Programming Language :: Python :: 3.11',
7167
'Programming Language :: Python :: Implementation :: PyPy',
7268
'Topic :: Internet :: WWW/HTTP :: Indexing/Search',
7369
],

src/solrq/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
VERSION = (1, 1, 1) # PEP 386 # noqa
2+
VERSION = (1, 1, 2) # PEP 386 # noqa
33
__version__ = ".".join([str(x) for x in VERSION]) # noqa
44

55
import re # noqa: E402
@@ -75,7 +75,7 @@ def __init__(self, raw, safe=False):
7575
elif isinstance(raw, timedelta) and not safe:
7676
# Make representation compatibile with Solr Date Math Syntax
7777
# Note: at first look this can look weird since it can produce
78-
# strings with mixed singn for negative deltas e.g:
78+
# strings with mixed sign for negative deltas e.g:
7979
#
8080
# >>> Value(-timedelta(days=2, hours=2))
8181
# <Value: NOW-3DAYS+79200SECONDS+0MILLISECONDS>

0 commit comments

Comments
 (0)