Skip to content

Commit d22ab25

Browse files
authored
Second attempt on fairseq2n version handling (#881)
1 parent 51f6eb4 commit d22ab25

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

setup.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010

1111
version = "0.3.0.dev0"
1212

13-
fairseq2n_version = "0.3.0.dev0"
14-
1513
# If this is a local development install, allow nightly fairseq2n builds to
1614
# take precedence.
1715
if version.endswith(".dev0"):
18-
fairseq2n_version_spec = f">={fairseq2n_version},<={fairseq2n_version[:-5]}"
16+
fairseq2n_version_spec = f">={version},<={version[:-5]}"
1917
else:
20-
fairseq2n_version_spec = f"=={fairseq2n_version}"
18+
p = version.split("+", maxsplit=1)
19+
20+
fairseq2n_version_spec = "==" + p[0]
21+
2122

2223
setup(
2324
name="fairseq2",

tools/set-project-version.sh

-4
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@ if [[ $native_only != true ]]; then
8080
"s/^__version__ = \".*\"$/__version__ = \"$pep_ver\"/"
8181
fi
8282

83-
replace_match\
84-
"$base/setup.py"\
85-
"s/^fairseq2n_version = \".*\"$/fairseq2n_version = \"$pep_ver\"/"
86-
8783
# Update fairseq2n CMake project.
8884
replace_match\
8985
"$base/native/CMakeLists.txt"\

0 commit comments

Comments
 (0)