Skip to content

Commit

Permalink
Update changelog and update __meta__
Browse files Browse the repository at this point in the history
  • Loading branch information
facelessuser committed Oct 22, 2022
1 parent 8bd4203 commit aeef097
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
1 change: 1 addition & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## 1.1.0

- **NEW**: Drop Python 3.6 and officially support 3.10.
- **NEW**: Cache emoji table to reduce build times.

## 1.0.3

Expand Down
19 changes: 11 additions & 8 deletions materialx/__meta__.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ class Version(namedtuple("Version", ["major", "minor", "micro", "release", "pre"
Version(1, 0, 0, "final") 1.0
Version(1, 2, 0, "final") 1.2
Version(1, 2, 3, "final") 1.2.3
Version(1, 2, 0, ".dev-alpha", pre=4) 1.2a4
Version(1, 2, 0, ".dev-beta", pre=4) 1.2b4
Version(1, 2, 0, ".dev-candidate", pre=4) 1.2rc4
Version(1, 2, 0, "alpha", pre=4) 1.2a4
Version(1, 2, 0, "beta", pre=4) 1.2b4
Version(1, 2, 0, "candidate", pre=4) 1.2rc4
Version(1, 2, 0, "final", post=1) 1.2.post1
Version(1, 2, 3, ".dev") 1.2.3.dev0
Version(1, 2, 3, ".dev", dev=1) 1.2.3.dev1
Expand Down Expand Up @@ -113,12 +113,12 @@ def __new__(cls, major, minor, micro, release="final", pre=0, post=0, dev=0):
elif dev:
raise ValueError("Version is not a development release.")

return super(Version, cls).__new__(cls, major, minor, micro, release, pre, post, dev)
return super().__new__(cls, major, minor, micro, release, pre, post, dev)

def _is_pre(self):
"""Is prerelease."""

return self.pre > 0
return bool(self.pre > 0)

def _is_dev(self):
"""Is development."""
Expand All @@ -128,7 +128,7 @@ def _is_dev(self):
def _is_post(self):
"""Is post."""

return self.post > 0
return bool(self.post > 0)

def _get_dev_status(self): # pragma: no cover
"""Get development status string."""
Expand All @@ -139,7 +139,7 @@ def _get_canonical(self):
"""Get the canonical output string."""

# Assemble major, minor, micro version and append `pre`, `post`, or `dev` if needed..
if self.micro == 0:
if self.micro == 0 and self.major != 0:
ver = "{}.{}".format(self.major, self.minor)
else:
ver = "{}.{}.{}".format(self.major, self.minor, self.micro)
Expand All @@ -153,11 +153,14 @@ def _get_canonical(self):
return ver


def parse_version(ver, pre=False):
def parse_version(ver):
"""Parse version into a comparable Version tuple."""

m = RE_VER.match(ver)

if m is None:
raise ValueError("'{}' is not a valid version".format(ver))

# Handle major, minor, micro
major = int(m.group('major'))
minor = int(m.group('minor')) if m.group('minor') else 0
Expand Down

0 comments on commit aeef097

Please sign in to comment.