Skip to content

Commit

Permalink
Bump version to 3.0 since Python 2 is no longer supported; use setup.cfg
Browse files Browse the repository at this point in the history
configuration file to declutter setup.py.
  • Loading branch information
anthony-tuininga committed Jan 30, 2021
1 parent 387ef84 commit e0014fb
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 32 deletions.
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright � 2007-2010, Anthony Tuininga.
Copyright � 2007-2021, Anthony Tuininga.
Copyright � 2004-2007, Computronix (Canada) Ltd., Edmonton, Alberta, Canada.
All rights reserved.

Expand Down
4 changes: 2 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include MANIFEST.in
include *.h
include *.txt
recursive-include html *.css *.html *.png
recursive-include src *.h *.c
recursive-include doc *.rst
4 changes: 2 additions & 2 deletions doc/src/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
# other places throughout the built documents.
#
# The short X.Y version.
version = '2.2'
version = '3.0'
# The full version, including alpha/beta/rc tags.
release = '2.2'
release = '3.0'

# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
Expand Down
2 changes: 1 addition & 1 deletion doc/src/license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ License

.. centered:: **LICENSE AGREEMENT FOR CX_LOGGING**

Copyright |copy| 2007-2018, Anthony Tuininga. All rights reserved.
Copyright |copy| 2007-2021, Anthony Tuininga. All rights reserved.

Copyright |copy| 2004-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
Canada. All rights reserved.
Expand Down
7 changes: 7 additions & 0 deletions doc/src/releasenotes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
cx_Logging Release Notes
========================

Version 3.0 (January 2021)
--------------------------

#) Support is now for Python 3.6 and higher.
#) Fix source package to include header files.


Version 2.2 (July 2018)
-----------------------

Expand Down
20 changes: 20 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[metadata]
name = cx_Logging
description = Python and C interfaces for logging
long_description = Python and C interfaces for logging
author = Anthony Tuininga
author_email = anthony.tuininga@gmail.com
url = http://cx-logging.sourceforge.net
keywords = logging
license = Python Software Foundation License
python_requires = >=3.6
classifiers =
Development Status :: 5 - Production/Stable
Intended Audience :: Developers
License :: OSI Approved :: Python Software Foundation License
Natural Language :: English
Operating System :: OS Independent
Programming Language :: C
Programming Language :: Python
Topic :: Software Development :: Libraries :: Python Modules
Topic :: Utilities
27 changes: 1 addition & 26 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from distutils.core import setup
from distutils.extension import Extension

BUILD_VERSION = "2.2"
BUILD_VERSION = "3.0"

# define class to ensure that linking against the library works for normal
# C programs while maintaining the name that Python expects
Expand Down Expand Up @@ -98,19 +98,6 @@ def run(self):
("BUILD_VERSION", BUILD_VERSION)
]

# define the classifiers for the project
classifiers = [
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"License :: OSI Approved :: Python Software Foundation License",
"Natural Language :: English",
"Operating System :: OS Independent",
"Programming Language :: C",
"Programming Language :: Python",
"Topic :: Software Development :: Libraries :: Python Modules",
"Topic :: Utilities"
]

exportSymbols = [
"StartLogging",
"StartLoggingEx",
Expand Down Expand Up @@ -171,19 +158,7 @@ def run(self):

# perform the setup
setup(
name = "cx_Logging",
cmdclass = dict(build_ext = build_ext, install_data = install_data),
version = BUILD_VERSION,
description = "Python and C interfaces for logging",
data_files = [ ("cx_Logging-doc", ["LICENSE.txt", "README.txt"]) ],
long_description = "Python and C interfaces for logging",
author = "Anthony Tuininga",
author_email = "anthony.tuininga@gmail.com",
maintainer = "Anthony Tuininga",
maintainer_email = "anthony.tuininga@gmail.com",
url = "http://cx-logging.sourceforge.net",
keywords = "logging",
classifiers = classifiers,
license = "Python Software Foundation License",
ext_modules = [extension])

0 comments on commit e0014fb

Please sign in to comment.