From 7f5ce4336ab78f680123f68621238b1c2cc90fa6 Mon Sep 17 00:00:00 2001
From: Sergio Zharinov <zharinov@users.noreply.github.com>
Date: Fri, 26 Jun 2020 00:53:18 +0400
Subject: [PATCH] fix(poetry): Fix range unions (#6587)
---
lib/versioning/poetry/index.spec.ts | 10 ++++++++++
lib/versioning/poetry/index.ts | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/lib/versioning/poetry/index.spec.ts b/lib/versioning/poetry/index.spec.ts
index b6d0f96a60..94862bfad4 100644
--- a/lib/versioning/poetry/index.spec.ts
+++ b/lib/versioning/poetry/index.spec.ts
@@ -457,4 +457,14 @@ describe('semver.getNewValue()', () => {
})
).toEqual('~2');
});
+ it('widens range', () => {
+ expect(
+ semver.getNewValue({
+ currentValue: '^2.2',
+ rangeStrategy: 'widen',
+ fromVersion: '2.2.0',
+ toVersion: '3.0.0',
+ })
+ ).toEqual('^2.2 || ^3.0.0');
+ });
});
diff --git a/lib/versioning/poetry/index.ts b/lib/versioning/poetry/index.ts
index 898184883e..19adea10d4 100644
--- a/lib/versioning/poetry/index.ts
+++ b/lib/versioning/poetry/index.ts
@@ -40,7 +40,7 @@ function npm2poetry(input: string): string {
res.splice(i, 2, newValue);
}
}
- return res.join(', ');
+ return res.join(', ').replace(/\s*,?\s*\|\|\s*,?\s*/, ' || ');
}
const isLessThanRange = (version: string, range: string): boolean =>
--
GitLab