Skip to content

Commit

Permalink
setup: cleanup and fixes
Browse files Browse the repository at this point in the history
fix classifiers
remove obsolete imports and comments
set the description content type, remove description from setup.py

dependencies: remove python3.6 condition for gpg, lower versions of
python are no longer in use anyway
  • Loading branch information
wagner-intevation committed Jun 10, 2022
1 parent 683ff0b commit b3afd66
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 17 deletions.
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ url = https://github.com/intevation/intelmq-mailgen
license = AGPL-3.0-or-later and LGPL-2.1-or-later
license_file = COPYING
long_description = file: README.md
long_description_content_type = text/markdown
21 changes: 4 additions & 17 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,12 @@
"""

# Always prefer setuptools over distutils
from setuptools import setup, find_packages
from setuptools import setup
# To use a consistent encoding
from codecs import open
from os import path

here = path.abspath(path.dirname(__file__))

# Get the long description from the README file
with open(path.join(here, 'README.md'), encoding='utf-8') as f:
long_description = f.read()

setup(
name='intelmqmail',

Expand All @@ -22,7 +17,6 @@
version='1.3.0',

description='A mail sending module for IntelMQ',
long_description=long_description,

# The project's main homepage.
url='https://github.com/intevation/intelmq-mailgen',
Expand All @@ -37,8 +31,8 @@
# See https://pypi.python.org/pypi?%3Aaction=list_classifiers
classifiers=[
# Pick your license as you wish (should match "license" above)
'License :: OSI Approved :: GNU Affero General Public License v>=3.0',
'License :: OSI Approved :: GNU Lesser General Public License v>=2.1',
'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
'License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)',

'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
Expand All @@ -54,7 +48,7 @@

install_requires=[
'psycopg2',
'gpg >= "1.10"; python_version >= "3.6"', # /!\ can (probably) **not** be installed via pip
'gpg >= 1.10', # /!\ can (probably) **not** be installed via pip
# Additional requirements:
# * GnuPG (v>=2.2) for python3-gpg
# * (optional) pyxarf v>0.0.5 for python3 installed
Expand All @@ -63,13 +57,6 @@
# version 2502a80ae9178a1ba0b76106c800d0e4b779d8da shall work
],

# If there are data files included in your packages that need to be
# installed, specify them here. If using Python 2.6 or less, then these
# have to be included in MANIFEST.in as well.
# package_data={
# 'sample': ['package_data.dat'],
# },

entry_points={
'console_scripts': [
'intelmqcbmail = intelmqmail.cb:main',
Expand Down

0 comments on commit b3afd66

Please sign in to comment.