diff --git a/0001-switch-ci-to-azure-pipelines.patch b/0001-switch-ci-to-azure-pipelines.patch new file mode 100644 index 0000000000000000000000000000000000000000..2e26ca7e45ff1ecc51ac4b17db0165df43f9c040 --- /dev/null +++ b/0001-switch-ci-to-azure-pipelines.patch @@ -0,0 +1,191 @@ +From 7857e870a5bab1b3bdf16abd3a7ecce2646ca1b2 Mon Sep 17 00:00:00 2001 +From: David Lord +Date: Sun, 4 Aug 2019 20:58:37 -0700 +Subject: [PATCH] switch ci to azure pipelines + +--- + .azure-pipelines.yaml | 64 +++++++++++++++++++++++++++++++++++++++++++ + .travis.yml | 38 ------------------------- + tox.ini | 31 ++++++++------------- + 3 files changed, 76 insertions(+), 57 deletions(-) + create mode 100644 .azure-pipelines.yaml + delete mode 100644 .travis.yml + +diff --git a/.azure-pipelines.yaml b/.azure-pipelines.yaml +new file mode 100644 +index 0000000..374da2d +--- /dev/null ++++ b/.azure-pipelines.yaml +@@ -0,0 +1,64 @@ ++trigger: ++ - master ++ - '*.x' ++ ++variables: ++ vmImage: ubuntu-latest ++ python.version: 3.7 ++ TOXENV: py,coverage-ci ++ hasTestResults: true ++ ++strategy: ++ matrix: ++ Python 3.7 Linux: ++ vmImage: ubuntu-latest ++ Python 3.7 Windows: ++ vmImage: windows-latest ++ Python 3.7 Mac: ++ vmImage: macos-latest ++ PyPy 3 Linux: ++ python.version: pypy3 ++ Python 3.6 Linux: ++ python.version: 3.6 ++ Python 3.5 Linux: ++ python.version: 3.5 ++ Python 2.7 Linux: ++ python.version: 2.7 ++ Python 2.7 Windows: ++ python.version: 2.7 ++ vmImage: windows-latest ++ Docs: ++ TOXENV: docs ++ hasTestResults: false ++ Style: ++ TOXENV: style ++ hasTestResults: false ++ ++pool: ++ vmImage: $(vmImage) ++ ++steps: ++ - task: UsePythonVersion@0 ++ inputs: ++ versionSpec: $(python.version) ++ displayName: Use Python $(python.version) ++ ++ - script: pip --disable-pip-version-check install -U tox ++ displayName: Install tox ++ ++ - script: tox -s false -- --junit-xml=test-results.xml ++ displayName: Run tox ++ ++ - task: PublishTestResults@2 ++ inputs: ++ testResultsFiles: test-results.xml ++ testRunTitle: $(Agent.JobName) ++ condition: eq(variables['hasTestResults'], 'true') ++ displayName: Publish test results ++ ++ - task: PublishCodeCoverageResults@1 ++ inputs: ++ codeCoverageTool: Cobertura ++ summaryFileLocation: coverage.xml ++ condition: eq(variables['hasTestResults'], 'true') ++ displayName: Publish coverage results +diff --git a/.travis.yml b/.travis.yml +deleted file mode 100644 +index e87eaa0..0000000 +--- a/.travis.yml ++++ /dev/null +@@ -1,38 +0,0 @@ +-os: linux +-sudo: false +-language: python +-python: +- - "3.6" +- - "3.5" +- - "3.4" +- - "2.7" +- - "nightly" +- - "pypy3" +-env: TOXENV=py,codecov +- +-matrix: +- include: +- - env: TOXENV=stylecheck,docs-html +- allow_failures: +- - python: nightly +- - python: pypy3 +- fast_finish: true +- +-install: +- - pip install tox +- +-script: +- - tox +- +-cache: +- directories: +- - $HOME/.cache/pip +- - $HOME/.cache/pre-commit +- +-branches: +- only: +- - master +- - /^.*\.x$/ +- +-notifications: +- email: false +diff --git a/tox.ini b/tox.ini +index 48f007f..d1f4f66 100644 +--- a/tox.ini ++++ b/tox.ini +@@ -1,20 +1,19 @@ + [tox] + envlist = +- py{37,36,35,34,27,py3,py} +- stylecheck +- docs-html +- coverage-report ++ py{37,36,35,27,py3,py} ++ style ++ docs ++ coverage + skip_missing_interpreters = true + + [testenv] +-setenv = +- COVERAGE_FILE = .coverage.{envname} + deps = +- pytest-cov ++ coverage ++ pytest + freezegun +-commands = pytest --tb=short --cov --cov-report= {posargs} ++commands = coverage run -p -m pytest -Werror --tb=short --basetemp={envtmpdir} {posargs} + +-[testenv:stylecheck] ++[testenv:style] + deps = pre-commit + skip_install = True + commands = pre-commit run --all-files --show-diff-on-failure +@@ -23,9 +22,7 @@ commands = pre-commit run --all-files --show-diff-on-failure + deps = -r docs/requirements.txt + commands = sphinx-build -W -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html + +-[testenv:coverage-report] +-setenv = +- COVERAGE_FILE = .coverage ++[testenv:coverage] + deps = coverage + skip_install = true + commands = +@@ -33,13 +30,9 @@ commands = + coverage html + coverage report + +-[testenv:codecov] +-passenv = CI TRAVIS TRAVIS_* +-setenv = +- COVERAGE_FILE = .coverage +-deps = codecov ++[testenv:coverage-ci] ++deps = coverage + skip_install = true + commands = + coverage combine +- codecov +- coverage report ++ coverage xml +-- +2.39.0.windows.2 + diff --git a/python-itsdangerous.spec b/python-itsdangerous.spec index 442cab512b2f0995a28d93cee7172fdd73986bb6..d50efb7cc8122042f4318654fef66ed963716bb3 100644 --- a/python-itsdangerous.spec +++ b/python-itsdangerous.spec @@ -1,10 +1,11 @@ Name: python-itsdangerous Version: 1.1.0 -Release: 2 +Release: 3 Summary: Various helpers to pass data to untrusted environments and to get it back safe and sound. License: BSD URL: http://pythonhosted.org/itsdangerous/ Source0: https://pypi.python.org/packages/source/i/itsdangerous/itsdangerous-%{version}.tar.gz +Patch0001: 0001-switch-ci-to-azure-pipelines.patch BuildArch: noarch BuildRequires: python2-devel python3-devel python2-pytest python3-pytest python2-freezegun python3-freezegun @@ -31,7 +32,7 @@ Data is cryptographically signed to ensure that a token has not been tampered wi %prep %global debug_package %{nil} -%autosetup -n itsdangerous-%{version} +%autosetup -n itsdangerous-%{version} -p1 %build %py2_build @@ -58,6 +59,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} %{python3_sitelib}/itsdangerous*.egg-info/ %changelog +* Wed Oct 25 2023 zhangliangpengkun - 1.1.0-3 +- switch ci to azure pipelines + * Tue Sep 29 2020 liuweibo - 1.1.0-2 - Fix Source0