Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
python-poetry
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open
python-poetry
Commits
8c610e1b
Commit
8c610e1b
authored
Jul 20, 2020
by
Arun Babu Neelicattu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
get-poetry: resolve merge error
parent
b626c87b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
1 deletions
+24
-1
get-poetry.py
+24
-1
No files found.
get-poetry.py
View file @
8c610e1b
...
...
@@ -449,6 +449,26 @@ class Installer:
break
current_version
=
None
if
os
.
path
.
exists
(
POETRY_LIB
):
with
open
(
os
.
path
.
join
(
POETRY_LIB
,
"poetry"
,
"__version__.py"
),
encoding
=
"utf-8"
)
as
f
:
version_content
=
f
.
read
()
current_version_re
=
re
.
match
(
'(?ms).*__version__ = "(.+)".*'
,
version_content
)
if
not
current_version_re
:
print
(
colorize
(
"warning"
,
"Unable to get the current Poetry version. Assuming None"
,
)
)
else
:
current_version
=
current_version_re
.
group
(
1
)
if
current_version
==
version
and
not
self
.
_force
:
print
(
"Latest version already installed."
)
return
None
,
current_version
...
...
@@ -637,6 +657,7 @@ class Installer:
if
match
and
tuple
(
map
(
int
,
match
.
groups
()))
>=
(
3
,
0
):
# favor the first py3 executable we can find.
return
executable
if
fallback
is
None
:
# keep this one as the fallback; it was the first valid executable we found.
fallback
=
executable
...
...
@@ -669,7 +690,9 @@ class Installer:
)
with
open
(
os
.
path
.
join
(
POETRY_BIN
,
"poetry"
),
"w"
,
encoding
=
"utf-8"
)
as
f
:
if
not
WINDOWS
:
if
WINDOWS
:
python_executable
=
"python"
f
.
write
(
u
(
"#!/usr/bin/env {}
\n
"
.
format
(
python_executable
)))
f
.
write
(
u
(
BIN
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment