Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove obsolete, broken pyandoc usage #27

Merged
merged 2 commits into from
Sep 27, 2024
Merged

Remove obsolete, broken pyandoc usage #27

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd3c883
fix: Remove obsolete, broken pyandoc usage
jikamens Sep 26, 2024
02b199e
fix: Bump version to 0.2.2.
jikamens Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,11 @@

from setuptools import setup

LONG_DESCRIPTION = None
README_MARKDOWN = None

with open('README.md') as markdown_source:
README_MARKDOWN = markdown_source.read()

try:
import pandoc
pandoc.core.PANDOC_PATH = 'pandoc'
# Converts the README.md file to ReST, since PyPI uses ReST for formatting,
# This allows to have one canonical README file, being the README.md
doc = pandoc.Document()
doc.markdown = README_MARKDOWN
LONG_DESCRIPTION = doc.rst
except ImportError:
# If pandoc isn't installed, e.g. when downloading from pip,
# just use the regular README.
LONG_DESCRIPTION = README_MARKDOWN

def load_requirements(*requirements_paths):
"""
Load all requirements from the specified requirements files.
Expand Down Expand Up @@ -63,15 +49,15 @@ def is_requirement(line):
version='0.2.1',
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This generally looks good. @jikamens can you bump this version as well so we can do a new release?

description='Proxy around MongoDB connection that automatically handles AutoReconnect exceptions.',
author='Gustav Arngarden',
long_description=LONG_DESCRIPTION,
long_description=README_MARKDOWN,
long_description_content_type='text/markdown',
classifiers=[
'License :: OSI Approved :: Apache Software License',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.8',
],
setup_requires=['pyandoc'],
install_requires=load_requirements('requirements/base.in'),
url="https://github.com/arngarden/MongoDBProxy"
)
Loading