Hello community, here is the log from the commit of package python-argon2-cffi for openSUSE:Factory checked in at 2020-08-01 12:30:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-argon2-cffi (Old) and /work/SRC/openSUSE:Factory/.python-argon2-cffi.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-argon2-cffi" Sat Aug 1 12:30:49 2020 rev:8 rq:823068 version:20.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-argon2-cffi/python-argon2-cffi.changes 2020-03-27 00:24:51.960243692 +0100 +++ /work/SRC/openSUSE:Factory/.python-argon2-cffi.new.3592/python-argon2-cffi.changes 2020-08-01 12:30:57.538444506 +0200 @@ -1,0 +2,7 @@ +Tue Jul 28 06:32:23 UTC 2020 - Steve Kowalik <steven.kowalik@suse.com> + +- Update to 20.1.0: + * It is now possible to manually override the detection of SSE2 using + the ``ARGON2_CFFI_USE_SSE2`` environment variable. + +------------------------------------------------------------------- Old: ---- argon2-cffi-19.2.0.tar.gz New: ---- argon2-cffi-20.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-argon2-cffi.spec ++++++ --- /var/tmp/diff_new_pack.55nr9E/_old 2020-08-01 12:30:58.354445270 +0200 +++ /var/tmp/diff_new_pack.55nr9E/_new 2020-08-01 12:30:58.354445270 +0200 @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %bcond_without python2 Name: python-argon2-cffi -Version: 19.2.0 +Version: 20.1.0 Release: 0 Summary: The Argon2 password hashing algorithm for Python License: MIT ++++++ argon2-cffi-19.2.0.tar.gz -> argon2-cffi-20.1.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argon2-cffi-19.2.0/.azure-pipelines/wheel-builder.yml new/argon2-cffi-20.1.0/.azure-pipelines/wheel-builder.yml --- old/argon2-cffi-19.2.0/.azure-pipelines/wheel-builder.yml 2019-10-19 12:24:58.000000000 +0200 +++ new/argon2-cffi-20.1.0/.azure-pipelines/wheel-builder.yml 2020-03-31 16:07:52.000000000 +0200 @@ -29,17 +29,13 @@ displayName: Create virtualenv - script: .venv/bin/pip install -U wheel displayName: Update wheel to the latest version - - script: .venv/bin/pip install six cffi "enum34; python_version < '3'" + - script: .venv/bin/pip install -U six cffi "enum34; python_version < '3'" pip displayName: Install our Python dependencies - script: | set -e set -x - REGEX="3\.([0-9])*" - if [[ "${PYTHON_VERSION}" =~ $REGEX ]]; then - PY_LIMITED_API="--build-option --py-limited-api=cp3${BASH_REMATCH[1]}" - fi - .venv/bin/pip wheel argon2_cffi --no-use-pep517 --wheel-dir=wheelhouse $PY_LIMITED_API --no-binary argon2_cffi --no-deps + .venv/bin/pip wheel argon2_cffi --wheel-dir=wheelhouse --no-binary argon2_cffi --no-deps displayName: Build the wheel - script: .venv/bin/pip install --no-index -f wheelhouse argon2_cffi displayName: Test installing the wheel @@ -66,17 +62,13 @@ steps: - script: /opt/python/$PYTHON_VERSION/bin/python -m virtualenv .venv displayName: Create virtualenv - - script: .venv/bin/pip install six cffi "enum34; python_version < '3'" + - script: .venv/bin/pip install -U six cffi "enum34; python_version < '3'" pip displayName: Install our Python dependencies - script: | set -e set -x - REGEX="cp3([0-9])*" - if [[ "$PYTHON_VERSION" =~ $REGEX ]]; then - PY_LIMITED_API="--build-option --py-limited-api=cp3${BASH_REMATCH[1]}" - fi - .venv/bin/pip wheel --no-use-pep517 --no-binary argon2_cffi --no-deps argon2_cffi -w tmpwheelhouse/ $PY_LIMITED_API + .venv/bin/pip wheel --no-binary argon2_cffi --no-deps argon2_cffi -w tmpwheelhouse/ displayName: Build the wheel - script: auditwheel repair tmpwheelhouse/argon2_cffi*.whl -w wheelhouse/ displayName: Run auditwheel @@ -146,10 +138,10 @@ WINDOWS_ARCH: 'x86_64' steps: - script: | - "C:/Python%PYTHON_VERSION%/Scripts/pip" install six cffi "enum34; python_version < '3'" + "C:/Python%PYTHON_VERSION%/Scripts/pip" install -U six cffi "enum34; python_version < '3'" displayName: Install our Python dependencies - script: | - C:/Python%PYTHON_VERSION%/Scripts/pip wheel --no-use-pep517 argon2_cffi --wheel-dir=wheelhouse --no-binary argon2_cffi + C:/Python%PYTHON_VERSION%/Scripts/pip wheel argon2_cffi --wheel-dir=wheelhouse --no-binary argon2_cffi displayName: Build the wheel - script: '"C:/Python%PYTHON_VERSION%/Scripts/pip" install -f wheelhouse argon2_cffi --no-index' displayName: Test installing the wheel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argon2-cffi-19.2.0/.coveragerc new/argon2-cffi-20.1.0/.coveragerc --- old/argon2-cffi-19.2.0/.coveragerc 2018-03-17 11:32:49.000000000 +0100 +++ new/argon2-cffi-20.1.0/.coveragerc 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -[run] -branch = True -source = argon2 - -[paths] -source = - src/argon2 - .tox/*/lib/python*/site-packages/argon2 - .tox/pypy*/site-packages/argon2 - -[report] -show_missing = True -omit = - src/argon2/_ffi_build.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argon2-cffi-19.2.0/.github/CONTRIBUTING.rst new/argon2-cffi-20.1.0/.github/CONTRIBUTING.rst --- old/argon2-cffi-19.2.0/.github/CONTRIBUTING.rst 2019-10-27 18:41:58.000000000 +0100 +++ new/argon2-cffi-20.1.0/.github/CONTRIBUTING.rst 2020-03-31 16:07:52.000000000 +0200 @@ -1,7 +1,7 @@ How To Contribute ================= -First off, thank you for considering contributing to ``argon2_cffi``! +First off, thank you for considering contributing to ``argon2-cffi``! It's people like *you* who make it such a great tool for everyone. This document intends to make contribution more accessible by codifying tribal knowledge and expectations. @@ -59,7 +59,7 @@ assert "foo" == x._a_private_attribute - To run the test suite, all you need is a recent tox_. - It will ensure the test suite runs with all dependencies against all Python versions just as it will on Travis CI. + It will ensure the test suite runs with all dependencies against all Python versions just as it will in our CI. If you lack some Python versions, you can can always limit the environments like ``tox -e py27,py35`` (in that case you may want to look into pyenv_, which makes it very easy to install many different Python versions in parallel). - Write `good test docstrings`_. @@ -199,7 +199,7 @@ .. _pyenv: https://github.com/pyenv/pyenv .. _reStructuredText: https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html .. _semantic newlines: https://rhodesmill.org/brandon/2012/one-sentence-per-line/ -.. _CI: https://travis-ci.org/hynek/argon2_cffi/ +.. _CI: https://github.com/hynek/argon2-cffi/actions?query=workflow%3ACI .. _black: https://github.com/psf/black .. _pre-commit: https://pre-commit.com/ .. _isort: https://github.com/timothycrosley/isort diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argon2-cffi-19.2.0/.github/workflows/main.yml new/argon2-cffi-20.1.0/.github/workflows/main.yml --- old/argon2-cffi-19.2.0/.github/workflows/main.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/argon2-cffi-20.1.0/.github/workflows/main.yml 2020-03-31 16:07:52.000000000 +0200 @@ -0,0 +1,117 @@ +--- +name: CI + +on: + push: + branches: ["master"] + pull_request: + branches: ["master"] + # Allow rebuilds via API. + repository_dispatch: + types: rebuild + +jobs: + tests: + name: "Python ${{ matrix.python-version }}" + runs-on: "ubuntu-latest" + env: + USING_COVERAGE: '2.7,3.5,3.6,3.7,3.8' + + strategy: + matrix: + python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "pypy2", "pypy3"] + + steps: + - uses: "actions/checkout@v2" + with: + submodules: "recursive" + - uses: "actions/setup-python@v1" + with: + python-version: "${{ matrix.python-version }}" + - name: "Install dependencies" + run: | + set -xe + python -VV + python -m site + python -m pip install --upgrade pip setuptools wheel + python -m pip install --upgrade coverage[toml] virtualenv tox tox-gh-actions + + - name: "Run tox targets for ${{ matrix.python-version }}" + run: "python -m tox" + + - name: "Combine coverage" + run: | + set -xe + python -m coverage combine + python -m coverage xml + if: "contains(env.USING_COVERAGE, matrix.python-version)" + - name: "Upload coverage to Codecov" + uses: "codecov/codecov-action@v1" + if: "contains(env.USING_COVERAGE, matrix.python-version)" + with: + fail_ci_if_error: true + + system-package: + runs-on: "ubuntu-latest" + name: "Install and test with system package of Argon2." + steps: + - uses: "actions/checkout@v2" + - uses: "actions/setup-python@v1" + with: + python-version: "3.8" + - name: "Install dependencies" + run: | + set -xe + sudo apt-get install libargon2-0 libargon2-0-dev + # Ensure we cannot use our own Argon2 by accident. + rm -rf extras + python -VV + python -m site + python -m pip install --upgrade pip setuptools wheel + python -m pip install --upgrade virtualenv tox + + - name: "Run tox -e system-argon2" + run: "python -m tox -e system-argon2" + + package: + name: "Build & verify package" + runs-on: "ubuntu-latest" + + steps: + - uses: "actions/checkout@v2" + with: + submodules: "recursive" + - uses: "actions/setup-python@v1" + with: + python-version: "3.8" + + - name: "Install pep517 and twine" + run: "python -m pip install pep517 twine" + - name: "Build package" + run: "python -m pep517.build --source --binary ." + - name: "List result" + run: "ls -l dist" + - name: "Check long_description" + run: "python -m twine check dist/*" + + install-dev: + strategy: + matrix: + os: ["ubuntu-latest", "windows-latest", "macos-latest"] + + name: "Verify dev env" + runs-on: "${{ matrix.os }}" + + steps: + - uses: "actions/checkout@v2" + with: + submodules: "recursive" + - uses: "actions/setup-python@v1" + with: + python-version: "3.8" + - name: "Install in dev mode" + run: | + python setup.py build + python -m pip install -e .[dev] + - name: "Import package" + run: "python -c 'import argon2; print(argon2.__version__)'" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argon2-cffi-19.2.0/.pre-commit-config.yaml new/argon2-cffi-20.1.0/.pre-commit-config.yaml --- old/argon2-cffi-19.2.0/.pre-commit-config.yaml 2019-10-27 18:45:28.000000000 +0100 +++ new/argon2-cffi-20.1.0/.pre-commit-config.yaml 2020-05-10 17:11:50.000000000 +0200 @@ -1,20 +1,16 @@ +--- repos: - - repo: https://gitlab.com/pycqa/flake8 - rev: 3.7.8 - hooks: - - id: flake8 - - repo: https://github.com/psf/black - rev: 19.3b0 + rev: 19.10b0 hooks: - id: black - language_version: python3.7 + language_version: python3.8 # override until resolved: https://github.com/ambv/black/issues/402 files: \.pyi?$ types: [] - repo: https://github.com/asottile/seed-isort-config - rev: v1.9.3 + rev: v2.1.1 hooks: - id: seed-isort-config @@ -23,10 +19,14 @@ hooks: - id: isort additional_dependencies: [toml] - language_version: python3.7 + + - repo: https://gitlab.com/pycqa/flake8 + rev: 3.8.0a2 + hooks: + - id: flake8 - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.3.0 + rev: v2.5.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argon2-cffi-19.2.0/CHANGELOG.rst new/argon2-cffi-20.1.0/CHANGELOG.rst --- old/argon2-cffi-19.2.0/CHANGELOG.rst 2019-10-27 18:48:21.000000000 +0100 +++ new/argon2-cffi-20.1.0/CHANGELOG.rst 2020-05-11 07:22:23.000000000 +0200 @@ -5,6 +5,33 @@ The third digit is only for regressions. +20.1.0 (2020-05-11) +------------------- + +Vendoring Argon2 @ `62358ba <https://github.com/P-H-C/phc-winner-argon2/tree/62358ba2123abd17fccf2a108a301d4b52c01a7c>`_ (20190702) + + +Backward-incompatible changes: +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +*none* + + +Deprecations: +^^^^^^^^^^^^^ + +*none* + + +Changes: +^^^^^^^^ + +- It is now possible to manually override the detection of SSE2 using the ``ARGON2_CFFI_USE_SSE2`` environment variable. + + +---- + + 19.2.0 (2019-10-27) ------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argon2-cffi-19.2.0/PKG-INFO new/argon2-cffi-20.1.0/PKG-INFO --- old/argon2-cffi-19.2.0/PKG-INFO 2019-10-27 18:58:06.284667700 +0100 +++ new/argon2-cffi-20.1.0/PKG-INFO 2020-05-11 07:30:40.410058500 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: argon2-cffi -Version: 19.2.0 +Version: 20.1.0 Summary: The secure Argon2 password hashing algorithm. Home-page: https://argon2-cffi.readthedocs.io/ Author: Hynek Schlawack @@ -15,21 +15,13 @@ CFFI-based Argon2 Bindings for Python ===================================== - .. image:: https://img.shields.io/pypi/v/argon2-cffi.svg - :target: https://pypi.org/project/argon2-cffi/ - :alt: PyPI - .. image:: https://readthedocs.org/projects/argon2-cffi/badge/?version=stable :target: http://argon2-cffi.readthedocs.io/en/stable/?badge=stable :alt: Documentation Status - .. image:: https://travis-ci.org/hynek/argon2-cffi.svg?branch=master - :target: https://travis-ci.org/hynek/argon2-cffi - :alt: Travis CI status - - .. image:: https://ci.appveyor.com/api/projects/status/3faufu7qgwc8nv2v/branch/master?s... - :target: https://ci.appveyor.com/project/hynek/argon2-cffi - :alt: AppVeyor CI Status + .. image:: https://github.com/hynek/argon2-cffi/workflows/CI/badge.svg?branch=master + :target: https://github.com/hynek/argon2-cffi/actions?workflow=CI + :alt: CI Status .. image:: https://codecov.io/github/hynek/argon2-cffi/branch/master/graph/badge.svg :target: https://codecov.io/github/hynek/argon2-cffi @@ -71,7 +63,7 @@ Release Information =================== - 19.2.0 (2019-10-27) + 20.1.0 (2020-05-11) ------------------- Vendoring Argon2 @ `62358ba <https://github.com/P-H-C/phc-winner-argon2/tree/62358ba2123abd17fccf2a108a301d4b52c01a7c>`_ (20190702) @@ -80,10 +72,7 @@ Backward-incompatible changes: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - - Python 3.4 is not supported anymore. - It has been unsupported by the Python core team for a while now and its PyPI downloads are negligible. - - It's very unlikely that ``argon2-cffi`` will break under 3.4 anytime soon, but we don't test it and don't ship binary wheels for it anymore. + *none* Deprecations: @@ -95,9 +84,7 @@ Changes: ^^^^^^^^ - - The dependency on ``enum34`` is now protected using a PEP 508 marker. - This fixes problems when the sdist is handled by a different interpreter version than the one running it. - `#48 <https://github.com/hynek/argon2-cffi/pull/48>`_ + - It is now possible to manually override the detection of SSE2 using the ``ARGON2_CFFI_USE_SSE2`` environment variable. `Full changelog <https://argon2-cffi.readthedocs.io/en/stable/changelog.html>`_. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argon2-cffi-19.2.0/README.rst new/argon2-cffi-20.1.0/README.rst --- old/argon2-cffi-19.2.0/README.rst 2019-10-17 12:38:03.000000000 +0200 +++ new/argon2-cffi-20.1.0/README.rst 2020-03-31 16:07:52.000000000 +0200 @@ -2,21 +2,13 @@ CFFI-based Argon2 Bindings for Python ===================================== -.. image:: https://img.shields.io/pypi/v/argon2-cffi.svg - :target: https://pypi.org/project/argon2-cffi/ - :alt: PyPI - .. image:: https://readthedocs.org/projects/argon2-cffi/badge/?version=stable :target: http://argon2-cffi.readthedocs.io/en/stable/?badge=stable :alt: Documentation Status -.. image:: https://travis-ci.org/hynek/argon2-cffi.svg?branch=master - :target: https://travis-ci.org/hynek/argon2-cffi - :alt: Travis CI status - -.. image:: https://ci.appveyor.com/api/projects/status/3faufu7qgwc8nv2v/branch/master?s... - :target: https://ci.appveyor.com/project/hynek/argon2-cffi - :alt: AppVeyor CI Status +.. image:: https://github.com/hynek/argon2-cffi/workflows/CI/badge.svg?branch=master + :target: https://github.com/hynek/argon2-cffi/actions?workflow=CI + :alt: CI Status .. image:: https://codecov.io/github/hynek/argon2-cffi/branch/master/graph/badge.svg :target: https://codecov.io/github/hynek/argon2-cffi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argon2-cffi-19.2.0/docs/installation.rst new/argon2-cffi-20.1.0/docs/installation.rst --- old/argon2-cffi-19.2.0/docs/installation.rst 2019-06-05 12:37:58.000000000 +0200 +++ new/argon2-cffi-20.1.0/docs/installation.rst 2020-05-10 17:10:43.000000000 +0200 @@ -52,10 +52,27 @@ env ARGON2_CFFI_USE_SYSTEM=1 \ python -m pip install --no-binary=argon2-cffi argon2-cffi -This approach can lead to problems around your build chain and you can run into incompatabilities between Argon2 and ``argon2-cffi`` if the latter has been tested against a different version. +This approach can lead to problems around your build chain and you can run into incompatibilities between Argon2 and ``argon2-cffi`` if the latter has been tested against a different version. **It is your own responsibility to deal with these risks if you choose this path.** +Available since version 18.1.0. + + +Override Automatic SSE2 Detection +--------------------------------- + +Usually the build process tries to guess whether or not it should use SSE2_-optimized code. +This can go wrong and is problematic for cross-compiling. + +Therefore you can use the ``ARGON2_CFFI_USE_SSE2`` environment variable to control the process: + +- If you set it to ``1``, ``argon2-cffi`` will build **with** SSE2 support. +- If you set it to ``0``, ``argon2-cffi`` will build **without** SSE2 support. +- If you set it to anything else, it will be ignored and ``argon2-cffi`` will try to guess. + +Available since version 20.1.0. + .. _SSE2: https://en.wikipedia.org/wiki/SSE2 .. _PyPI: https://pypi.org/project/argon2-cffi/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argon2-cffi-19.2.0/extras/appveyor/install.ps1 new/argon2-cffi-20.1.0/extras/appveyor/install.ps1 --- old/argon2-cffi-19.2.0/extras/appveyor/install.ps1 2019-06-05 14:20:46.000000000 +0200 +++ new/argon2-cffi-20.1.0/extras/appveyor/install.ps1 1970-01-01 01:00:00.000000000 +0100 @@ -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) -(?<major>\d+) -\. -(?<minor>\d+) -\. -(?<micro>\d+) -(?<prerelease>[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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argon2-cffi-19.2.0/extras/appveyor/run_with_env.cmd new/argon2-cffi-20.1.0/extras/appveyor/run_with_env.cmd --- old/argon2-cffi-19.2.0/extras/appveyor/run_with_env.cmd 2019-06-05 14:20:46.000000000 +0200 +++ new/argon2-cffi-20.1.0/extras/appveyor/run_with_env.cmd 1970-01-01 01:00:00.000000000 +0100 @@ -1,88 +0,0 @@ -:: To build extensions for 64 bit Python 3, we need to configure environment -:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of: -:: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1) -:: -:: To build extensions for 64 bit Python 2, we need to configure environment -:: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of: -:: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0) -:: -:: 32 bit builds, and 64-bit builds for 3.5 and beyond, do not require specific -:: environment configurations. -:: -:: Note: this script needs to be run with the /E:ON and /V:ON flags for the -:: cmd interpreter, at least for (SDK v7.0) -:: -:: More details at: -:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows -:: http://stackoverflow.com/a/13751649/163740 -:: -:: Author: Olivier Grisel -:: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/ -:: -:: Notes about batch files for Python people: -:: -:: Quotes in values are literally part of the values: -:: SET FOO="bar" -:: FOO is now five characters long: " b a r " -:: If you don't want quotes, don't include them on the right-hand side. -:: -:: The CALL lines at the end of this file look redundant, but if you move them -:: outside of the IF clauses, they do not run properly in the SET_SDK_64==Y -:: case, I don't know why. -@ECHO OFF - -SET COMMAND_TO_RUN=%* -SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows -SET WIN_WDK=c:\Program Files (x86)\Windows Kits\10\Include\wdf - -:: Extract the major and minor versions, and allow for the minor version to be -:: more than 9. This requires the version number to have two dots in it. -SET MAJOR_PYTHON_VERSION=%PYTHON_VERSION:~0,1% -IF "%PYTHON_VERSION:~3,1%" == "." ( - SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,1% -) ELSE ( - SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,2% -) - -:: Based on the Python version, determine what SDK version to use, and whether -:: to set the SDK for 64-bit. -IF %MAJOR_PYTHON_VERSION% == 2 ( - SET WINDOWS_SDK_VERSION="v7.0" - SET SET_SDK_64=Y -) ELSE ( - IF %MAJOR_PYTHON_VERSION% == 3 ( - SET WINDOWS_SDK_VERSION="v7.1" - IF %MINOR_PYTHON_VERSION% LEQ 4 ( - SET SET_SDK_64=Y - ) ELSE ( - SET SET_SDK_64=N - IF EXIST "%WIN_WDK%" ( - :: See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/ - REN "%WIN_WDK%" 0wdf - ) - ) - ) ELSE ( - ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%" - EXIT 1 - ) -) - -IF %PYTHON_ARCH% == 64 ( - IF %SET_SDK_64% == Y ( - ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture - SET DISTUTILS_USE_SDK=1 - SET MSSdk=1 - "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION% - "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release - ECHO Executing: %COMMAND_TO_RUN% - call %COMMAND_TO_RUN% || EXIT 1 - ) ELSE ( - ECHO Using default MSVC build environment for 64 bit architecture - ECHO Executing: %COMMAND_TO_RUN% - call %COMMAND_TO_RUN% || EXIT 1 - ) -) ELSE ( - ECHO Using default MSVC build environment for 32 bit architecture - ECHO Executing: %COMMAND_TO_RUN% - call %COMMAND_TO_RUN% || EXIT 1 -) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argon2-cffi-19.2.0/pyproject.toml new/argon2-cffi-20.1.0/pyproject.toml --- old/argon2-cffi-19.2.0/pyproject.toml 2019-10-17 11:14:53.000000000 +0200 +++ new/argon2-cffi-20.1.0/pyproject.toml 2020-01-13 09:32:00.000000000 +0100 @@ -3,6 +3,19 @@ build-backend = "setuptools.build_meta" +[tool.coverage.run] +parallel = true +branch = true +source = ["argon2"] + +[tool.coverage.paths] +source = ["src", ".tox/*/site-packages"] + +[tool.coverage.report] +show_missing = true +omit = ["src/argon2/_ffi_build.py"] + + [tool.black] line-length = 79 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argon2-cffi-19.2.0/setup.py new/argon2-cffi-20.1.0/setup.py --- old/argon2-cffi-19.2.0/setup.py 2019-10-17 11:16:28.000000000 +0200 +++ new/argon2-cffi-20.1.0/setup.py 2020-05-10 16:00:25.000000000 +0200 @@ -19,9 +19,15 @@ NAME = "argon2-cffi" PACKAGES = find_packages(where="src") -# Optimized version requires SSE2 extensions. They have been around since -# 2001 so we try to compile it on every recent-ish x86. -optimized = platform.machine() in ("i686", "x86", "x86_64", "AMD64") +use_sse2 = os.environ.get("ARGON2_CFFI_USE_SSE2", None) +if use_sse2 == "1": + optimized = True +elif use_sse2 == "0": + optimized = False +else: + # Optimized version requires SSE2 extensions. They have been around since + # 2001 so we try to compile it on every recent-ish x86. + optimized = platform.machine() in ("i686", "x86", "x86_64", "AMD64") CFFI_MODULES = ["src/argon2/_ffi_build.py:ffi"] lib_base = os.path.join("extras", "libargon2", "src") @@ -96,7 +102,7 @@ INSTALL_REQUIRES = ["cffi>=1.0.0", "six", "enum34; python_version<'3.4'"] EXTRAS_REQUIRE = { "docs": ["sphinx"], - "tests": ["coverage", "hypothesis", "pytest"], + "tests": ["coverage[toml]>=5.0.2", "hypothesis", "pytest"], } EXTRAS_REQUIRE["dev"] = ( EXTRAS_REQUIRE["tests"] + EXTRAS_REQUIRE["docs"] + ["wheel", "pre-commit"] @@ -200,11 +206,14 @@ ) if use_system_argon2: disable_subcommand(build, "build_clib") + cmdclass = {"build_clib": BuildCLibWithCompilerFlags} + if BDistWheel is not None: + cmdclass["bdist_wheel"] = BDistWheel return { "setup_requires": SETUP_REQUIRES, "cffi_modules": CFFI_MODULES, "libraries": LIBRARIES, - "cmdclass": {"build_clib": BuildCLibWithCompilerFlags}, + "cmdclass": cmdclass, } @@ -278,7 +287,7 @@ + "Release Information\n" + "===================\n\n" + re.search( - r"(\d+.\d.\d \(.*?\)\n.*?)\n\n\n----\n\n\n", + r"(\d+.\d.\d \(.*?\)\r?\n.*?)\r?\n\r?\n\r?\n----\r?\n\r?\n\r?\n", read("CHANGELOG.rst"), re.S, ).group(1) @@ -331,6 +340,27 @@ ) +if ( + sys.platform != "win32" + and sys.version_info > (3,) + and platform.python_implementation() == "CPython" +): + try: + import wheel.bdist_wheel + except ImportError: + BDistWheel = None + else: + + class BDistWheel(wheel.bdist_wheel.bdist_wheel): + def finalize_options(self): + self.py_limited_api = "cp3{}".format(sys.version_info[1]) + wheel.bdist_wheel.bdist_wheel.finalize_options(self) + + +else: + BDistWheel = None + + if __name__ == "__main__": setup( name=NAME, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argon2-cffi-19.2.0/src/argon2/__init__.py new/argon2-cffi-20.1.0/src/argon2/__init__.py --- old/argon2-cffi-19.2.0/src/argon2/__init__.py 2019-10-27 18:48:21.000000000 +0100 +++ new/argon2-cffi-20.1.0/src/argon2/__init__.py 2020-05-11 07:22:22.000000000 +0200 @@ -16,7 +16,7 @@ from .low_level import Type -__version__ = "19.2.0" +__version__ = "20.1.0" __title__ = "argon2-cffi" __description__ = "The secure Argon2 password hashing algorithm." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argon2-cffi-19.2.0/src/argon2_cffi.egg-info/PKG-INFO new/argon2-cffi-20.1.0/src/argon2_cffi.egg-info/PKG-INFO --- old/argon2-cffi-19.2.0/src/argon2_cffi.egg-info/PKG-INFO 2019-10-27 18:58:06.000000000 +0100 +++ new/argon2-cffi-20.1.0/src/argon2_cffi.egg-info/PKG-INFO 2020-05-11 07:30:40.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: argon2-cffi -Version: 19.2.0 +Version: 20.1.0 Summary: The secure Argon2 password hashing algorithm. Home-page: https://argon2-cffi.readthedocs.io/ Author: Hynek Schlawack @@ -15,21 +15,13 @@ CFFI-based Argon2 Bindings for Python ===================================== - .. image:: https://img.shields.io/pypi/v/argon2-cffi.svg - :target: https://pypi.org/project/argon2-cffi/ - :alt: PyPI - .. image:: https://readthedocs.org/projects/argon2-cffi/badge/?version=stable :target: http://argon2-cffi.readthedocs.io/en/stable/?badge=stable :alt: Documentation Status - .. image:: https://travis-ci.org/hynek/argon2-cffi.svg?branch=master - :target: https://travis-ci.org/hynek/argon2-cffi - :alt: Travis CI status - - .. image:: https://ci.appveyor.com/api/projects/status/3faufu7qgwc8nv2v/branch/master?s... - :target: https://ci.appveyor.com/project/hynek/argon2-cffi - :alt: AppVeyor CI Status + .. image:: https://github.com/hynek/argon2-cffi/workflows/CI/badge.svg?branch=master + :target: https://github.com/hynek/argon2-cffi/actions?workflow=CI + :alt: CI Status .. image:: https://codecov.io/github/hynek/argon2-cffi/branch/master/graph/badge.svg :target: https://codecov.io/github/hynek/argon2-cffi @@ -71,7 +63,7 @@ Release Information =================== - 19.2.0 (2019-10-27) + 20.1.0 (2020-05-11) ------------------- Vendoring Argon2 @ `62358ba <https://github.com/P-H-C/phc-winner-argon2/tree/62358ba2123abd17fccf2a108a301d4b52c01a7c>`_ (20190702) @@ -80,10 +72,7 @@ Backward-incompatible changes: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - - Python 3.4 is not supported anymore. - It has been unsupported by the Python core team for a while now and its PyPI downloads are negligible. - - It's very unlikely that ``argon2-cffi`` will break under 3.4 anytime soon, but we don't test it and don't ship binary wheels for it anymore. + *none* Deprecations: @@ -95,9 +84,7 @@ Changes: ^^^^^^^^ - - The dependency on ``enum34`` is now protected using a PEP 508 marker. - This fixes problems when the sdist is handled by a different interpreter version than the one running it. - `#48 <https://github.com/hynek/argon2-cffi/pull/48>`_ + - It is now possible to manually override the detection of SSE2 using the ``ARGON2_CFFI_USE_SSE2`` environment variable. `Full changelog <https://argon2-cffi.readthedocs.io/en/stable/changelog.html>`_. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argon2-cffi-19.2.0/src/argon2_cffi.egg-info/SOURCES.txt new/argon2-cffi-20.1.0/src/argon2_cffi.egg-info/SOURCES.txt --- old/argon2-cffi-19.2.0/src/argon2_cffi.egg-info/SOURCES.txt 2019-10-27 18:58:06.000000000 +0100 +++ new/argon2-cffi-20.1.0/src/argon2_cffi.egg-info/SOURCES.txt 2020-05-11 07:30:40.000000000 +0200 @@ -1,4 +1,3 @@ -.coveragerc .pre-commit-config.yaml AUTHORS.rst CHANGELOG.rst @@ -13,6 +12,7 @@ .azure-pipelines/wheel-builder.yml .github/CODE_OF_CONDUCT.rst .github/CONTRIBUTING.rst +.github/workflows/main.yml docs/Makefile docs/api.rst docs/argon2.rst @@ -27,8 +27,6 @@ docs/license.rst docs/login_example.py docs/parameters.rst -extras/appveyor/install.ps1 -extras/appveyor/run_with_env.cmd extras/libargon2/.git extras/libargon2/.gitattributes extras/libargon2/.gitignore diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argon2-cffi-19.2.0/src/argon2_cffi.egg-info/requires.txt new/argon2-cffi-20.1.0/src/argon2_cffi.egg-info/requires.txt --- old/argon2-cffi-19.2.0/src/argon2_cffi.egg-info/requires.txt 2019-10-27 18:58:06.000000000 +0100 +++ new/argon2-cffi-20.1.0/src/argon2_cffi.egg-info/requires.txt 2020-05-11 07:30:40.000000000 +0200 @@ -5,7 +5,7 @@ enum34 [dev] -coverage +coverage[toml]>=5.0.2 hypothesis pytest sphinx @@ -16,6 +16,6 @@ sphinx [tests] -coverage +coverage[toml]>=5.0.2 hypothesis pytest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argon2-cffi-19.2.0/tox.ini new/argon2-cffi-20.1.0/tox.ini --- old/argon2-cffi-19.2.0/tox.ini 2019-10-17 11:58:32.000000000 +0200 +++ new/argon2-cffi-20.1.0/tox.ini 2020-03-31 16:07:52.000000000 +0200 @@ -19,6 +19,17 @@ once::Warning +[gh-actions] +python = + 2.7: py27 + 3.5: py35 + 3.6: py36 + 3.7: py37, docs + 3.8: py38, lint, manifest, typing, changelog + pypy2: pypy2 + pypy3: pypy3 + + [tox] envlist = lint,py27,py35,py36,py37,py38,pypy,pypy3,system-argon2,docs,manifest,pypi-description,coverage-report isolated_build = true @@ -26,7 +37,7 @@ [testenv:lint] description = Run all pre-commit hooks. -basepython = python3.7 +basepython = python3.8 skip_install = true deps = pre-commit passenv = HOMEPATH # needed on Windows @@ -43,7 +54,7 @@ [testenv:system-argon2] description = Run tests against bindings that use a system installation of Argon2. -basepython = python3.7 +basepython = python3.8 setenv = ARGON2_CFFI_USE_SYSTEM=1 extras = tests install_command = pip install {opts} --no-binary=argon2-cffi {packages} @@ -54,6 +65,7 @@ [testenv:docs] description = Build docs and run doctests. +# Keep basepython in sync with gh-actions and .readthedocs.yml. basepython = python3.7 extras = docs commands = @@ -64,7 +76,7 @@ [testenv:manifest] description = Ensure MANIFEST.in is up to date. -basepython = python3.7 +basepython = python3.8 deps = check-manifest skip_install = true commands = check-manifest @@ -72,7 +84,7 @@ [testenv:pypi-description] description = Ensure README.rst renders on PyPI. -basepython = python3.7 +basepython = python3.8 skip_install = true deps = twine @@ -84,8 +96,8 @@ [testenv:coverage-report] description = Report coverage over all test runs. -basepython = python3.6 -deps = coverage +basepython = python3.8 +deps = coverage[toml]>=5.0.2 skip_install = true commands = coverage combine