@@ -166,51 +166,28 @@ def delete(self):
166
166
class Version (NamedTuple ):
167
167
"""Support functions for version numbers.
168
168
169
- >>> v = Version.from_string("3.8.2-xyz", datetime.date(2022, 8, 1) )
170
- >>> v.short
169
+ >>> v = Version.from_string("3.8.2-xyz")
170
+ >>> v.string
171
171
'3.8.2-xyz'
172
- >>> v.full
173
- '3.8.2.40801-xyz'
174
- >>> v.comment
175
- 'Version 3.8.2, year 2018+4, month 8, day 1.'
176
172
"""
177
173
178
174
VERSION_NUMBER_PATTERN = re .compile ("^(?P<prefix>[0-9]+[.][0-9]+[.][0-9]+)(?P<identifier>-.+)?$" )
179
175
180
176
main : str # Main version number (1.2.3)
181
- date : datetime .date # Release date
182
177
identifier : str # Optional marker ("alpha")
183
178
184
179
@classmethod
185
- def from_string (cls , vernum : str , date : Optional [ datetime . date ] = None ) -> Optional ["Version" ]:
180
+ def from_string (cls , vernum : str ) -> Optional ["Version" ]:
186
181
"""Parse a short version string into a `Version` object."""
187
182
if m := cls .VERSION_NUMBER_PATTERN .match (vernum ):
188
183
prefix , identifier = m .group ("prefix" , "identifier" )
189
- date = date or datetime .date .today ()
190
- return Version (prefix , date , identifier or "" )
184
+ return Version (prefix , identifier or "" )
191
185
return None
192
186
193
187
@property
194
- def year_delta (self ):
195
- return self .date .year - 2018
196
-
197
- @property
198
- def short (self ):
188
+ def string (self ):
199
189
return f"{ self .main } { self .identifier } "
200
190
201
- @property
202
- def timestamp (self ):
203
- return str ((self .year_delta * 100 + self .date .month ) * 100 + self .date .day )
204
-
205
- @property
206
- def full (self ):
207
- return f"{ self .main } .{ self .timestamp } { self .identifier } "
208
-
209
- @property
210
- def comment (self ):
211
- return (f"Version { self .main } , year 2018+{ self .year_delta } , " +
212
- f"month { self .date .month } , day { self .date .day } ." )
213
-
214
191
class Release :
215
192
REMOTE = "origin"
216
193
NEWSFRAGMENTS_PATH = "docs/dev/news"
@@ -316,9 +293,7 @@ def _update_build_props_file(self) -> None:
316
293
tail = version_element .tail
317
294
version_element .clear ()
318
295
version_element .tail = tail
319
- version_element .text = vernum .full
320
- comment = ElementTree .Comment (vernum .comment )
321
- version_element .append (comment )
296
+ version_element .text = vernum .string
322
297
xml .write (self .build_props_path , encoding = "utf-8" )
323
298
324
299
def _create_release_branch (self ):
0 commit comments