summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2018-12-20 19:12:32 -0800
committerJon Dufresne <jon.dufresne@gmail.com>2018-12-22 09:05:05 -0800
commitb0310f8d52f8cb25ce3990e8130e1ed0250f20c1 (patch)
treedd15deeeb9d05315bd985df914e42e555eb9cb3a
parentdf1bf408c5709478a6e30186a9ce70d55e4f2488 (diff)
downloadpyparsing-git-b0310f8d52f8cb25ce3990e8130e1ed0250f20c1.tar.gz
Remove distutils fallback and outdated comment
setuptools includes a vendored version of pyparsing (and other dependencies). They are not install through traditional tools. Therefore, distutils is not required as fallback to facilitate setuptools. https://github.com/pypa/setuptools/blob/v40.6.3/setuptools/_vendor/pyparsing.py The Python documentation recommends against using distutils: https://docs.python.org/3/library/distutils.html > Most Python users will not want to use this module directly, but > instead use the cross-version tools maintained by the Python Packaging > Authority. In particular, setuptools is an enhanced alternative to > distutils that provides ... Also remove the unused imports.
-rw-r--r--CHANGES3
-rw-r--r--setup.py13
2 files changed, 5 insertions, 11 deletions
diff --git a/CHANGES b/CHANGES
index 1cd7263..ec877d8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -26,6 +26,9 @@ Version 2.3.1 -
for running tests that do additional validation or processing on the parsed
results.
+- Removed distutils fallback in setup.py. If installing the package fails,
+ please update to the latest version of setuptools.
+
Version 2.3.0 - October, 2018
-----------------------------
diff --git a/setup.py b/setup.py
index 5e5c69a..89ad68b 100644
--- a/setup.py
+++ b/setup.py
@@ -2,18 +2,9 @@
"""Setup script for the pyparsing module distribution."""
-# Setuptools depends on pyparsing (via packaging) as of version 34, so allow
-# installing without it to avoid bootstrap problems.
-try:
- from setuptools import setup
-except ImportError:
- from distutils.core import setup
-
-import sys
-import os
-
+from setuptools import setup
from pyparsing import __version__ as pyparsing_version
-
+
modules = ["pyparsing",]
setup(# Distribution meta-data