From aa2091b3209b7c76d3f65eb65cc2e5bef91b0c73 Mon Sep 17 00:00:00 2001 From: Pierre Pirault Date: Tue, 24 Jan 2023 09:55:50 -0500 Subject: [PATCH 1/5] Update Pypi.dependencies after update to package manager api --- app/models/package_manager/base.rb | 5 +- app/models/package_manager/pypi.rb | 6 +- .../pypi_dependencies_requests.yml | 96 +++++++++++++++++++ spec/models/package_manager/pypi_spec.rb | 27 ++++++ 4 files changed, 130 insertions(+), 4 deletions(-) create mode 100644 spec/fixtures/vcr_cassettes/pypi_dependencies_requests.yml diff --git a/app/models/package_manager/base.rb b/app/models/package_manager/base.rb index 5f9be12c3..c56860bc5 100644 --- a/app/models/package_manager/base.rb +++ b/app/models/package_manager/base.rb @@ -235,7 +235,10 @@ def self.save_dependencies(mapped_project, sync_version: :all) deps = begin dependencies(name, db_version.number, mapped_project) - rescue StandardError + rescue StandardError => e + Rails.logger.error( + "Error while trying to get dependencies for #{db_platform}/#{name}@#{db_version.number}: #{e.message}" + ) [] end diff --git a/app/models/package_manager/pypi.rb b/app/models/package_manager/pypi.rb index 18166f41a..4d7d1e9e3 100644 --- a/app/models/package_manager/pypi.rb +++ b/app/models/package_manager/pypi.rb @@ -123,14 +123,14 @@ def self.known_versions(name) &.index_by { |v| v[:number] } || {} end - def self.dependencies(name, version, _mapped_project) + def self.dependencies(name, version, _mapped_project = nil) api_response = get("https://pypi.org/pypi/#{name}/#{version}/json") deps = api_response.dig("info", "requires_dist") - source_info = api_response.dig("releases", version) + source_info = api_response.fetch("urls", []) Rails.logger.warn("Pypi sdist (no deps): #{name}") unless source_info.any? { |rel| rel["packagetype"] == "bdist_wheel" } deps.map do |dep| - name, version = dep.split + name, version = dep.split(/ /, 2) { project_name: name, requirements: version.nil? || version == ";" ? "*" : version.gsub(/\(|\)/, ""), diff --git a/spec/fixtures/vcr_cassettes/pypi_dependencies_requests.yml b/spec/fixtures/vcr_cassettes/pypi_dependencies_requests.yml new file mode 100644 index 000000000..0335f2fdf --- /dev/null +++ b/spec/fixtures/vcr_cassettes/pypi_dependencies_requests.yml @@ -0,0 +1,96 @@ +--- +http_interactions: +- request: + method: get + uri: https://pypi.org/pypi/requests/2.28.2/json + body: + encoding: US-ASCII + string: '' + headers: + User-Agent: + - Faraday v0.15.4 + Accept-Encoding: + - gzip,deflate,br + X-Datadog-Trace-Id: + - '2363087858382582356' + X-Datadog-Parent-Id: + - '4006652298076953106' + X-Datadog-Sampling-Priority: + - '1' + Expect: + - '' + response: + status: + code: 200 + message: '' + headers: + Access-Control-Allow-Headers: + - Content-Type, If-Match, If-Modified-Since, If-None-Match, If-Unmodified-Since + Access-Control-Allow-Methods: + - GET + Access-Control-Allow-Origin: + - "*" + Access-Control-Expose-Headers: + - X-PyPI-Last-Serial + Access-Control-Max-Age: + - '86400' + Cache-Control: + - max-age=900, public + Content-Security-Policy: + - base-uri 'self'; block-all-mixed-content; connect-src 'self' https://api.github.com/repos/ + fastly-insights.com *.fastly-insights.com *.ethicalads.io https://api.pwnedpasswords.com + https://cdn.jsdelivr.net/npm/mathjax@3.2.2/es5/sre/mathmaps/ https://2p66nmmycsj3.statuspage.io; + default-src 'none'; font-src 'self' fonts.gstatic.com; form-action 'self' + https://checkout.stripe.com; frame-ancestors 'none'; frame-src 'none'; img-src + 'self' https://warehouse-camo.ingress.cmh1.psfhosted.org/ www.google-analytics.com + *.fastly-insights.com *.ethicalads.io; script-src 'self' www.googletagmanager.com + www.google-analytics.com *.fastly-insights.com *.ethicalads.io 'sha256-U3hKDidudIaxBDEzwGJApJgPEf2mWk6cfMWghrAa6i0=' + https://cdn.jsdelivr.net/npm/mathjax@3.2.2/ 'sha256-1CldwzdEg2k1wTmf7s5RWVd7NMXI/7nxxjJM2C4DqII=' + 'sha256-0POaN8stWYQxhzjKS+/eOfbbJ/u4YHO5ZagJvLpMypo='; style-src 'self' fonts.googleapis.com + *.ethicalads.io 'sha256-2YHqZokjiizkHi1Zt+6ar0XJ0OeEy/egBnlm+MDMtrM=' 'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=' + 'sha256-JLEjeN9e5dGsz5475WyRaoA4eQOdNPxDIeUhclnJDCE=' 'sha256-mQyxHEuwZJqpxCw3SLmc4YOySNKXunyu2Oiz1r3/wAE=' + 'sha256-OCf+kv5Asiwp++8PIevKBYSgnNLNUZvxAp4a7wMLuKA=' 'sha256-h5LOiLhk6wiJrGsG5ItM0KimwzWQH/yAcmoJDJL//bY='; + worker-src *.fastly-insights.com + Content-Type: + - application/json + Etag: + - '"uwMvOAUCDFUE81ox51egSA"' + Referrer-Policy: + - origin-when-cross-origin + Server: + - nginx/1.13.9 + X-Pypi-Last-Serial: + - '16406303' + Accept-Ranges: + - bytes + Date: + - Mon, 23 Jan 2023 20:30:04 GMT + X-Served-By: + - cache-iad-kiad7000109-IAD + X-Cache: + - HIT + X-Cache-Hits: + - '7' + X-Timer: + - S1674505804.395177,VS0,VE0 + Vary: + - Accept-Encoding + Strict-Transport-Security: + - max-age=31536000; includeSubDomains; preload + X-Frame-Options: + - deny + X-Xss-Protection: + - 1; mode=block + X-Content-Type-Options: + - nosniff + X-Permitted-Cross-Domain-Policies: + - none + Content-Length: + - '6303' + body: + encoding: ASCII-8BIT + string: !binary |- + {"info":{"author":"Kenneth Reitz","author_email":"me@kennethreitz.org","bugtrack_url":null,"classifiers":["Development Status :: 5 - Production/Stable","Environment :: Web Environment","Intended Audience :: Developers","License :: OSI Approved :: Apache Software License","Natural Language :: English","Operating System :: OS Independent","Programming Language :: Python","Programming Language :: Python :: 3","Programming Language :: Python :: 3 :: Only","Programming Language :: Python :: 3.10","Programming Language :: Python :: 3.11","Programming Language :: Python :: 3.7","Programming Language :: Python :: 3.8","Programming Language :: Python :: 3.9","Programming Language :: Python :: Implementation :: CPython","Programming Language :: Python :: Implementation :: PyPy","Topic :: Internet :: WWW/HTTP","Topic :: Software Development :: Libraries"],"description":"# Requests\n\n**Requests** is a simple, yet elegant, HTTP library.\n\n```python\n>>> import requests\n>>> r = requests.get('https://httpbin.org/basic-auth/user/pass', auth=('user', 'pass'))\n>>> r.status_code\n200\n>>> r.headers['content-type']\n'application/json; charset=utf8'\n>>> r.encoding\n'utf-8'\n>>> r.text\n'{\"authenticated\": true, ...'\n>>> r.json()\n{'authenticated': True, ...}\n```\n\nRequests allows you to send HTTP/1.1 requests extremely easily. There’s no need to manually add query strings to your URLs, or to form-encode your `PUT` & `POST` data — but nowadays, just use the `json` method!\n\nRequests is one of the most downloaded Python packages today, pulling in around `30M downloads / week`— according to GitHub, Requests is currently [depended upon](https://github.com/psf/requests/network/dependents?package_id=UGFja2FnZS01NzA4OTExNg%3D%3D) by `1,000,000+` repositories. You may certainly put your trust in this code.\n\n[![Downloads](https://pepy.tech/badge/requests/month)](https://pepy.tech/project/requests)\n[![Supported Versions](https://img.shields.io/pypi/pyversions/requests.svg)](https://pypi.org/project/requests)\n[![Contributors](https://img.shields.io/github/contributors/psf/requests.svg)](https://github.com/psf/requests/graphs/contributors)\n\n## Installing Requests and Supported Versions\n\nRequests is available on PyPI:\n\n```console\n$ python -m pip install requests\n```\n\nRequests officially supports Python 3.7+.\n\n## Supported Features & Best–Practices\n\nRequests is ready for the demands of building robust and reliable HTTP–speaking applications, for the needs of today.\n\n- Keep-Alive & Connection Pooling\n- International Domains and URLs\n- Sessions with Cookie Persistence\n- Browser-style TLS/SSL Verification\n- Basic & Digest Authentication\n- Familiar `dict`–like Cookies\n- Automatic Content Decompression and Decoding\n- Multi-part File Uploads\n- SOCKS Proxy Support\n- Connection Timeouts\n- Streaming Downloads\n- Automatic honoring of `.netrc`\n- Chunked HTTP Requests\n\n## API Reference and User Guide available on [Read the Docs](https://requests.readthedocs.io)\n\n[![Read the Docs](https://raw.githubusercontent.com/psf/requests/main/ext/ss.png)](https://requests.readthedocs.io)\n\n## Cloning the repository\n\nWhen cloning the Requests repository, you may need to add the `-c\nfetch.fsck.badTimezone=ignore` flag to avoid an error about a bad commit (see\n[this issue](https://github.com/psf/requests/issues/2690) for more background):\n\n```shell\ngit clone -c fetch.fsck.badTimezone=ignore https://github.com/psf/requests.git\n```\n\nYou can also apply this setting to your global Git config:\n\n```shell\ngit config --global fetch.fsck.badTimezone ignore\n```\n\n---\n\n[![Kenneth Reitz](https://raw.githubusercontent.com/psf/requests/main/ext/kr.png)](https://kennethreitz.org) [![Python Software Foundation](https://raw.githubusercontent.com/psf/requests/main/ext/psf.png)](https://www.python.org/psf)\n\n\n","description_content_type":"text/markdown","docs_url":null,"download_url":"","downloads":{"last_day":-1,"last_month":-1,"last_week":-1},"home_page":"https://requests.readthedocs.io","keywords":"","license":"Apache 2.0","maintainer":"","maintainer_email":"","name":"requests","package_url":"https://pypi.org/project/requests/","platform":null,"project_url":"https://pypi.org/project/requests/","project_urls":{"Documentation":"https://requests.readthedocs.io","Homepage":"https://requests.readthedocs.io","Source":"https://github.com/psf/requests"},"release_url":"https://pypi.org/project/requests/2.28.2/","requires_dist":["charset-normalizer (<4,>=2)","idna (<4,>=2.5)","urllib3 (<1.27,>=1.21.1)","certifi (>=2017.4.17)","PySocks (!=1.5.7,>=1.5.6) ; extra == 'socks'","chardet (<6,>=3.0.2) ; extra == 'use_chardet_on_py3'"],"requires_python":">=3.7, <4","summary":"Python HTTP for Humans.","version":"2.28.2","yanked":false,"yanked_reason":null},"last_serial":16406303,"urls":[{"comment_text":"","digests":{"blake2b_256":"d2f4274d1dbe96b41cf4e0efb70cbced278ffd61b5c7bb70338b62af94ccb25b","md5":"e892fbf03cc3d566ce58970b2c943070","sha256":"64299f4909223da747622c030b781c0d7811e359c37124b4bd368fb8c6518baa"},"downloads":-1,"filename":"requests-2.28.2-py3-none-any.whl","has_sig":false,"md5_digest":"e892fbf03cc3d566ce58970b2c943070","packagetype":"bdist_wheel","python_version":"py3","requires_python":">=3.7, <4","size":62822,"upload_time":"2023-01-12T16:24:52","upload_time_iso_8601":"2023-01-12T16:24:52.241259Z","url":"https://files.pythonhosted.org/packages/d2/f4/274d1dbe96b41cf4e0efb70cbced278ffd61b5c7bb70338b62af94ccb25b/requests-2.28.2-py3-none-any.whl","yanked":false,"yanked_reason":null},{"comment_text":"","digests":{"blake2b_256":"9dee391076f5937f0a8cdf5e53b701ffc91753e87b07d66bae4a09aa671897bf","md5":"09b752e0b0a672d805ae54455c128d42","sha256":"98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf"},"downloads":-1,"filename":"requests-2.28.2.tar.gz","has_sig":false,"md5_digest":"09b752e0b0a672d805ae54455c128d42","packagetype":"sdist","python_version":"source","requires_python":">=3.7, <4","size":108206,"upload_time":"2023-01-12T16:24:54","upload_time_iso_8601":"2023-01-12T16:24:54.687770Z","url":"https://files.pythonhosted.org/packages/9d/ee/391076f5937f0a8cdf5e53b701ffc91753e87b07d66bae4a09aa671897bf/requests-2.28.2.tar.gz","yanked":false,"yanked_reason":null}],"vulnerabilities":[]}
 + http_version: + recorded_at: Mon, 23 Jan 2023 20:30:04 GMT +recorded_with: VCR 4.0.0 diff --git a/spec/models/package_manager/pypi_spec.rb b/spec/models/package_manager/pypi_spec.rb index 17359cf17..044e89acc 100644 --- a/spec/models/package_manager/pypi_spec.rb +++ b/spec/models/package_manager/pypi_spec.rb @@ -119,4 +119,31 @@ expect(described_class.deprecation_info('foo')).to eq({is_deprecated: true, message: "Development Status :: 7 - Inactive"}) end end + + describe ".dependencies" do + it "returns the dependencies of a particular version" do + VCR.use_cassette("pypi_dependencies_requests", record: :once) do + expect( + described_class.dependencies("requests", "2.28.2") + ).to match_array( + [ + ["charset-normalizer", "<4,>=2"], + ["idna", "<4,>=2.5"], + ["urllib3", "<1.27,>=1.21.1"], + ["certifi", ">=2017.4.17"], + ["PySocks", "!=1.5.7,>=1.5.6 ; extra == 'socks'"], + ["chardet", "<6,>=3.0.2 ; extra == 'use_chardet_on_py3'"] + ].map do |name, requirements| + { + project_name: name, + requirements: requirements, + kind: "runtime", + optional: false, + platform: "Pypi" + } + end + ) + end + end + end end From 15ac575438317a883430b7e59291dc8fdfae3b4c Mon Sep 17 00:00:00 2001 From: Pierre Pirault Date: Tue, 24 Jan 2023 20:16:00 -0500 Subject: [PATCH 2/5] Implement smarter parsing logic according to PEP508 specification --- app/models/package_manager/pypi.rb | 12 +++++- spec/models/package_manager/pypi_spec.rb | 53 ++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/app/models/package_manager/pypi.rb b/app/models/package_manager/pypi.rb index 4d7d1e9e3..fc6dac172 100644 --- a/app/models/package_manager/pypi.rb +++ b/app/models/package_manager/pypi.rb @@ -11,6 +11,8 @@ class Pypi < Base ENTIRE_PACKAGE_CAN_BE_DEPRECATED = true SUPPORTS_SINGLE_VERSION_UPDATE = true PYPI_PRERELEASE = /(a|b|rc|dev)[0-9]+$/.freeze + # Adapted from https://peps.python.org/pep-0508/#names + PYPI_508_NAME_REGEX = /^([A-Z0-9][A-Z0-9._-]*[A-Z0-9])/i def self.package_link(db_project, version = nil) # NB PEP 503: "All URLs which respond with an HTML5 page MUST end with a / and the repository SHOULD redirect the URLs without a / to add a / to the end." @@ -123,6 +125,14 @@ def self.known_versions(name) &.index_by { |v| v[:number] } || {} end + # Simply parses out the name of a PEP 508 Dependency specification: https://peps.python.org/pep-0508/ + # Leaves the rest as-is with any leading semicolons or spaces stripped + def self.parse_pep_508_dep_spec(dep) + name, requirement = dep.split(PYPI_508_NAME_REGEX, 2).last(2).map(&:strip) + requirement = requirement&.sub(/^[\s;]*/, "") || "" + return name, requirement + end + def self.dependencies(name, version, _mapped_project = nil) api_response = get("https://pypi.org/pypi/#{name}/#{version}/json") deps = api_response.dig("info", "requires_dist") @@ -130,7 +140,7 @@ def self.dependencies(name, version, _mapped_project = nil) Rails.logger.warn("Pypi sdist (no deps): #{name}") unless source_info.any? { |rel| rel["packagetype"] == "bdist_wheel" } deps.map do |dep| - name, version = dep.split(/ /, 2) + name, version = parse_pep_508_dep_spec(dep) { project_name: name, requirements: version.nil? || version == ";" ? "*" : version.gsub(/\(|\)/, ""), diff --git a/spec/models/package_manager/pypi_spec.rb b/spec/models/package_manager/pypi_spec.rb index 044e89acc..9b6caaf1b 100644 --- a/spec/models/package_manager/pypi_spec.rb +++ b/spec/models/package_manager/pypi_spec.rb @@ -145,5 +145,58 @@ ) end end + + # Copied from the tests of https://peps.python.org/pep-0508/#complete-grammar + [ + ["A", "A", ""], + ["A.B-C_D", "A.B-C_D", ""], + ["aa", "aa", ""], + ["name", "name", ""], + ["name<=1", "name", "<=1"], + ["name>=3", "name", ">=3"], + ["name>=3,<2", "name", ">=3,<2"], + ["name@http://foo.com", "name", "@http://foo.com"], + [ + "name [fred,bar] @ http://foo.com ; python_version=='2.7'", + "name", + "[fred,bar] @ http://foo.com ; python_version=='2.7'" + ], + [ + "name[quux, strange];python_version<'2.7' and platform_version=='2'", + "name", + "[quux, strange];python_version<'2.7' and platform_version=='2'" + ], + [ + "name; os_name=='a' or os_name=='b'", + "name", + "os_name=='a' or os_name=='b'" + ], + [ + "name; os_name=='a' and os_name=='b' or os_name=='c'", + "name", + "os_name=='a' and os_name=='b' or os_name=='c'" + ], + [ + "name; os_name=='a' and (os_name=='b' or os_name=='c')", + "name", + "os_name=='a' and (os_name=='b' or os_name=='c')" + ], + [ + "name; os_name=='a' or os_name=='b' and os_name=='c'", + "name", + "os_name=='a' or os_name=='b' and os_name=='c'" + ], + [ + "name; (os_name=='a' or os_name=='b') and os_name=='c'", + "name", + "(os_name=='a' or os_name=='b') and os_name=='c'" + ], + ].each do |test, expected_name, expected_requirement| + it "#{test} should be parsed correctly" do + expect( + PackageManager::Pypi.parse_pep_508_dep_spec(test) + ).to eq([expected_name, expected_requirement]) + end + end end end From ef5746ac8f170c55ae74477f4a1ab9a9701cb79e Mon Sep 17 00:00:00 2001 From: Pierre Pirault Date: Tue, 24 Jan 2023 20:19:40 -0500 Subject: [PATCH 3/5] Fix name of constant --- app/models/package_manager/pypi.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/package_manager/pypi.rb b/app/models/package_manager/pypi.rb index fc6dac172..761b036cb 100644 --- a/app/models/package_manager/pypi.rb +++ b/app/models/package_manager/pypi.rb @@ -12,7 +12,7 @@ class Pypi < Base SUPPORTS_SINGLE_VERSION_UPDATE = true PYPI_PRERELEASE = /(a|b|rc|dev)[0-9]+$/.freeze # Adapted from https://peps.python.org/pep-0508/#names - PYPI_508_NAME_REGEX = /^([A-Z0-9][A-Z0-9._-]*[A-Z0-9])/i + PEP_508_NAME_REGEX = /^([A-Z0-9][A-Z0-9._-]*[A-Z0-9])/i def self.package_link(db_project, version = nil) # NB PEP 503: "All URLs which respond with an HTML5 page MUST end with a / and the repository SHOULD redirect the URLs without a / to add a / to the end." @@ -128,7 +128,7 @@ def self.known_versions(name) # Simply parses out the name of a PEP 508 Dependency specification: https://peps.python.org/pep-0508/ # Leaves the rest as-is with any leading semicolons or spaces stripped def self.parse_pep_508_dep_spec(dep) - name, requirement = dep.split(PYPI_508_NAME_REGEX, 2).last(2).map(&:strip) + name, requirement = dep.split(PEP_508_NAME_REGEX, 2).last(2).map(&:strip) requirement = requirement&.sub(/^[\s;]*/, "") || "" return name, requirement end From afb53496a77a1893f2b6120ba5d63a4ee004e4d9 Mon Sep 17 00:00:00 2001 From: Pierre Pirault Date: Wed, 25 Jan 2023 16:32:25 -0500 Subject: [PATCH 4/5] Fixes to dependency specification name regex and variable renames --- app/models/package_manager/pypi.rb | 8 ++++---- spec/models/package_manager/pypi_spec.rb | 13 +++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/models/package_manager/pypi.rb b/app/models/package_manager/pypi.rb index 761b036cb..a681a5f0b 100644 --- a/app/models/package_manager/pypi.rb +++ b/app/models/package_manager/pypi.rb @@ -12,7 +12,7 @@ class Pypi < Base SUPPORTS_SINGLE_VERSION_UPDATE = true PYPI_PRERELEASE = /(a|b|rc|dev)[0-9]+$/.freeze # Adapted from https://peps.python.org/pep-0508/#names - PEP_508_NAME_REGEX = /^([A-Z0-9][A-Z0-9._-]*[A-Z0-9])/i + PEP_508_NAME_REGEX = /^([A-Z0-9][A-Z0-9._-]*[A-Z0-9]|[A-Z0-9])/i def self.package_link(db_project, version = nil) # NB PEP 503: "All URLs which respond with an HTML5 page MUST end with a / and the repository SHOULD redirect the URLs without a / to add a / to the end." @@ -140,10 +140,10 @@ def self.dependencies(name, version, _mapped_project = nil) Rails.logger.warn("Pypi sdist (no deps): #{name}") unless source_info.any? { |rel| rel["packagetype"] == "bdist_wheel" } deps.map do |dep| - name, version = parse_pep_508_dep_spec(dep) + dep_name, requirements = parse_pep_508_dep_spec(dep) { - project_name: name, - requirements: version.nil? || version == ";" ? "*" : version.gsub(/\(|\)/, ""), + project_name: dep_name, + requirements: requirements.blank? ? "*" : requirements, kind: "runtime", optional: false, platform: self.name.demodulize, diff --git a/spec/models/package_manager/pypi_spec.rb b/spec/models/package_manager/pypi_spec.rb index 9b6caaf1b..05a6dca47 100644 --- a/spec/models/package_manager/pypi_spec.rb +++ b/spec/models/package_manager/pypi_spec.rb @@ -127,12 +127,12 @@ described_class.dependencies("requests", "2.28.2") ).to match_array( [ - ["charset-normalizer", "<4,>=2"], - ["idna", "<4,>=2.5"], - ["urllib3", "<1.27,>=1.21.1"], - ["certifi", ">=2017.4.17"], - ["PySocks", "!=1.5.7,>=1.5.6 ; extra == 'socks'"], - ["chardet", "<6,>=3.0.2 ; extra == 'use_chardet_on_py3'"] + ["charset-normalizer", "(<4,>=2)"], + ["idna", "(<4,>=2.5)"], + ["urllib3", "(<1.27,>=1.21.1)"], + ["certifi", "(>=2017.4.17)"], + ["PySocks", "(!=1.5.7,>=1.5.6) ; extra == 'socks'"], + ["chardet", "(<6,>=3.0.2) ; extra == 'use_chardet_on_py3'"] ].map do |name, requirements| { project_name: name, @@ -149,6 +149,7 @@ # Copied from the tests of https://peps.python.org/pep-0508/#complete-grammar [ ["A", "A", ""], + ["A>=3", "A", ">=3"], ["A.B-C_D", "A.B-C_D", ""], ["aa", "aa", ""], ["name", "name", ""], From 4f46915680b66b255870f2f92ba02e3869f66f9f Mon Sep 17 00:00:00 2001 From: Pierre Pirault Date: Wed, 25 Jan 2023 17:01:53 -0500 Subject: [PATCH 5/5] single character packages now correctly parse with blank requirements rather than nil --- app/models/package_manager/pypi.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/package_manager/pypi.rb b/app/models/package_manager/pypi.rb index a681a5f0b..2d3cbc74f 100644 --- a/app/models/package_manager/pypi.rb +++ b/app/models/package_manager/pypi.rb @@ -129,7 +129,7 @@ def self.known_versions(name) # Leaves the rest as-is with any leading semicolons or spaces stripped def self.parse_pep_508_dep_spec(dep) name, requirement = dep.split(PEP_508_NAME_REGEX, 2).last(2).map(&:strip) - requirement = requirement&.sub(/^[\s;]*/, "") || "" + requirement = requirement.sub(/^[\s;]*/, "") return name, requirement end