diff --git a/.env b/.env new file mode 100644 index 00000000..189ddda7 --- /dev/null +++ b/.env @@ -0,0 +1,2 @@ +HELLO=WORLD +PYPI_VENDOR_DIR="./tests/pypi/" \ No newline at end of file diff --git a/README.rst b/README.rst index 91734643..a80fd0ac 100644 --- a/README.rst +++ b/README.rst @@ -10,12 +10,6 @@ Pipenv: Python Development Workflow for Humans .. image:: https://img.shields.io/pypi/pyversions/pipenv.svg :target: https://pypi.python.org/pypi/pipenv -.. image:: https://travis-ci.org/pypa/pipenv.svg?branch=master - :target: https://travis-ci.org/pypa/pipenv - -.. image:: https://img.shields.io/appveyor/ci/kennethreitz/pipenv.svg - :target: https://ci.appveyor.com/project/kennethreitz/pipenv/branch/master - .. image:: https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg :target: https://saythanks.io/to/kennethreitz diff --git a/_appveyor/install.ps1 b/_appveyor/install.ps1 deleted file mode 100644 index 160ba55c..00000000 --- a/_appveyor/install.ps1 +++ /dev/null @@ -1,229 +0,0 @@ -# Sample script to install Python and pip under Windows -# Authors: Olivier Grisel, Jonathan Helmus, Kyle Kastner, and Alex Willmer -# License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/ - -$MINICONDA_URL = "http://repo.continuum.io/miniconda/" -$BASE_URL = "https://www.python.org/ftp/python/" -$GET_PIP_URL = "https://bootstrap.pypa.io/get-pip.py" -$GET_PIP_PATH = "C:\get-pip.py" - -$PYTHON_PRERELEASE_REGEX = @" -(?x) -(?\d+) -\. -(?\d+) -\. -(?\d+) -(?[a-z]{1,2}\d+) -"@ - - -function Download ($filename, $url) { - $webclient = New-Object System.Net.WebClient - - $basedir = $pwd.Path + "\" - $filepath = $basedir + $filename - if (Test-Path $filename) { - Write-Host "Reusing" $filepath - return $filepath - } - - # Download and retry up to 3 times in case of network transient errors. - Write-Host "Downloading" $filename "from" $url - $retry_attempts = 2 - for ($i = 0; $i -lt $retry_attempts; $i++) { - try { - $webclient.DownloadFile($url, $filepath) - break - } - Catch [Exception]{ - Start-Sleep 1 - } - } - if (Test-Path $filepath) { - Write-Host "File saved at" $filepath - } else { - # Retry once to get the error message if any at the last try - $webclient.DownloadFile($url, $filepath) - } - return $filepath -} - - -function ParsePythonVersion ($python_version) { - if ($python_version -match $PYTHON_PRERELEASE_REGEX) { - return ([int]$matches.major, [int]$matches.minor, [int]$matches.micro, - $matches.prerelease) - } - $version_obj = [version]$python_version - return ($version_obj.major, $version_obj.minor, $version_obj.build, "") -} - - -function DownloadPython ($python_version, $platform_suffix) { - $major, $minor, $micro, $prerelease = ParsePythonVersion $python_version - - if (($major -le 2 -and $micro -eq 0) ` - -or ($major -eq 3 -and $minor -le 2 -and $micro -eq 0) ` - ) { - $dir = "$major.$minor" - $python_version = "$major.$minor$prerelease" - } else { - $dir = "$major.$minor.$micro" - } - - if ($prerelease) { - if (($major -le 2) ` - -or ($major -eq 3 -and $minor -eq 1) ` - -or ($major -eq 3 -and $minor -eq 2) ` - -or ($major -eq 3 -and $minor -eq 3) ` - ) { - $dir = "$dir/prev" - } - } - - if (($major -le 2) -or ($major -le 3 -and $minor -le 4)) { - $ext = "msi" - if ($platform_suffix) { - $platform_suffix = ".$platform_suffix" - } - } else { - $ext = "exe" - if ($platform_suffix) { - $platform_suffix = "-$platform_suffix" - } - } - - $filename = "python-$python_version$platform_suffix.$ext" - $url = "$BASE_URL$dir/$filename" - $filepath = Download $filename $url - return $filepath -} - - -function InstallPython ($python_version, $architecture, $python_home) { - Write-Host "Installing Python" $python_version "for" $architecture "bit architecture to" $python_home - if (Test-Path $python_home) { - Write-Host $python_home "already exists, skipping." - return $false - } - if ($architecture -eq "32") { - $platform_suffix = "" - } else { - $platform_suffix = "amd64" - } - $installer_path = DownloadPython $python_version $platform_suffix - $installer_ext = [System.IO.Path]::GetExtension($installer_path) - Write-Host "Installing $installer_path to $python_home" - $install_log = $python_home + ".log" - if ($installer_ext -eq '.msi') { - InstallPythonMSI $installer_path $python_home $install_log - } else { - InstallPythonEXE $installer_path $python_home $install_log - } - if (Test-Path $python_home) { - Write-Host "Python $python_version ($architecture) installation complete" - } else { - Write-Host "Failed to install Python in $python_home" - Get-Content -Path $install_log - Exit 1 - } -} - - -function InstallPythonEXE ($exepath, $python_home, $install_log) { - $install_args = "/quiet InstallAllUsers=1 TargetDir=$python_home" - RunCommand $exepath $install_args -} - - -function InstallPythonMSI ($msipath, $python_home, $install_log) { - $install_args = "/qn /log $install_log /i $msipath TARGETDIR=$python_home" - $uninstall_args = "/qn /x $msipath" - RunCommand "msiexec.exe" $install_args - if (-not(Test-Path $python_home)) { - Write-Host "Python seems to be installed else-where, reinstalling." - RunCommand "msiexec.exe" $uninstall_args - RunCommand "msiexec.exe" $install_args - } -} - -function RunCommand ($command, $command_args) { - Write-Host $command $command_args - Start-Process -FilePath $command -ArgumentList $command_args -Wait -Passthru -} - - -function InstallPip ($python_home) { - $pip_path = $python_home + "\Scripts\pip.exe" - $python_path = $python_home + "\python.exe" - if (-not(Test-Path $pip_path)) { - Write-Host "Installing pip..." - $webclient = New-Object System.Net.WebClient - $webclient.DownloadFile($GET_PIP_URL, $GET_PIP_PATH) - Write-Host "Executing:" $python_path $GET_PIP_PATH - & $python_path $GET_PIP_PATH - } else { - Write-Host "pip already installed." - } -} - - -function DownloadMiniconda ($python_version, $platform_suffix) { - if ($python_version -eq "3.4") { - $filename = "Miniconda3-3.5.5-Windows-" + $platform_suffix + ".exe" - } else { - $filename = "Miniconda-3.5.5-Windows-" + $platform_suffix + ".exe" - } - $url = $MINICONDA_URL + $filename - $filepath = Download $filename $url - return $filepath -} - - -function InstallMiniconda ($python_version, $architecture, $python_home) { - Write-Host "Installing Python" $python_version "for" $architecture "bit architecture to" $python_home - if (Test-Path $python_home) { - Write-Host $python_home "already exists, skipping." - return $false - } - if ($architecture -eq "32") { - $platform_suffix = "x86" - } else { - $platform_suffix = "x86_64" - } - $filepath = DownloadMiniconda $python_version $platform_suffix - Write-Host "Installing" $filepath "to" $python_home - $install_log = $python_home + ".log" - $args = "/S /D=$python_home" - Write-Host $filepath $args - Start-Process -FilePath $filepath -ArgumentList $args -Wait -Passthru - if (Test-Path $python_home) { - Write-Host "Python $python_version ($architecture) installation complete" - } else { - Write-Host "Failed to install Python in $python_home" - Get-Content -Path $install_log - Exit 1 - } -} - - -function InstallMinicondaPip ($python_home) { - $pip_path = $python_home + "\Scripts\pip.exe" - $conda_path = $python_home + "\Scripts\conda.exe" - if (-not(Test-Path $pip_path)) { - Write-Host "Installing pip..." - $args = "install --yes pip" - Write-Host $conda_path $args - Start-Process -FilePath "$conda_path" -ArgumentList $args -Wait -Passthru - } else { - Write-Host "pip already installed." - } -} - -function main () { - InstallPython $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON - InstallPip $env:PYTHON -} - -main diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index c17c9150..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,51 +0,0 @@ -# AppVeyor.yml from https://github.com/ogrisel/python-appveyor-demo -# License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/ - -build: off - -environment: - - # Create expected SHELL variable for pipenv. - SHELL: "windows" - - matrix: - - - PYTHON: "C:\\Python27-x64" - PYTHON_VERSION: "2.7.x" - PYTHON_ARCH: "64" - - - PYTHON: "C:\\Python34-x64" - PYTHON_VERSION: "3.4.x" - PYTHON_ARCH: "64" - - - PYTHON: "C:\\Python35-x64" - PYTHON_VERSION: "3.5.x" - PYTHON_ARCH: "64" - - - PYTHON: "C:\\Python36-x64" - PYTHON_VERSION: "3.6.x" - PYTHON_ARCH: "64" - -install: - # Install Python (from the official .msi of http://python.org) and pip when - # not already installed. - - ps: if (-not(Test-Path($env:PYTHON))) { & _appveyor\install.ps1 } - - # Prepend newly installed Python to the PATH of this build (this cannot be - # done from inside the powershell script as it would require to restart - # the parent CMD process). - - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - - "SET PYTHONIOENCODING=utf-8" - - # Check that we have the expected version and architecture for Python - - "python --version" - - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" - - # Upgrade to the latest version of pip to avoid it displaying warnings - # about it being out of date. - - "pip install --disable-pip-version-check --user --upgrade pip" - - "pip install -e . --upgrade" - - "pipenv install --system --dev --skip-lock" - -test_script: - - "pipenv run pytest -n 8 tests/test_pipenv.py tests/test_project.py tests/test_utils.py" diff --git a/run-tests.bat b/run-tests.bat new file mode 100644 index 00000000..0f4c34e4 --- /dev/null +++ b/run-tests.bat @@ -0,0 +1,5 @@ +virtualenv .venv +.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed +.venv\Scripts\pipenv install --dev + +SET PYPI_VENDOR_DIR=".\tests\pypi\" && .venv\Scripts\pipenv run pytest -n auto -v tests --tap-stream diff --git a/run-tests.sh b/run-tests.sh index fa4d52c6..9a21c9e5 100644 --- a/run-tests.sh +++ b/run-tests.sh @@ -18,7 +18,7 @@ if [[ ! -z "$CI" ]]; then echo "Installing Pipenv…" pip install -e . --upgrade --upgrade-strategy=only-if-needed - pipenv install --dev + pipenv install --deploy --system --dev fi -pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" --tap-stream | tee results.tap \ No newline at end of file +pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" --tap-stream \ No newline at end of file diff --git a/tests/pytest-pypi/pytest_pypi/app.py b/tests/pytest-pypi/pytest_pypi/app.py index 445e1f96..18f35102 100644 --- a/tests/pytest-pypi/pytest_pypi/app.py +++ b/tests/pytest-pypi/pytest_pypi/app.py @@ -21,7 +21,7 @@ class Package(object): def releases(self): r = [] for release in self._releases: - release = release[len(PYPI_VENDOR_DIR):] + release = release[len(PYPI_VENDOR_DIR):].replace('\\', '/') r.append(release) return r @@ -32,8 +32,7 @@ class Package(object): self._releases.append(path_to_binary) -def prepare_packages(path=PYPI_VENDOR_DIR): - print(os.path.abspath(PYPI_VENDOR_DIR)) +def prepare_packages(): for root, dirs, files in os.walk(os.path.abspath(PYPI_VENDOR_DIR)): for file in files: if not file.startswith('.'): @@ -44,16 +43,20 @@ def prepare_packages(path=PYPI_VENDOR_DIR): packages[package_name].add_release(os.path.sep.join([root, file])) + prepare_packages() + @app.route('/') def hello_world(): return redirect('/simple', code=302) + @app.route('/simple') def simple(): return render_template('simple.html', packages=packages.values()) + @app.route('/simple//') def simple_package(package): if package in packages: @@ -61,6 +64,7 @@ def simple_package(package): else: abort(404) + @app.route('//') def serve_package(package, release): if package in packages: @@ -72,5 +76,6 @@ def serve_package(package, release): abort(404) + if __name__ == '__main__': - app.run() \ No newline at end of file + app.run() diff --git a/tests/test_pipenv.py b/tests/test_pipenv.py index e70e1ee6..52843681 100644 --- a/tests/test_pipenv.py +++ b/tests/test_pipenv.py @@ -25,6 +25,7 @@ except: os.environ['PIPENV_DONT_USE_PYENV'] = '1' os.environ['PIPENV_IGNORE_VIRTUALENVS'] = '1' +os.environ['PIPENV_VENV_IN_PROJECT'] = '1' os.environ['PYPI_VENDOR_DIR'] = os.path.sep.join([os.path.dirname(__file__), 'pypi']) @@ -193,11 +194,6 @@ class TestPipenv: with PipenvInstance() as p: assert p.pipenv('--help').out - @pytest.mark.cli - def test_completion(self): - with PipenvInstance() as p: - assert p.pipenv('--completion').out - @pytest.mark.cli def test_man(self): with PipenvInstance() as p: