Merge pull request #2774 from pypa/updates

Updates

.editorconfig

@@ -0,0 +1,26 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.toml]
+indent_size = 2
+
+[*.yaml]
+indent_size = 2
+
+# Makefiles always use tabs for indentation
+[Makefile]
+indent_style = tab
+
+# Batch files use tabs for indentation
+[*.bat]
+indent_style = tab

.vsts-ci/docs.yml

@@ -0,0 +1,20 @@
+phases:
+- phase:
+  displayName: Docs
+  queue: Hosted Linux Preview
+
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.7'
+
+  - template: steps/install-dependencies.yml
+
+  - bash: tox -e docs
+    displayName: Build docs
+
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Artifact: docs'
+    inputs:
+      PathtoPublish: docs/build
+      ArtifactName: docs

.vsts-ci/linux.yml

@@ -0,0 +1,8 @@
+phases:
+- template: phases/test.yml
+  parameters:
+    queue: Hosted Linux Preview
+
+- template: phases/run-vendor-scripts.yml
+  parameters:
+    queue: Hosted Linux Preview

.vsts-ci/phases/run-manifest-check.yml

@@ -0,0 +1,14 @@
+steps:
+- task: UsePythonVersion@0
+  displayName: Use Python $(python.version)
+  inputs:
+    versionSpec: '$(python.version)'
+    architecture: '$(python.architecture)'
+
+- template: ../steps/install-dependencies.yml
+
+- bash: |
+   export GIT_SSL_CAINFO=$(python -m certifi)
+   export LANG=C.UTF-8
+   python -m pip install check-manifest
+   check-manifest

.vsts-ci/phases/run-tests-windows.yml

@@ -0,0 +1,12 @@
+steps:
+- task: UsePythonVersion@0
+  displayName: Use Python $(python.version)
+  inputs:
+    versionSpec: '$(python.version)'
+    architecture: '$(python.architecture)'
+
+- template: ../steps/install-dependencies.yml
+
+- template: ../steps/create-virtualenv.yml
+
+- template: ../steps/run-tests.yml

.vsts-ci/phases/run-tests.yml

@@ -0,0 +1,37 @@
+steps:
+- task: UsePythonVersion@0
+  displayName: Use Python $(python.version)
+  inputs:
+    versionSpec: '$(python.version)'
+    architecture: '$(python.architecture)'
+
+- template: ../steps/install-dependencies.yml
+
+- bash: |
+   mkdir -p "$AGENT_HOMEDIRECTORY/.virtualenvs"
+   mkdir -p "$WORKON_HOME"
+   pip install certifi
+   export GIT_SSL_CAINFO=$(python -m certifi)
+   export LANG=C.UTF-8
+   export PIP_PROCESS_DEPENDENCY_LINKS="1"
+   echo "Path: $PATH"
+   echo "Installing Pipenv…"
+   pip install -e "$(pwd)" --upgrade
+   pipenv install --deploy --dev
+   echo pipenv --venv && echo pipenv --py && echo pipenv run python --version
+  displayName: Make Virtualenv
+
+- script: |
+    # Fix Git SSL errors
+    export GIT_SSL_CAINFO=$(python -m certifi)
+    export LANG=C.UTF-8
+    export PIP_PROCESS_DEPENDENCY_LINKS="1"
+    pipenv run pytest --junitxml=test-results.xml
+  displayName: Run integration tests
+
+- task: PublishTestResults@2
+  displayName: Publish Test Results
+  inputs:
+    testResultsFiles: '**/test-results.xml'
+    testRunTitle: 'Python $(python.version)'
+  condition: succeededOrFailed()

.vsts-ci/phases/run-vendor-scripts.yml

@@ -0,0 +1,39 @@
+parameters:
+  queue:
+
+phases:
+- phase: Vendor_Scripts
+  displayName: Test Vendor Scripts
+
+  queue:
+    name: ${{ parameters.queue }}
+    parallel: 4
+    matrix:
+      ${{ if eq(parameters.queue, 'Hosted VS2017') }}:
+        # TODO remove once Hosted VS2017 has Python 3.7
+        Python37:
+          python.version: '>= 3.7.0-b2'
+          python.architecture: x64
+      ${{ if ne(parameters.queue, 'Hosted VS2017' )}}:
+        Python37:
+          python.version: '>= 3.7'
+          python.architecture: x64
+  steps:
+  - task: UsePythonVersion@0
+    displayName: Use Python $(python.version)
+    inputs:
+      versionSpec: '$(python.version)'
+      architecture: '$(python.architecture)'
+
+  - template: ../steps/install-dependencies.yml
+
+  - bash: |
+     mkdir -p "$AGENT_HOMEDIRECTORY/.virtualenvs"
+     mkdir -p "$WORKON_HOME"
+     pip install certifi
+     export GIT_SSL_CAINFO=$(python -m certifi)
+     export LANG=C.UTF-8
+     python -m pip install --upgrade invoke requests parver
+     python -m invoke vendoring.update
+
+  - template: ./run-manifest-check.yml

.vsts-ci/phases/test.yml

@@ -0,0 +1,49 @@
+parameters:
+  queue:
+
+phases:
+- phase: Test_Primary
+  displayName: Test Primary
+
+  queue:
+    name: ${{ parameters.queue }}
+    parallel: 4
+    matrix:
+      Python27:
+        python.version: '2.7'
+        python.architecture: x64
+      ${{ if eq(parameters.queue, 'Hosted VS2017') }}:
+        # TODO remove once Hosted VS2017 has Python 3.7
+        Python37:
+          python.version: '>= 3.7.0-b2'
+          python.architecture: x64
+      ${{ if ne(parameters.queue, 'Hosted VS2017' )}}:
+        Python37:
+          python.version: '>= 3.7'
+          python.architecture: x64
+  steps:
+  - ${{ if eq(parameters.queue, 'Hosted VS2017') }}:
+    - template: ./run-tests-windows.yml
+
+  - ${{ if ne(parameters.queue, 'Hosted VS2017') }}:
+    - template: ./run-tests.yml
+
+- phase: Test_Secondary
+  displayName: Test python3.6
+  # Run after Test_Primary so we don't devour time and jobs if tests are going to fail
+#   dependsOn: Test_Primary
+
+  queue:
+    name: ${{ parameters.queue }}
+    parallel: 4
+    matrix:
+      Python36:
+        python.version: '3.6'
+        python.architecture: x64
+  steps:
+  - ${{ if eq(parameters.queue, 'Hosted VS2017') }}:
+    - template: ./run-tests-windows.yml
+
+  - ${{ if ne(parameters.queue, 'Hosted VS2017') }}:
+    - template: ./run-tests.yml
+

.vsts-ci/steps/create-virtualenv.yml

@@ -0,0 +1,6 @@
+steps:
+- script: |
+   virtualenv D:\.venv
+   D:\.venv\Scripts\pip.exe install -e . && D:\.venv\Scripts\pipenv install --dev
+   echo D:\.venv\Scripts\pipenv --venv && echo D:\.venv\Scripts\pipenv --py && echo D:\.venv\Scripts\pipenv run python --version
+  displayName: Make Virtualenv

.vsts-ci/steps/install-dependencies.yml

@@ -0,0 +1,3 @@
+steps:
+- script: 'python -m pip install --upgrade pip && python -m pip install -e .'
+  displayName: Upgrade Pip & Install Pipenv

.vsts-ci/steps/run-tests.yml

@@ -0,0 +1,20 @@
+steps:
+- powershell: |
+    # Fix Git SSL errors
+    pip install certifi
+    python -m certifi > cacert.txt
+    $env:GIT_SSL_CAINFO = $(Get-Content cacert.txt)
+    # Shorten paths to get under MAX_PATH or else integration tests will fail
+    # https://bugs.python.org/issue18199
+    subst T: $env:TEMP
+    $env:TEMP = "T:\"
+    $env:TMP = "T:\"
+    D:\.venv\Scripts\pipenv run pytest -n 4 --ignore=pipenv\patched --ignore=pipenv\vendor --junitxml=test-results.xml tests
+  displayName: Run integration tests
+
+- task: PublishTestResults@2
+  displayName: Publish Test Results
+  inputs:
+    testResultsFiles: '**/test-results.xml'
+    testRunTitle: 'Python $(python.version)'
+  condition: succeededOrFailed()

.vsts-ci/windows.yml

@@ -0,0 +1,4 @@
+phases:
+- template: phases/test.yml
+  parameters:
+    queue: Hosted VS2017

MANIFEST.in

@@ -1,6 +1,33 @@
-include README.md CHANGELOG.rst LICENSE NOTICES HISTORY.txt pipenv/patched/safety.zip
-include pipenv/vendor/pipreqs/stdlib
-include pipenv/vendor/pipreqs/mapping
-include pipenv/vendor/click_completion/*.j2
+include LICENSE README.md CONTRIBUTING.md CODE_OF_CONDUCT.md CHANGELOG.rst NOTICES HISTORY.txt
+include Makefile pyproject.toml get-pipenv.py
+include examples/Pipfil*
+recursive-include pipenv LICENSE LICENSE* *LICENSE* *COPYING* t32.exe t64.exe w32.exe w64.exe cacert.pem
+recursive-include pipenv *.cfg
+recursive-include pipenv/vendor *.c *.j2
+recursive-include pipenv *.md *.APACHE *.BSD
+recursive-include pipenv Makefile
+recursive-include pipenv/vendor vendor.txt
+recursive-include pipenv README
+include pipenv/patched/notpip/_vendor/vendor.txt
+include pipenv/patched/safety.zip pipenv/patched/patched.txt
+include pipenv/vendor/pipreqs/stdlib pipenv/vendor/pipreqs/mapping
+include pipenv/vendor/*.txt pipenv/vendor/pexpect/bashrc.sh
+include pipenv/vendor/Makefile
 include pipenv/pipenv.1
-recursive-include pipenv *LICENSE* *COPYING* t32.exe t64.exe w32.exe w64.exe cacert.pem
+exclude .editorconfig .travis.yml .env appveyor.yml tox.ini pytest.ini
+exclude Pipfile* CHANGELOG.draft.rst
+exclude docker-compose.yml Dockerfile
+exclude run-tests.sh run-tests.bat
+
+recursive-include docs Makefile *.rst *.py *.bat
+recursive-include docs/_templates *.html
+recursive-include docs/_static *.js *.css *.png
+recursive-exclude docs requirements*.txt
+
+prune .buildkite
+prune .github
+prune .vsts-ci
+prune docs/build
+prune news
+prune tasks
+prune tests

Pipfile

@@ -20,6 +20,7 @@ invoke = "*"
 jedi = "*"
 isort = "*"
 rope = "*"
+passa = {editable = true, git = "https://github.com/sarugaku/passa.git"}
 
 [packages]