kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Don't match tilde and exclamation mark as part of requirements.txt package name

Browse source
This commit is contained in:
Douwe Maan 2017-06-23 13:07:29 -05:00
parent 5cd1a48d5e
commit 11e22835ed
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/unreleased/dm-requirements-txt-tilde.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Don't match tilde and exclamation mark as part of requirements.txt package
name
merge_request:
author:

2
lib/gitlab/dependency_linker/requirements_txt_linker.rb
View file

@ -6,7 +6,7 @@ module Gitlab
private private
def link_dependencies def link_dependencies
link_regex(/^(?<name>(?![a-z+]+:)[^#.-][^ ><=;\[]+)/) do |name| link_regex(/^(?<name>(?![a-z+]+:)[^#.-][^ ><=~!;\[]+)/) do |name|
"https://pypi.python.org/pypi/#{name}" "https://pypi.python.org/pypi/#{name}"
end end

4
spec/lib/gitlab/dependency_linker/requirements_txt_linker_spec.rb
View file

@ -54,6 +54,8 @@ describe Gitlab::DependencyLinker::RequirementsTxtLinker, lib: true do
Sphinx>=1.3 Sphinx>=1.3
docutils>=0.7 docutils>=0.7
markupsafe markupsafe
pytest~=3.0
foop!=3.0
CONTENT CONTENT
end end
@ -78,6 +80,8 @@ describe Gitlab::DependencyLinker::RequirementsTxtLinker, lib: true do
expect(subject).to include(link('Sphinx', 'https://pypi.python.org/pypi/Sphinx')) expect(subject).to include(link('Sphinx', 'https://pypi.python.org/pypi/Sphinx'))
expect(subject).to include(link('docutils', 'https://pypi.python.org/pypi/docutils')) expect(subject).to include(link('docutils', 'https://pypi.python.org/pypi/docutils'))
expect(subject).to include(link('markupsafe', 'https://pypi.python.org/pypi/markupsafe')) expect(subject).to include(link('markupsafe', 'https://pypi.python.org/pypi/markupsafe'))
expect(subject).to include(link('pytest', 'https://pypi.python.org/pypi/pytest'))
expect(subject).to include(link('foop', 'https://pypi.python.org/pypi/foop'))
end end
it 'links URLs' do it 'links URLs' do