Merge branch 'master' into merge-master-into-develop

# Conflicts:
#	CHANGELOG.md
#	poetry/__version__.py
#	poetry/packages/dependency.py
#	poetry/version/markers.py
#	pyproject.toml
#	tests/packages/test_dependency.py
#	tests/packages/test_main.py

CHANGELOG.md

@@ -15,6 +15,14 @@ This release **must** be downloaded via the `get-poetry.py` script and not via t
 - The exceptions are now beautifully displayed in the terminal with various level of details depending on the verbosity ([2230](https://github.com/python-poetry/poetry/pull/2230)).
 - The exceptions are now beautifully displayed in the terminal with various level of details depending on the verbosity ([2230](https://github.com/python-poetry/poetry/pull/2230)).
 
 
 
 
+## [1.0.9] - 2010-06-09
+
+### Fixed
+
+- Fixed an issue where packages from custom indices where continuously updated ([#2525](https://github.com/python-poetry/poetry/pull/2525)).
+- Fixed errors in the way Python environment markers were parsed and generated ([#2526](https://github.com/python-poetry/poetry/pull/2526)).
+
+
 ## [1.0.8] - 2020-06-05
 ## [1.0.8] - 2020-06-05
 
 
 ### Fixed
 ### Fixed
@@ -876,6 +884,7 @@ Initial release
 
 
 [Unreleased]: https://github.com/python-poetry/poetry/compare/1.1.0a1...develop
 [Unreleased]: https://github.com/python-poetry/poetry/compare/1.1.0a1...develop
 [1.1.0a1]: https://github.com/python-poetry/poetry/releases/tag/1.1.0a1
 [1.1.0a1]: https://github.com/python-poetry/poetry/releases/tag/1.1.0a1
+[1.0.9]: https://github.com/python-poetry/poetry/releases/tag/1.0.9
 [1.0.8]: https://github.com/python-poetry/poetry/releases/tag/1.0.8
 [1.0.8]: https://github.com/python-poetry/poetry/releases/tag/1.0.8
 [1.0.7]: https://github.com/python-poetry/poetry/releases/tag/1.0.7
 [1.0.7]: https://github.com/python-poetry/poetry/releases/tag/1.0.7
 [1.0.6]: https://github.com/python-poetry/poetry/releases/tag/1.0.6
 [1.0.6]: https://github.com/python-poetry/poetry/releases/tag/1.0.6

docs/docs/cli.md

@@ -207,6 +207,12 @@ You can also add `git` dependencies:
 poetry add git+https://github.com/sdispater/pendulum.git
 poetry add git+https://github.com/sdispater/pendulum.git
 ```
 ```
 
 
+or use ssh instead of https:
+
+```bash
+poetry add git+ssh://git@github.com/sdispater/pendulum.git
+```
+
 If you need to checkout a specific branch, tag or revision,
 If you need to checkout a specific branch, tag or revision,
 you can specify it when using `add`:
 you can specify it when using `add`:
 
 

poetry/puzzle/solver.py

@@ -115,7 +115,7 @@ class Solver:
                     elif package.version != pkg.version:
                     elif package.version != pkg.version:
                         # Checking version
                         # Checking version
                         operations.append(Update(pkg, package))
                         operations.append(Update(pkg, package))
-                    elif package.source_type != pkg.source_type:
+                    elif pkg.source_type and package.source_type != pkg.source_type:
                         operations.append(Update(pkg, package))
                         operations.append(Update(pkg, package))
                     else:
                     else:
                         operations.append(Install(package).skip("Already installed"))
                         operations.append(Install(package).skip("Already installed"))

tests/puzzle/test_solver.py

@@ -1984,3 +1984,22 @@ def test_solver_cannot_choose_another_version_for_url_dependencies(
     # via the git dependency
     # via the git dependency
     with pytest.raises(SolverProblemError):
     with pytest.raises(SolverProblemError):
         solver.solve()
         solver.solve()
+
+
+def test_solver_should_not_update_same_version_packages_if_installed_has_no_source_type(
+    solver, repo, package, installed
+):
+    package.add_dependency("foo", "1.0.0")
+
+    foo = get_package("foo", "1.0.0")
+    foo.source_type = "legacy"
+    foo.source_reference = "custom"
+    foo.source_url = "https://foo.bar"
+    repo.add_package(foo)
+    installed.add_package(get_package("foo", "1.0.0"))
+
+    ops = solver.solve()
+
+    check_solver_result(
+        ops, [{"job": "install", "package": foo, "skipped": True}],
+    )