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
76801fd2
Unverified
Commit
76801fd2
authored
Oct 18, 2018
by
Sébastien Eustace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the —no-dev option in install not working properly
parent
475c6572
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
117 additions
and
8 deletions
+117
-8
CHANGELOG.md
+7
-0
poetry/installation/installer.py
+8
-7
poetry/packages/package.py
+1
-1
tests/installation/fixtures/install-no-dev.test
+32
-0
tests/installation/test_installer.py
+69
-0
No files found.
CHANGELOG.md
View file @
76801fd2
# Change Log
# Change Log
## [Unreleased]
### Fixed
-
Fixed the
`--no-dev`
option in
`install`
not working properly.
## [0.12.2] - 2018-10-17
## [0.12.2] - 2018-10-17
### Fixed
### Fixed
...
...
poetry/installation/installer.py
View file @
76801fd2
...
@@ -182,7 +182,12 @@ class Installer:
...
@@ -182,7 +182,12 @@ class Installer:
self
.
_populate_local_repo
(
local_repo
,
ops
,
locked_repository
)
self
.
_populate_local_repo
(
local_repo
,
ops
,
locked_repository
)
with
self
.
_package
.
with_python_versions
(
root
=
self
.
_package
if
not
self
.
is_dev_mode
():
root
=
root
.
clone
()
del
root
.
dev_requires
[:]
with
root
.
with_python_versions
(
"."
.
join
([
str
(
i
)
for
i
in
self
.
_env
.
version_info
[:
3
]])
"."
.
join
([
str
(
i
)
for
i
in
self
.
_env
.
version_info
[:
3
]])
):
):
# We resolve again by only using the lock file
# We resolve again by only using the lock file
...
@@ -205,11 +210,7 @@ class Installer:
...
@@ -205,11 +210,7 @@ class Installer:
whitelist
.
append
(
pkg
.
name
)
whitelist
.
append
(
pkg
.
name
)
solver
=
Solver
(
solver
=
Solver
(
self
.
_package
,
root
,
pool
,
self
.
_installed_repository
,
locked_repository
,
NullIO
()
pool
,
self
.
_installed_repository
,
locked_repository
,
NullIO
(),
)
)
ops
=
solver
.
solve
(
use_latest
=
whitelist
)
ops
=
solver
.
solve
(
use_latest
=
whitelist
)
...
@@ -482,7 +483,7 @@ class Installer:
...
@@ -482,7 +483,7 @@ class Installer:
op
.
skip
(
"Not required"
)
op
.
skip
(
"Not required"
)
# If the package is a dev package and dev packages
# If the package is a dev package and dev packages
# are not request
s
, we skip it
# are not request
ed
, we skip it
if
package
.
category
==
"dev"
and
not
self
.
is_dev_mode
():
if
package
.
category
==
"dev"
and
not
self
.
is_dev_mode
():
op
.
skip
(
"Dev dependencies not requested"
)
op
.
skip
(
"Dev dependencies not requested"
)
...
...
poetry/packages/package.py
View file @
76801fd2
...
@@ -363,7 +363,7 @@ class Package(object):
...
@@ -363,7 +363,7 @@ class Package(object):
self
.
python_versions
=
original_python_versions
self
.
python_versions
=
original_python_versions
def
clone
(
self
):
# type: () -> Package
def
clone
(
self
):
# type: () -> Package
clone
=
Package
(
self
.
pretty_name
,
self
.
version
)
clone
=
self
.
__class__
(
self
.
pretty_name
,
self
.
version
)
clone
.
category
=
self
.
category
clone
.
category
=
self
.
category
clone
.
optional
=
self
.
optional
clone
.
optional
=
self
.
optional
clone
.
python_versions
=
self
.
python_versions
clone
.
python_versions
=
self
.
python_versions
...
...
tests/installation/fixtures/install-no-dev.test
0 → 100644
View file @
76801fd2
[[
package
]]
name
=
"A"
version
=
"1.0"
description
=
""
category
=
"main"
optional
=
false
python
-
versions
=
"*"
[[
package
]]
name
=
"B"
version
=
"1.1"
description
=
""
category
=
"main"
optional
=
false
python
-
versions
=
"*"
[[
package
]]
name
=
"C"
version
=
"1.2"
description
=
""
category
=
"dev"
optional
=
false
python
-
versions
=
"*"
[
metadata
]
python
-
versions
=
"*"
content
-
hash
=
"123456789"
[
metadata
.
hashes
]
"A"
=
[]
"B"
=
[]
"C"
=
[]
tests/installation/test_installer.py
View file @
76801fd2
...
@@ -228,6 +228,75 @@ def test_run_update_after_removing_dependencies(
...
@@ -228,6 +228,75 @@ def test_run_update_after_removing_dependencies(
assert
len
(
removals
)
==
1
assert
len
(
removals
)
==
1
def
test_run_install_no_dev
(
installer
,
locker
,
repo
,
package
,
installed
):
locker
.
locked
(
True
)
locker
.
mock_lock_data
(
{
"package"
:
[
{
"name"
:
"A"
,
"version"
:
"1.0"
,
"category"
:
"main"
,
"optional"
:
False
,
"platform"
:
"*"
,
"python-versions"
:
"*"
,
"checksum"
:
[],
},
{
"name"
:
"B"
,
"version"
:
"1.1"
,
"category"
:
"main"
,
"optional"
:
False
,
"platform"
:
"*"
,
"python-versions"
:
"*"
,
"checksum"
:
[],
},
{
"name"
:
"C"
,
"version"
:
"1.2"
,
"category"
:
"dev"
,
"optional"
:
False
,
"platform"
:
"*"
,
"python-versions"
:
"*"
,
"checksum"
:
[],
},
],
"metadata"
:
{
"python-versions"
:
"*"
,
"platform"
:
"*"
,
"content-hash"
:
"123456789"
,
"hashes"
:
{
"A"
:
[],
"B"
:
[],
"C"
:
[]},
},
}
)
package_a
=
get_package
(
"A"
,
"1.0"
)
package_b
=
get_package
(
"B"
,
"1.1"
)
package_c
=
get_package
(
"C"
,
"1.2"
)
repo
.
add_package
(
package_a
)
repo
.
add_package
(
package_b
)
repo
.
add_package
(
package_c
)
installed
.
add_package
(
package_a
)
installed
.
add_package
(
package_b
)
installed
.
add_package
(
package_c
)
package
.
add_dependency
(
"A"
,
"~1.0"
)
package
.
add_dependency
(
"B"
,
"~1.1"
)
package
.
add_dependency
(
"C"
,
"~1.2"
,
category
=
"dev"
)
installer
.
dev_mode
(
False
)
installer
.
run
()
installs
=
installer
.
installer
.
installs
assert
len
(
installs
)
==
0
updates
=
installer
.
installer
.
updates
assert
len
(
updates
)
==
0
removals
=
installer
.
installer
.
removals
assert
len
(
removals
)
==
1
def
test_run_whitelist_add
(
installer
,
locker
,
repo
,
package
):
def
test_run_whitelist_add
(
installer
,
locker
,
repo
,
package
):
locker
.
locked
(
True
)
locker
.
locked
(
True
)
locker
.
mock_lock_data
(
locker
.
mock_lock_data
(
...
...
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