Skip to content

Commit

Permalink
Merge pull request #636 from genn-team/remove_deprecated_distutils
Browse files Browse the repository at this point in the history
Fix deprecation
  • Loading branch information
neworderofjamie authored Aug 30, 2024
2 parents bb8609b + 3c210d1 commit 1bb140f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
5 changes: 2 additions & 3 deletions pygenn/genn_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
CustomUpdateMixin, CustomUpdateWUMixin,
NeuronGroupMixin, SynapseGroupMixin)

from distutils.spawn import find_executable
from importlib import import_module
from os import path, environ
from platform import system
from psutil import cpu_count
from setuptools import msvc
from shutil import which
from subprocess import check_call # to call make
from textwrap import dedent
from warnings import warn
Expand Down Expand Up @@ -83,8 +83,7 @@
# Find MSBuild in path
# **NOTE** we need to do this because setting the path via
# check_call's env kwarg does not effect finding the executable
# **NOTE** shutil.which would be nicer, but isn't in Python < 3.3
_msbuild = find_executable("msbuild", _msvc_env["PATH"])
_msbuild = which("msbuild", path=_msvc_env["PATH"])

# If Python version is newer than 3.8 and CUDA path is in environment
if sys.version_info >= (3, 8) and "CUDA_PATH" in environ:
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,8 @@
zip_safe=False,
python_requires=">=3.6",
install_requires=["numpy>=1.17", "psutil",
"importlib-metadata>=1.0;python_version<'3.8'"],
"importlib-metadata>=1.0;python_version<'3.8'",
"setuptools<74.0"],
extras_require={
"doc": ["sphinx", "sphinx-gallery", "sphinx-argparse"],
"userproject": ["mnist", "tqdm", "scipy", "matplotlib"],
Expand Down

0 comments on commit 1bb140f

Please sign in to comment.