unstick virtualenv on windows, bump platformdirs (#7484)

pyproject.toml

@@ -66,22 +66,16 @@ lockfile = "^0.12.2"
 packaging = ">=20.4"
 pexpect = "^4.7.0"
 pkginfo = "^1.9.4"
-platformdirs = "^2.5.2"
+platformdirs = "^3.0.0"
 pyproject-hooks = "^1.0.0"
 requests = "^2.18"
 requests-toolbelt = ">=0.9.1,<0.11.0"
 shellingham = "^1.5"
 tomli = { version = "^2.0.1", python = "<3.11" }
-# exclude 0.11.2 and 0.11.3 due to https://github.com/sdispater/tomlkit/issues/225
-tomlkit = ">=0.11.1,<1.0.0,!=0.11.2,!=0.11.3"
+tomlkit = ">=0.11.4,<1.0.0"
 # trove-classifiers uses calver, so version is unclamped
 trove-classifiers = ">=2022.5.19"
-# exclude 20.4.5 - 20.4.6 due to https://github.com/pypa/pip/issues/9953
-virtualenv = [
-    { version = "^20.4.3,!=20.4.5,!=20.4.6" },
-    # see https://github.com/python-poetry/poetry/pull/6950 for details
-    { version = "<20.16.6", markers = "sys_platform == 'win32' and python_version == '3.9'" },
-]
+virtualenv = "^20.22.0"
 xattr = { version = "^0.10.0", markers = "sys_platform == 'darwin'" }
 urllib3 = "^1.26.0"
 

src/poetry/locations.py

@@ -25,9 +25,11 @@
 # /Users/<user>/Library/Application Support/<appname> to
 # /Users/<user>/Library/Preferences/<appname>.
 #
-# For now we only deprecate use of the old directory.
+# Then platformdirs 3.0.0 corrected it back again!
+#
+# Treat Preferences as deprecated, and hope that this is finally decided.
 if sys.platform == "darwin":
-    _LEGACY_CONFIG_DIR = CONFIG_DIR.parent.parent / "Application Support" / _APP_NAME
+    _LEGACY_CONFIG_DIR = CONFIG_DIR.parent.parent / "Preferences" / _APP_NAME
     config_toml = _LEGACY_CONFIG_DIR / "config.toml"
     auth_toml = _LEGACY_CONFIG_DIR / "auth.toml"
 

tests/masonry/builders/test_editable_builder.py

@@ -236,8 +236,8 @@ def test_builder_setup_generation_runs_with_pip_editable(
 
     poetry = Factory().create_poetry(extended_project)
 
-    # we need a venv with setuptools since we are verifying setup.py builds
-    with ephemeral_environment(flags={"no-setuptools": False}) as venv:
+    # we need a venv with pip and setuptools since we are verifying setup.py builds
+    with ephemeral_environment(flags={"no-setuptools": False, "no-pip": False}) as venv:
         builder = EditableBuilder(poetry, venv, NullIO())
         builder.build()