Skip to content

Commit

Permalink
Merge pull request #812 from dandi/no-distutils
Browse files Browse the repository at this point in the history
Stop using distutils
  • Loading branch information
yarikoptic committed Nov 5, 2021
2 parents 365f08f + 693e8c2 commit 1e317cf
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
11 changes: 6 additions & 5 deletions dandi/pynwb_utils.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from collections import Counter
from distutils.version import LooseVersion
import os
import os.path as op
import re
Expand Down Expand Up @@ -73,8 +72,7 @@ def log(v): # does nothing
log(f"{msg} is not text which follows semver specification")

if isinstance(v, str) and not semantic_version.validate(v):
msgtype = "error" if LooseVersion(v) >= "2.1.0" else "warning"
log(f"{msgtype}: {msg} is not a proper semantic version. See http://semver.org")
log(f"error: {msg} is not a proper semantic version. See http://semver.org")

return v

Expand Down Expand Up @@ -276,8 +274,11 @@ def validate(path, devel_debug=False):
# Explicitly sanitize so we collect warnings.
# TODO: later cast into proper ERRORs
version = _sanitize_nwb_version(version, log=errors.append)
loosever = LooseVersion(version)
if loosever and loosever < "2.1.0":
try:
v = semantic_version.Version(version)
except ValueError:
v = None
if v is not None and v < semantic_version.Version("2.1.0"):
errors_ = errors[:]
errors = [e for e in errors if not re_ok_prior_210.search(str(e))]
if errors != errors_:
Expand Down
2 changes: 1 addition & 1 deletion versioneer.py
Original file line number Diff line number Diff line change
Expand Up @@ -1518,7 +1518,7 @@ def get_cmdclass():
cmds = {}

# we add "version" to both distutils and setuptools
from distutils.core import Command
from setuptools import Command

class cmd_version(Command):
description = "report generated version string"
Expand Down

0 comments on commit 1e317cf

Please sign in to comment.