Skip to content

Commit a1e5488

Browse files
authored
Merge pull request #299 from python-injector/prepare-for-release
Prepare for the release of 0.23.0
2 parents b50060c + 183cbd7 commit a1e5488

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ importlib-metadata==7.0.0
88
iniconfig==2.0.0
99
mypy==1.7.1 ; implementation_name == "cpython"
1010
mypy-extensions==1.0.0
11-
packaging==23.2
11+
packaging==25.0
1212
pathspec==0.12.1
1313
platformdirs==4.1.0
1414
pluggy==1.3.0

requirements-docs.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ idna==3.7
99
imagesize==1.4.1
1010
jinja2==3.1.6
1111
markupsafe==2.1.3
12-
packaging==23.2
12+
packaging==25.0
1313
pygments==2.17.2
1414
requests==2.32.4
1515
snowballstemmer==2.2.0

setup.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
def obtain_requirements(file_name):
1010
with open(file_name) as fd_in:
1111
for line in fd_in:
12-
if '#' not in line:
13-
yield line.strip()
12+
line = line.split('#')[0]
13+
line = line.strip()
14+
if line:
15+
yield line
1416

1517

1618
class PyTest(Command):
@@ -46,14 +48,8 @@ def read_injector_variable(name):
4648
requirements_dev = list(obtain_requirements('requirements-dev.txt'))
4749

4850

49-
try:
50-
import pypandoc
51-
52-
long_description = pypandoc.convert_file('README.md', 'rst')
53-
except ImportError:
54-
warnings.warn('Could not locate pandoc, using Markdown long_description.', ImportWarning)
55-
with open('README.md') as f:
56-
long_description = f.read()
51+
with open('README.md') as f:
52+
long_description = f.read()
5753

5854
description = long_description.splitlines()[0].strip()
5955

@@ -66,6 +62,7 @@ def read_injector_variable(name):
6662
options=dict(egg_info=dict(tag_build=version_tag)),
6763
description=description,
6864
long_description=long_description,
65+
long_description_content_type='text/markdown',
6966
license='BSD',
7067
platforms=['any'],
7168
packages=['injector'],

0 commit comments

Comments
 (0)