Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace distutils.version.StrictVersion with packaging version #61

Merged
merged 1 commit into from
Oct 16, 2023
Merged

Replace distutils.version.StrictVersion with packaging version #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions libstempo/libstempo.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#cython: language_level=3

import os, sys, math, re, time
from distutils.version import StrictVersion
from packaging import version

import collections

Expand Down Expand Up @@ -617,7 +617,7 @@ def parse_tempo2version(s):
return string(s).split()[1]

def tempo2version():
return StrictVersion(parse_tempo2version(TEMPO2_VERSION))
return version.parse(parse_tempo2version(TEMPO2_VERSION))

# this is a Cython extension class; the benefit is that it can hold C attributes,
# but all attributes must be defined in the code
Expand Down Expand Up @@ -682,7 +682,7 @@ cdef class tempopulsar:

# tim rewriting is not needed with tempo2/readTimfile.C >= 1.22 (date: 2014/06/12 02:25:54),
# which follows relative paths; closest tempo2.h version is 1.90 (date: 2014/06/24 20:03:34)
if tempo2version() >= StrictVersion("1.90"):
if tempo2version() >= version.parse("1.90"):
self._readfiles(parfile,timfile)
else:
timfile = rewritetim(timfile)
Expand Down
Loading