Merge pull request #123 from blink1073/remove-distutils

Author: blink1073

jupyter_packaging/setupbase.py

@@ -12,6 +12,7 @@
 from os.path import join as pjoin
 from pathlib import Path
 import io
+import logging
 import os
 import functools
 import pipes
@@ -27,17 +28,13 @@
     # shim deprecated to allow setuptools to find the version string in this file
     deprecated = lambda *args, **kwargs: lambda *args, **kwargs: None
 
-# BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
-# update it when the contents of directories change.
 if os.path.exists('MANIFEST'): os.remove('MANIFEST')
 
 from packaging.version import VERSION_PATTERN
 from setuptools import Command
 from setuptools.command.build_py import build_py
 from setuptools.config import StaticModule
 
-# Note: distutils must be imported after setuptools
-from distutils import log
 
 from setuptools.command.sdist import sdist
 from setuptools.command.develop import develop
@@ -65,6 +62,8 @@ def list2cmdline(cmd_list):
 VERSION_REGEX = re.compile(r"^\s*" + VERSION_PATTERN + r"\s*$", re.VERBOSE | re.IGNORECASE)
 
 
+log = logging.getLogger(__name__)
+
 if "--skip-npm" in sys.argv:
     print("Skipping npm install as requested.")
     skip_npm = True

setup.cfg

@@ -29,7 +29,7 @@ python_requires = >=3.7
 install_requires =
     packaging
     tomlkit
-    setuptools>=46.4.0
+    setuptools>=60.2.0
     wheel
     deprecation
 

tests/utils.py

@@ -13,7 +13,7 @@ def mock_dist():
     ))
 
 def run_command(cmd):
-    """Run a distutils/setuptools Command """
+    """Run a setuptools Command """
     dist = mock_dist()
     instance = cmd(dist)
     instance.initialize_options()