MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Parse URLs without the editable flag in requirements.txt (PY-6328)

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2012-04-23 19:10:34 +04:00
parent 4168e43a01
commit 0099417de2
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/packaging/PyRequirement.java
+17 -10
View File
@@ -21,7 +21,7 @@ import java.util.regex.Pattern;
public class PyRequirement {
private static final Pattern NAME = Pattern.compile("\\s*(\\w(\\w|[-.])*)\\s*(.*)");
private static final Pattern VERSION_SPEC = Pattern.compile("\\s*(<=?|>=?|==|!=)\\s*((\\w|[-.])+)");
private static final Pattern EDITABLE_EGG = Pattern.compile("\\s*-e\\s+([^#]*)#egg=(.*)");
private static final Pattern EDITABLE_EGG = Pattern.compile("\\s*(-e)?\\s*([^#]*)#egg=(.*)");
private static final Pattern RECURSIVE_REQUIREMENT = Pattern.compile("\\s*-r\\s+(.*)");
private static final Pattern NAME_VERSION = Pattern.compile("\\s*(\\w(\\w|[.])*)-((\\w|[-.])+)");
@@ -119,6 +119,7 @@ public class PyRequirement {
@NotNull private final String myName;
@NotNull private final List<VersionSpec> myVersionSpecs;
@Nullable private final String myURL;
private final boolean myEditable;
public static final Comparator<String> VERSION_COMPARATOR = new Comparator<String>() {
@Override
@@ -196,17 +197,19 @@ public class PyRequirement {
myName = name;
myVersionSpecs = versionSpecs;
myURL = null;
myEditable = false;
}
public PyRequirement(@NotNull String name, @Nullable String version, @NotNull String url) {
public PyRequirement(@NotNull String name, @Nullable String version, @NotNull String url, boolean editable) {
myName = name;
if (version != null) {
myVersionSpecs = Collections.singletonList(new VersionSpec(Relation.GTE, version));
myVersionSpecs = Collections.singletonList(new VersionSpec(Relation.EQ, version));
}
else {
myVersionSpecs = Collections.emptyList();
}
myURL = url;
myEditable = editable;
}
@NotNull
@@ -224,11 +227,13 @@ public class PyRequirement {
@NotNull
public List<String> toOptions() {
final List<String> results = new ArrayList<String>();
if (myEditable) {
results.add("-e");
}
if (myURL != null) {
final int size = myVersionSpecs.size();
assert size <= 1;
final List<String> results = new ArrayList<String>();
results.add("-e");
final String urlAndName = myURL + "#egg=" + myName;
if (size == 0) {
results.add(urlAndName);
@@ -241,8 +246,9 @@ public class PyRequirement {
return results;
}
else {
return Collections.singletonList(toString());
results.add(toString());
}
return results;
}
@Override
@@ -380,8 +386,9 @@ public class PyRequirement {
if (!editableEggMatcher.matches()) {
return null;
}
final String url = editableEggMatcher.group(1);
final String egg = editableEggMatcher.group(2);
final boolean editable = editableEggMatcher.group(1) != null;
final String url = editableEggMatcher.group(2);
final String egg = editableEggMatcher.group(3);
if (url == null) {
return null;
}
@@ -389,7 +396,7 @@ public class PyRequirement {
if (nameVersionMatcher.matches()) {
final String name = normalizeName(nameVersionMatcher.group(1));
final String version = normalizeVersion(nameVersionMatcher.group(3));
return new PyRequirement(name, version, url);
return new PyRequirement(name, version, url, editable);
}
else {
final Matcher nameMatcher = NAME.matcher(egg);
@@ -397,7 +404,7 @@ public class PyRequirement {
return null;
}
final String name = normalizeName(nameMatcher.group(1));
return new PyRequirement(name, null, url);
return new PyRequirement(name, null, url, editable);
}
}