Skip to content

H
heroku-buildpack-python
Commit 26edb7a0 authored by jxltom's avatar jxltom
Browse files
Options

Support pip 10 in pip-diff

parent 97674f59
Hide whitespace changes
Inline Side-by-side
Showing with 525 additions and 4 deletions
.idea/heroku-buildpack-python.iml 0 → 100644
View file @ 26edb7a0
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="TestRunnerService">
<option name="PROJECT_TEST_RUNNER" value="Unittests" />
</component>
</module>
\ No newline at end of file
.idea/misc.xml 0 → 100644
View file @ 26edb7a0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.4.0 (~/miniconda2/envs/py34-monitor/bin/python)" project-jdk-type="Python SDK" />
</project>
\ No newline at end of file
.idea/modules.xml 0 → 100644
View file @ 26edb7a0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/heroku-buildpack-python.iml" filepath="$PROJECT_DIR$/.idea/heroku-buildpack-python.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/vcs.xml 0 → 100644
View file @ 26edb7a0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
.idea/workspace.xml 0 → 100644
View file @ 26edb7a0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="b8a717ec-01f7-41b7-8edd-85e64a278364" name="Default" comment="" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="pipenv" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/bin/steps/pipenv">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="39" selection-start-line="39" selection-end-line="39" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="collectstatic" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/bin/steps/collectstatic">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="293">
<caret line="38" column="31" selection-start-line="38" selection-start-column="31" selection-end-line="38" selection-end-column="31" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>s3.</find>
<find>helmsman-backend</find>
<find>shenzhen</find>
<find />
<find>2018</find>
<find>pip-diff</find>
<find>pip</find>
<find>9.0</find>
<find>steps/python</find>
<find>only-</find>
<find>skip-lock</find>
<find>2018.5</find>
<find>pipenvlock</find>
<find>2018.</find>
<find>collectstatic</find>
</findStrings>
<replaceStrings>
<replace>wj-backend</replace>
<replace>hongkong</replace>
</replaceStrings>
<dirStrings>
<dir>$PROJECT_DIR$</dir>
</dirStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/bin/steps/pip-uninstall" />
<option value="$PROJECT_DIR$/bin/compile" />
<option value="$PROJECT_DIR$/bin/steps/pipenv" />
<option value="$PROJECT_DIR$/bin/steps/python" />
<option value="$PROJECT_DIR$/bin/steps/collectstatic" />
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="NodePackageJsonFileManager">
<packageJsonPaths />
</component>
<component name="PhpServers">
<servers />
</component>
<component name="ProjectFrameBounds">
<option name="x" value="377" />
<option name="y" value="141" />
<option name="width" value="2064" />
<option name="height" value="780" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
<profile-state>
<expanded-state>
<State>
<id>Python</id>
</State>
</expanded-state>
</profile-state>
</entry>
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="heroku-buildpack-python" type="b2602c69:ProjectViewProjectNode" />
<item name="heroku-buildpack-python" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="AndroidView" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="go.gopath.indexing.explicitly.defined" value="true" />
<property name="go.vendoring.notification.had.been.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="settings.editor.selected.configurable" value="reference.settingsdialog.project.vagrant" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager">
<configuration default="true" type="Application" factoryName="Application">
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<patterns />
</configuration>
<configuration default="true" type="TestNG" factoryName="TestNG">
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="SUITE_NAME" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="GROUP_NAME" />
<option name="TEST_OBJECT" value="CLASS" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="OUTPUT_DIRECTORY" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<option name="USE_DEFAULT_REPORTERS" value="false" />
<option name="PROPERTIES_FILE" />
<properties />
<listeners />
</configuration>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="b8a717ec-01f7-41b7-8edd-85e64a278364" name="Default" comment="" />
<created>1521782803304</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1521782803304</updated>
<workItem from="1526275645774" duration="711000" />
<workItem from="1527748759252" duration="5991000" />
<workItem from="1527760528719" duration="1561000" />
<workItem from="1527817462831" duration="11544000" />
<workItem from="1527833273311" duration="9000" />
<workItem from="1531372335293" duration="1683000" />
<workItem from="1531445636184" duration="1022000" />
<workItem from="1536643920775" duration="1320000" />
<workItem from="1536648833168" duration="2273000" />
</task>
<task id="LOCAL-00001" summary="Move SKIP_PIP_INSTALL=1 after pip-uninstall step otherwise pip-uninstall will be bypassed">
<created>1521787535128</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1521787535128</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="26114000" />
</component>
<component name="ToolWindowManager">
<frame x="377" y="141" width="2064" height="780" extended-state="0" />
<editor active="true" />
<layout>
<window_info anchor="right" id="Palette" order="3" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="right" id="Palette&#9;" order="3" />
<window_info id="Image Layers" order="2" />
<window_info anchor="right" id="Capture Analysis" order="3" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="right" id="Maven Projects" order="3" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Version Control" order="7" />
<window_info anchor="bottom" id="Terminal" order="7" />
<window_info id="Capture Tool" order="2" />
<window_info id="Designer" order="2" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="right" id="SciView" order="3" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info id="UI Designer" order="2" />
<window_info anchor="right" id="Theme Preview" order="3" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
<window_info anchor="bottom" id="Python Console" order="7" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Data View" order="3" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Move SKIP_PIP_INSTALL=1 after pip-uninstall step otherwise pip-uninstall will be bypassed" />
<option name="LAST_COMMIT_MESSAGE" value="Move SKIP_PIP_INSTALL=1 after pip-uninstall step otherwise pip-uninstall will be bypassed" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/bin/steps/pipenv">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="858">
<caret line="39" selection-start-line="39" selection-end-line="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/steps/collectstatic">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="880">
<caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/steps/pipenv">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1056">
<caret line="48" column="85" lean-forward="true" selection-start-line="48" selection-start-column="85" selection-end-line="48" selection-end-column="85" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/steps/pipenv">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="902">
<caret line="41" selection-start-line="41" selection-end-line="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/steps/python">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1166">
<caret line="53" column="151" selection-start-line="53" selection-start-column="151" selection-end-line="53" selection-end-column="151" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/steps/pipenv">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="726">
<caret line="33" selection-start-line="33" selection-end-line="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/steps/pipenv">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="792">
<caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/compile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="792">
<caret line="33" selection-start-line="33" selection-end-line="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/steps/pipenv">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1032">
<caret line="43" column="28" lean-forward="true" selection-start-line="43" selection-start-column="8" selection-end-line="43" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/steps/pip-uninstall">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288">
<caret line="12" selection-start-line="12" selection-end-line="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/pip-pop/pip-diff">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="14" column="8" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/pip-pop/pip-grep">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="576">
<caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/steps/python">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1800">
<caret line="75" column="94" lean-forward="true" selection-start-line="75" selection-start-column="85" selection-end-line="75" selection-end-column="94" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/steps/python">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1632">
<caret line="68" lean-forward="true" selection-start-line="68" selection-end-line="68" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/steps/pip-uninstall">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288">
<caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/compile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="792">
<caret line="33" selection-start-line="33" selection-end-line="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/steps/pipenv">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1176">
<caret line="49" column="12" lean-forward="true" selection-start-line="49" selection-start-column="12" selection-end-line="49" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/compile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="792">
<caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/steps/pipenv">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1728">
<caret line="72" selection-start-line="72" selection-end-line="72" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/get-pip.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="249">
<caret line="167" column="21" selection-start-line="167" selection-start-column="21" selection-end-line="167" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/pipenv-to-pip">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-129" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Dockerfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="312">
<caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/CHANGELOG.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor />
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/pip-pop/pip-grep">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="10" column="10" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/compile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="229" column="36" lean-forward="true" selection-start-line="229" selection-start-column="36" selection-end-line="229" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/steps/pip-uninstall">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288">
<caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/pip-pop/pip-diff">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="14" column="38" lean-forward="true" selection-start-line="14" selection-start-column="38" selection-end-line="14" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/run">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288">
<caret line="12" column="21" lean-forward="true" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/steps/python">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="235">
<caret line="53" column="151" selection-start-line="53" selection-start-column="151" selection-end-line="53" selection-end-column="151" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/steps/collectstatic">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="293">
<caret line="38" column="31" selection-start-line="38" selection-start-column="31" selection-end-line="38" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/steps/pipenv">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="39" selection-start-line="39" selection-end-line="39" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
.vscode/settings.json 0 → 100644
View file @ 26edb7a0
{
"python.pythonPath": "/home/liujunxiao/.local/share/virtualenvs/django-boilerplate-98fJI8Wm/bin/python"
}
\ No newline at end of file
bin/steps/pipenv
View file @ 26edb7a0
...@@ -44,7 +44,7 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then ...@@ -44,7 +44,7 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then
export PIPENV_VERSION="2018.5.18" export PIPENV_VERSION="2018.5.18"
# Install pipenv. # Install pipenv.
/app/.heroku/python/bin/pip install pipenv==$PIPENV_VERSION --upgrade --upgrade-strategy only-if-needed &> /dev/null /app/.heroku/python/bin/pip install pipenv==$PIPENV_VERSION --upgrade &> /dev/null
# Install the dependencies. # Install the dependencies.
if [[ ! -f Pipfile.lock ]]; then if [[ ! -f Pipfile.lock ]]; then
......
vendor/pip-pop/pip-diff
View file @ 26edb7a0
...@@ -12,9 +12,13 @@ Options: ...@@ -12,9 +12,13 @@ Options:
""" """
import os import os
from docopt import docopt from docopt import docopt
from pip.req import parse_requirements from requests import session
from pip.index import PackageFinder try: # for pip >= 10
from pip._vendor.requests import session from pip._internal.index import PackageFinder
from pip._internal.req import parse_requirements
except ImportError: # for pip <= 9.0.3
from pip.index import PackageFinder
from pip.req import parse_requirements
requests = session() requests = session()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment