Merge branch 'master' into feature/3577

.azure-pipelines/jobs/run-manifest-check.yml

@@ -11,5 +11,5 @@ steps:
  export GIT_SSL_CAINFO=$(python -m certifi)
  export LANG=C.UTF-8
  python -m pip install --upgrade setuptools twine readme_renderer[md]
- python setup.py sdist
+ python setup.py sdist bdist_wheel
  twine check dist/*

.azure-pipelines/jobs/run-tests-windows.yml

@@ -13,6 +13,13 @@ steps:
 
 - template: ../steps/install-dependencies.yml
 
-- template: ../steps/create-virtualenv.yml
+- template: ../steps/create-virtualenv-windows.yml
 
-- template: ../steps/run-tests.yml
+- template: ../steps/run-tests-windows.yml
+
+- task: PublishTestResults@2
+ displayName: Publish Test Results
+ inputs:
+ testResultsFiles: '**/test-results.xml'
+ testRunTitle: 'Python $(python.version)'
+ condition: succeededOrFailed()

.azure-pipelines/jobs/run-vendor-scripts.yml

@@ -9,14 +9,9 @@ jobs:
  strategy:
  maxParallel: 4
  matrix:
- ${{ if eq(parameters.vmImage, 'vs2017-win2016') }}:
- Python37:
- python.version: '>= 3.7.2'
- python.architecture: x64
- ${{ if ne(parameters.vmImage, 'vs2017-win2016' )}}:
- Python37:
- python.version: '>= 3.7'
- python.architecture: x64
+ Python37:
+ python.version: '>= 3.7'
+ python.architecture: x64
  steps:
  - task: UsePythonVersion@0
  displayName: Use Python $(python.version)

.azure-pipelines/jobs/test.yml

@@ -12,37 +12,15 @@ jobs:
  Python27:
  python.version: '2.7'
  python.architecture: x64
- ${{ if eq(parameters.vmImage, 'vs2017-win2016') }}:
- # TODO remove once vs2017-win2016 has Python 3.7
- Python37:
- python.version: '>= 3.7.2'
- python.architecture: x64
- ${{ if ne(parameters.vmImage, 'vs2017-win2016' )}}:
- Python37:
- python.version: '>= 3.7'
- python.architecture: x64
- steps:
- - ${{ if eq(parameters.vmImage, 'vs2017-win2016') }}:
- - template: ./run-tests-windows.yml
-
- - ${{ if ne(parameters.vmImage, 'vs2017-win2016') }}:
- - template: ./run-tests.yml
-
-- job: 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
- pool:
- vmImage: ${{ parameters.vmImage }}
- strategy:
- maxParallel: 4
- matrix:
+ Python37:
+ python.version: '>= 3.7'
+ python.architecture: x64
  Python36:
- python.version: '3.6'
+ python.version: '>= 3.6'
  python.architecture: x64
  steps:
- - ${{ if eq(parameters.vmImage, 'vs2017-win2016') }}:
+ - ${{ if eq(parameters.vmImage, 'windows-2019') }}:
  - template: ./run-tests-windows.yml
 
- - ${{ if ne(parameters.vmImage, 'vs2017-win2016') }}:
+ - ${{ if ne(parameters.vmImage, 'windows-2019') }}:
  - template: ./run-tests.yml

.azure-pipelines/steps/create-virtualenv-linux.yml

@@ -9,6 +9,8 @@ steps:
  echo "Path $PATH"
  echo "Installing Pipenv…"
  pipenv install --deploy --dev
- pipenv run pip install -e "$(pwd)[test]" --upgrade
+ pipenv run pip install -e "$(pwd)[tests]" --upgrade
  echo pipenv --venv && echo pipenv --py && echo pipenv run python --version
  displayName: Make Virtualenv
+ env:
+ PYTHONWARNINGS: 'ignore:DEPRECATION'

.azure-pipelines/steps/create-virtualenv-windows.yml

@@ -0,0 +1,26 @@
+steps:
+
+- script: |
+ echo "##vso[task.setvariable variable=LANG]C.UTF-8"
+ echo "##vso[task.setvariable variable=PIP_PROCESS_DEPENDENCY_LINKS]1"
+ displayName: Set Environment Variables
+
+- powershell: |
+ pip install certifi
+ $env:PYTHON_PATH=$(python -c "import sys; print(sys.executable)")
+ $env:CERTIFI_CONTENT=$(python -m certifi)
+ echo "##vso[task.setvariable variable=GIT_SSL_CAINFO]$env:CERTIFI_CONTENT"
+ echo "##vso[task.setvariable variable=PY_EXE]$env:PYTHON_PATH"
+ displayName: Set Python Path
+ env:
+ PYTHONWARNINGS: 'ignore:DEPRECATION'
+
+- script: |
+ echo "Python path: $(PY_EXE)"
+ echo "GIT_SSL_CAINFO: $(GIT_SSL_CAINFO)"
+ $(PY_EXE) -m pipenv install --deploy --dev
+ env:
+ PIPENV_DEFAULT_PYTHON_VERSION: '$(PIPENV_DEFAULT_PYTHON_VERSION)'
+ PYTHONWARNINGS: 'ignore:DEPRECATION'
+ PIPENV_NOSPIN: '1'
+ displayName: Make Virtualenv

.azure-pipelines/steps/create-virtualenv.yml

@@ -1,31 +1,37 @@
 steps:
 
-- powershell: |
- $env:PY_EXE=$(python -c "import sys; print(sys.executable)")
- if (!$env:PY_EXE) {
- $env:PY_EXE="python"
- }
- Write-Host "##vso[task.setvariable variable=PY_EXE]$env:PY_EXE"
- Write-Host "Found Python: $env:PY_EXE"
- Invoke-Expression "& '$env:PY_EXE' -m virtualenv D:\.venv"
- Write-Host "##vso[task.setvariable variable=VIRTUAL_ENV]D:\.venv"
- Invoke-Expression "& 'D:\.venv\Scripts\activate.ps1'"
- $env:VIRTUAL_ENV="D:\.venv"
- Write-Host "Installing local package..."
- Invoke-Expression "& '$env:PY_EXE' -m pip install -e .[test] --upgrade"
- Write-Host "upgrading local package in virtual env"
- $venv_scripts = Join-Path -path D:\.venv -childpath Scripts
- $venv_py = Join-Path -path $venv_scripts -childpath python.exe
- Write-Host "##vso[task.setvariable variable=VIRTUAL_ENV_PY]$venv_py"
- Invoke-Expression "& '$venv_py' -m pip install -e .[test] --upgrade"
- Write-Host "Installing pipenv development packages"
- Invoke-Expression "& '$venv_py' -m pipenv install --dev"
- Write-Host "Installing local package in pipenv environment"
- Invoke-Expression "& '$venv_py' -m pipenv run pip install -e .[test]"
- Write-Host "Printing metadata"
- Write-Host $(Invoke-Expression "& '$venv_py' -m pipenv --venv")
- Write-Host $(Invoke-Expression "& '$venv_py' -m pipenv --py")
- Write-Host $(Invoke-Expression "& '$venv_py' -m pipenv run python --version")
- displayName: Make Virtualenv
+- script: |
+ echo "##vso[task.setvariable variable=LANG]C.UTF-8"
+ echo "##vso[task.setvariable variable=PIP_PROCESS_DEPENDENCY_LINKS]1"
+ displayName: Set Environment Variables
+
+- ${{ if eq(parameters.vmImage, 'windows-2019') }}:
+ - powershell: |
+ pip install certifi
+ $env:PYTHON_PATH=$(python -c "import sys; print(sys.executable)")
+ $env:CERTIFI_CONTENT=$(python -m certifi)
+ echo "##vso[task.setvariable variable=GIT_SSL_CAINFO]$env:CERTIFI_CONTENT"
+ echo "##vso[task.setvariable variable=PY_EXE]$env:PYTHON_PATH"
+ displayName: Set Python Path
+ env:
+ PYTHONWARNINGS: 'ignore:DEPRECATION'
+- ${{ if ne(parameters.vmImage, 'windows-2019') }}:
+ - bash: |
+ pip install certifi
+ PYTHON_PATH=$(python -c 'import sys; print(sys.executable)')
+ CERTIFI_CONTENT=$(python -m certifi)
+ echo "##vso[task.setvariable variable=GIT_SSL_CAINFO]$CERTIFI_CONTENT"
+ echo "##vso[task.setvariable variable=PY_EXE]$PYTHON_PATH"
+ displayName: Set Python Path
+ env:
+ PYTHONWARNINGS: 'ignore:DEPRECATION'
+
+- script: |
+ echo "Python path: $(PY_EXE)"
+ echo "GIT_SSL_CAINFO: $(GIT_SSL_CAINFO)"
+ $(PY_EXE) -m pipenv install --deploy --dev
  env:
- PIPENV_DEFAULT_PYTHON_VERSION: $(PIPENV_DEFAULT_PYTHON_VERSION)
+ PIPENV_DEFAULT_PYTHON_VERSION: '$(PIPENV_DEFAULT_PYTHON_VERSION)'
+ PYTHONWARNINGS: 'ignore:DEPRECATION'
+ PIPENV_NOSPIN: '1'
+ displayName: Make Virtualenv

.azure-pipelines/steps/install-dependencies.yml

@@ -1,3 +1,5 @@
 steps:
-- script: 'python -m pip install --upgrade pip setuptools wheel && python -m pip install -e .[test] --upgrade'
+- script: 'python -m pip install --upgrade pip setuptools wheel && python -m pip install -e .[tests] --upgrade'
  displayName: Upgrade Pip & Install Pipenv
+ env:
+ PYTHONWARNINGS: 'ignore:DEPRECATION'

.azure-pipelines/steps/run-tests-linux.yml

@@ -0,0 +1,14 @@
+- script: |
+ # Fix Git SSL errors
+ git submodule sync && git submodule update --init --recursive
+ pipenv run pytest --junitxml=test-results.xml
+ displayName: Run integration tests
+ env:
+ PYTHONWARNINGS: 'ignore:DEPRECATION'
+ PY_EXE: $(PY_EXE)
+ GIT_SSL_CAINFO: $(GIT_SSL_CAINFO)
+ LANG: $(LANG)
+ PIP_PROCESS_DEPENDENCY_LINKS: $(PIP_PROCESS_DEPENDENCY_LINKS)
+ PIPENV_DEFAULT_PYTHON_VERSION: $(PIPENV_DEFAULT_PYTHON_VERSION)
+ PYTHONWARNINGS: ignore:DEPRECATION
+ PIPENV_NOSPIN: '1'

.azure-pipelines/steps/run-tests-windows.yml

@@ -0,0 +1,15 @@
+steps:
+- powershell: |
+ subst T: "$env:TEMP"
+ Write-Host "##vso[task.setvariable variable=TEMP]T:\"
+ Write-Host "##vso[task.setvariable variable=TMP]T:\"
+ displayName: Fix Temp Variable
+
+- script: |
+ git submodule sync && git submodule update --init --recursive
+ pipenv run pytest -ra --ignore=pipenv\patched --ignore=pipenv\vendor --junitxml=test-results.xml tests
+ displayName: Run integration tests
+ env:
+ PIPENV_DEFAULT_PYTHON_VERSION: $(PIPENV_DEFAULT_PYTHON_VERSION)
+ PYTHONWARNINGS: 'ignore:DEPRECATION'
+ PIPENV_NOSPIN: '1'

.azure-pipelines/steps/run-tests.yml

@@ -1,24 +1,24 @@
 steps:
-- powershell: |
- # Fix Git SSL errors
- Invoke-Expression "& '$env:VIRTUAL_ENV_PY' -m pip install certifi"
- Invoke-Expression "& '$env:VIRTUAL_ENV_PY' -m certifi > cacert.txt"
- Write-Host "##vso[task.setvariable variable=GIT_SSL_CAINFO]$(Get-Content 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"
- Write-Host "##vso[task.setvariable variable=TEMP]T:\"
- $env:TEMP='T:\'
- Write-Host "##vso[task.setvariable variable=TMP]T:\"
- $env:TMP='T:\'
- git submodule sync
- git submodule update --init --recursive
- Invoke-Expression "& '$env:VIRTUAL_ENV_PY' -m pipenv run pytest -ra --ignore=pipenv\patched --ignore=pipenv\vendor --junitxml=test-results.xml tests"
- displayName: Run integration tests
+- task: UsePythonVersion@0
+ inputs:
+ versionSpec: $(python.version)
+ architecture: '$(python.architecture)'
+ addToPath: true
+ displayName: Use Python $(python.version)
+
+- template: install-dependencies.yml
+
+- script: |
+ echo '##vso[task.setvariable variable=PIPENV_DEFAULT_PYTHON_VERSION]$(PYTHON_VERSION)'
  env:
- VIRTUAL_ENV: $(VIRTUAL_ENV)
- VIRTUAL_ENV_PY: $(VIRTUAL_ENV_PY)
+ PYTHON_VERSION: $(python.version)
+
+- template: create-virtualenv.yml
+
+- ${{ if eq(parameters.vmImage, 'windows-2019') }}:
+ - template: run-tests-windows.yml
+- ${{ if ne(parameters.vmImage, 'windows-2019') }}:
+ - template: run-tests-linux.yml
 
 - task: PublishTestResults@2
  displayName: Publish Test Results

.azure-pipelines/windows.yml

@@ -21,4 +21,4 @@ trigger:
 jobs:
 - template: jobs/test.yml
  parameters:
- vmImage: vs2017-win2016
+ vmImage: windows-2019

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -5,7 +5,7 @@ about: Create a report to help us improve
 
 Be sure to check the existing issues (both open and closed!), and make sure you are running the latest version of Pipenv.
 
-Check the [diagnose documentation](https://docs.pipenv.org/diagnose/) for common issues before posting! We may close your issue if it is very similar to one of them. Please be considerate, or be on your way.
+Check the [diagnose documentation](https://docs.pipenv.org/en/latest/diagnose/) for common issues before posting! We may close your issue if it is very similar to one of them. Please be considerate, or be on your way.
 
 Make sure to mention your debugging experience if the documented solution failed.
 

CONTRIBUTING.md

@@ -3,8 +3,8 @@
 Before opening any issues or proposing any pull requests, please do the
 following:
 
-1. Read our [Contributor's Guide](https://docs.pipenv.org/dev/contributing/).
-2. Understand our [development philosophy](https://docs.pipenv.org/dev/philosophy/).
+1. Read our [Contributor's Guide](https://docs.pipenv.org/en/latest/dev/contributing/).
+2. Understand our [development philosophy](https://docs.pipenv.org/en/latest/dev/philosophy/).
 
 To get the greatest chance of helpful responses, please also observe the
 following additional notes.

Dockerfile

@@ -3,9 +3,11 @@ FROM heroku/heroku:18-build
 ENV DEBIAN_FRONTEND noninteractive
 ENV LC_ALL C.UTF-8
 ENV LANG C.UTF-8
+# Python, don't write bytecode!
+ENV PYTHONDONTWRITEBYTECODE 1
 
 # -- Install Pipenv:
-RUN apt update && apt upgrade -y && apt install python3.7-dev -y
+RUN apt update && apt upgrade -y && apt install python3.7-dev libffi-dev -y
 RUN curl --silent https://bootstrap.pypa.io/get-pip.py | python3.7
 
 # Backwards compatility.

Pipfile

@@ -1,22 +1,13 @@
 [dev-packages]
-pipenv = {path = ".", editable = true, extras = ["test"]}
-"flake8" = ">=3.3.0,<4"
-sphinx = "<=1.5.5"
-twine = "*"
+pipenv = {path = ".", editable = true, extras = ["tests", "dev"]}
 sphinx-click = "*"
 click = "*"
 pytest_pypi = {path = "./tests/pytest-pypi", editable = true}
 stdeb = {version="*", markers="sys_platform == 'linux'"}
-black = {version="*", markers="python_version >= '3.6'"}
-pytz = "*"
-towncrier = {git = "https://github.com/hawkowl/towncrier.git", editable = true, ref = "master"}
-parver = "*"
-invoke = "*"
 jedi = "*"
 isort = "*"
 rope = "*"
-passa = {editable = true, git = "https://github.com/sarugaku/passa.git"}
-bs4 = "*"
+passa = {git = "https://github.com/sarugaku/passa.git"}
 
 [packages]