Skip to content

Commit bf885ac

Browse files
authored
fix(repositories): use urls for versioned JSON API instead of releases (#5972)
* fix(repositories): use `urls` for JSON API instead of `releases` * test(repositories): check for `files` content * test(repositories): remove `releases` key from version fixtures
1 parent 939d1dd commit bf885ac

File tree

15 files changed

+99
-762
lines changed

15 files changed

+99
-762
lines changed

src/poetry/repositories/pypi_repository.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def _get_release_info(
204204
)
205205

206206
try:
207-
version_info = json_data["releases"][version]
207+
version_info = json_data["urls"]
208208
except KeyError:
209209
version_info = []
210210

tests/repositories/fixtures/pypi.org/json/attrs/17.4.0.json

-36
Original file line numberDiff line numberDiff line change
@@ -61,42 +61,6 @@
6161
"version": "17.4.0"
6262
},
6363
"last_serial": 3451237,
64-
"releases": {
65-
"17.4.0": [
66-
{
67-
"comment_text": "",
68-
"digests": {
69-
"md5": "5835a573b3f0316e1602dac3fd9c1daf",
70-
"sha256": "a17a9573a6f475c99b551c0e0a812707ddda1ec9653bed04c13841404ed6f450"
71-
},
72-
"downloads": -1,
73-
"filename": "attrs-17.4.0-py2.py3-none-any.whl",
74-
"has_sig": true,
75-
"md5_digest": "5835a573b3f0316e1602dac3fd9c1daf",
76-
"packagetype": "bdist_wheel",
77-
"python_version": "py2.py3",
78-
"size": 31658,
79-
"upload_time": "2017-12-30T08:20:05",
80-
"url": "https://files.pythonhosted.org/packages/b5/60/4e178c1e790fd60f1229a9b3cb2f8bc2f4cc6ff2c8838054c142c70b5adc/attrs-17.4.0-py2.py3-none-any.whl"
81-
},
82-
{
83-
"comment_text": "",
84-
"digests": {
85-
"md5": "d7a89063b2e0fd36bd82389c4d82821d",
86-
"sha256": "1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9"
87-
},
88-
"downloads": -1,
89-
"filename": "attrs-17.4.0.tar.gz",
90-
"has_sig": true,
91-
"md5_digest": "d7a89063b2e0fd36bd82389c4d82821d",
92-
"packagetype": "sdist",
93-
"python_version": "source",
94-
"size": 97071,
95-
"upload_time": "2017-12-30T08:20:08",
96-
"url": "https://files.pythonhosted.org/packages/8b/0b/a06cfcb69d0cb004fde8bc6f0fd192d96d565d1b8aa2829f0f20adb796e5/attrs-17.4.0.tar.gz"
97-
}
98-
]
99-
},
10064
"urls": [
10165
{
10266
"comment_text": "",

tests/repositories/fixtures/pypi.org/json/cachecontrol/0.12.5.json

-116
Original file line numberDiff line numberDiff line change
@@ -46,122 +46,6 @@
4646
"version": "0.12.5"
4747
},
4848
"last_serial": 3939938,
49-
"releases": {
50-
"0.12.0": [
51-
{
52-
"comment_text": "",
53-
"digests": {
54-
"md5": "807c457b3b7df9d1f23b1aad7f9c9a22",
55-
"sha256": "ce479e88e697dc088297a5781daa2e812aa0dc888dc439602a308af6f4ff09e8"
56-
},
57-
"downloads": -1,
58-
"filename": "CacheControl-0.12.0.tar.gz",
59-
"has_sig": false,
60-
"md5_digest": "807c457b3b7df9d1f23b1aad7f9c9a22",
61-
"packagetype": "sdist",
62-
"python_version": "source",
63-
"requires_python": null,
64-
"size": 13815,
65-
"upload_time": "2017-01-30T05:05:38",
66-
"url": "https://files.pythonhosted.org/packages/41/ae/b9c375b001f13d73c0d8eba2264f6de955769f7cef9140d7fc192814255e/CacheControl-0.12.0.tar.gz"
67-
}
68-
],
69-
"0.12.1": [
70-
{
71-
"comment_text": "",
72-
"digests": {
73-
"md5": "c6c5944d3a6f73bb752a4b4e2e1ffca5",
74-
"sha256": "99c1506b98d53c222493e0ff65904c91aaedd7c8e235cb4f00287ddbbb597072"
75-
},
76-
"downloads": -1,
77-
"filename": "CacheControl-0.12.1.tar.gz",
78-
"has_sig": false,
79-
"md5_digest": "c6c5944d3a6f73bb752a4b4e2e1ffca5",
80-
"packagetype": "sdist",
81-
"python_version": "source",
82-
"requires_python": null,
83-
"size": 13939,
84-
"upload_time": "2017-03-14T21:42:44",
85-
"url": "https://files.pythonhosted.org/packages/3a/f7/075de886ad249f4ca08615ebd8bec9ce995ed6852790b6d9df38ae059e43/CacheControl-0.12.1.tar.gz"
86-
}
87-
],
88-
"0.12.2": [
89-
{
90-
"comment_text": "",
91-
"digests": {
92-
"md5": "38667f538f36c641eb0b00d0db145823",
93-
"sha256": "d7d919830d7edc5f4b355fa678a2ea49e9ccb67966abc373ec20f93f3f471265"
94-
},
95-
"downloads": -1,
96-
"filename": "CacheControl-0.12.2.tar.gz",
97-
"has_sig": false,
98-
"md5_digest": "38667f538f36c641eb0b00d0db145823",
99-
"packagetype": "sdist",
100-
"python_version": "source",
101-
"requires_python": null,
102-
"size": 14327,
103-
"upload_time": "2017-03-27T15:49:21",
104-
"url": "https://files.pythonhosted.org/packages/d2/6c/221f699710a6a643bd9a4324cf22ffb9fb73a089d2bfbed5fe4694f3caaf/CacheControl-0.12.2.tar.gz"
105-
}
106-
],
107-
"0.12.3": [
108-
{
109-
"comment_text": "",
110-
"digests": {
111-
"md5": "45bf98a2e3435438dcee89e519b34195",
112-
"sha256": "a9fc50e216c7c101f4ec4312f012dea501c2859cb256c7a68186a172ab71f632"
113-
},
114-
"downloads": -1,
115-
"filename": "CacheControl-0.12.3.tar.gz",
116-
"has_sig": false,
117-
"md5_digest": "45bf98a2e3435438dcee89e519b34195",
118-
"packagetype": "sdist",
119-
"python_version": "source",
120-
"requires_python": null,
121-
"size": 14345,
122-
"upload_time": "2017-05-25T13:49:06",
123-
"url": "https://files.pythonhosted.org/packages/a3/b3/6bb6c1535a283f01fe0c4e9644784756fee2ec080e2a6097f1c59325609e/CacheControl-0.12.3.tar.gz"
124-
}
125-
],
126-
"0.12.4": [
127-
{
128-
"comment_text": "",
129-
"digests": {
130-
"md5": "464675fc575b3a0b841598cb916be516",
131-
"sha256": "a7d21ba4e3633d95ac9fed5be205ee6d1da36bdc4b8914eb7a57ff50b7e5628c"
132-
},
133-
"downloads": -1,
134-
"filename": "CacheControl-0.12.4.tar.gz",
135-
"has_sig": false,
136-
"md5_digest": "464675fc575b3a0b841598cb916be516",
137-
"packagetype": "sdist",
138-
"python_version": "source",
139-
"requires_python": null,
140-
"size": 14471,
141-
"upload_time": "2018-01-27T06:24:40",
142-
"url": "https://files.pythonhosted.org/packages/98/f5/76619a63f0e4a1d2f5a1792ebc233a395c648c63d3461dc0331479ef120a/CacheControl-0.12.4.tar.gz"
143-
}
144-
],
145-
"0.12.5": [
146-
{
147-
"comment_text": "",
148-
"digests": {
149-
"md5": "f1baef403e8dd68c5a203e2eb23a0f2e",
150-
"sha256": "cef77effdf51b43178f6a2d3b787e3734f98ade253fa3187f3bb7315aaa42ff7"
151-
},
152-
"downloads": -1,
153-
"filename": "CacheControl-0.12.5.tar.gz",
154-
"has_sig": false,
155-
"md5_digest": "f1baef403e8dd68c5a203e2eb23a0f2e",
156-
"packagetype": "sdist",
157-
"python_version": "source",
158-
"requires_python": ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
159-
"size": 14383,
160-
"upload_time": "2018-06-07T14:53:13",
161-
"url": "https://files.pythonhosted.org/packages/5e/f0/2c193ed1f17c97ae539da7e1c2d48b80d8cccb1917163b26a91ca4355aa6/CacheControl-0.12.5.tar.gz"
162-
}
163-
]
164-
},
16549
"urls": [
16650
{
16751
"comment_text": "",

tests/repositories/fixtures/pypi.org/json/colorama/0.3.9.json

-36
Original file line numberDiff line numberDiff line change
@@ -45,42 +45,6 @@
4545
"version": "0.3.9"
4646
},
4747
"last_serial": 2833818,
48-
"releases": {
49-
"0.3.9": [
50-
{
51-
"comment_text": "",
52-
"digests": {
53-
"md5": "cc0c01c7b3b34d0354d813e9ab26aca3",
54-
"sha256": "463f8483208e921368c9f306094eb6f725c6ca42b0f97e313cb5d5512459feda"
55-
},
56-
"downloads": -1,
57-
"filename": "colorama-0.3.9-py2.py3-none-any.whl",
58-
"has_sig": false,
59-
"md5_digest": "cc0c01c7b3b34d0354d813e9ab26aca3",
60-
"packagetype": "bdist_wheel",
61-
"python_version": "2.7",
62-
"size": 20181,
63-
"upload_time": "2017-04-27T07:12:36",
64-
"url": "https://files.pythonhosted.org/packages/db/c8/7dcf9dbcb22429512708fe3a547f8b6101c0d02137acbd892505aee57adf/colorama-0.3.9-py2.py3-none-any.whl"
65-
},
66-
{
67-
"comment_text": "",
68-
"digests": {
69-
"md5": "3a0e415259690f4dd7455c2683ee5850",
70-
"sha256": "48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1"
71-
},
72-
"downloads": -1,
73-
"filename": "colorama-0.3.9.tar.gz",
74-
"has_sig": false,
75-
"md5_digest": "3a0e415259690f4dd7455c2683ee5850",
76-
"packagetype": "sdist",
77-
"python_version": "source",
78-
"size": 25053,
79-
"upload_time": "2017-04-27T07:12:12",
80-
"url": "https://files.pythonhosted.org/packages/e6/76/257b53926889e2835355d74fec73d82662100135293e17d382e2b74d1669/colorama-0.3.9.tar.gz"
81-
}
82-
]
83-
},
8448
"urls": [
8549
{
8650
"comment_text": "",

tests/repositories/fixtures/pypi.org/json/funcsigs/1.0.2.json

-36
Original file line numberDiff line numberDiff line change
@@ -44,42 +44,6 @@
4444
"version": "1.0.2"
4545
},
4646
"last_serial": 2083703,
47-
"releases": {
48-
"1.0.2": [
49-
{
50-
"comment_text": "",
51-
"digests": {
52-
"md5": "701d58358171f34b6d1197de2923a35a",
53-
"sha256": "330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca"
54-
},
55-
"downloads": -1,
56-
"filename": "funcsigs-1.0.2-py2.py3-none-any.whl",
57-
"has_sig": true,
58-
"md5_digest": "701d58358171f34b6d1197de2923a35a",
59-
"packagetype": "bdist_wheel",
60-
"python_version": "2.7",
61-
"size": 17697,
62-
"upload_time": "2016-04-25T22:22:05",
63-
"url": "https://files.pythonhosted.org/packages/69/cb/f5be453359271714c01b9bd06126eaf2e368f1fddfff30818754b5ac2328/funcsigs-1.0.2-py2.py3-none-any.whl"
64-
},
65-
{
66-
"comment_text": "",
67-
"digests": {
68-
"md5": "7e583285b1fb8a76305d6d68f4ccc14e",
69-
"sha256": "a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50"
70-
},
71-
"downloads": -1,
72-
"filename": "funcsigs-1.0.2.tar.gz",
73-
"has_sig": true,
74-
"md5_digest": "7e583285b1fb8a76305d6d68f4ccc14e",
75-
"packagetype": "sdist",
76-
"python_version": "source",
77-
"size": 27947,
78-
"upload_time": "2016-04-25T22:22:33",
79-
"url": "https://files.pythonhosted.org/packages/94/4a/db842e7a0545de1cdb0439bb80e6e42dfe82aaeaadd4072f2263a4fbed23/funcsigs-1.0.2.tar.gz"
80-
}
81-
]
82-
},
8347
"urls": [
8448
{
8549
"comment_text": "",

0 commit comments

Comments
 (0)