diff options
author | Michael Merickel <michael@merickel.org> | 2022-05-15 18:51:49 -0500 |
---|---|---|
committer | Michael Merickel <michael@merickel.org> | 2022-05-15 18:51:49 -0500 |
commit | 6f29744b2760dfb54959a3499c95dc736d11cf0d (patch) | |
tree | 706f08e239518fc794e591308cceb391f126179f | |
parent | efd233bd865f840d9e151a40b136b36828e3e1f5 (diff) | |
download | pastedeploy-git-6f29744b2760dfb54959a3499c95dc736d11cf0d.tar.gz |
Revert "switch to github actions"
This reverts commit efd233bd865f840d9e151a40b136b36828e3e1f5.
-rw-r--r-- | .github/workflows/ci-tests.yml | 84 | ||||
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | .travis.yml | 25 | ||||
-rw-r--r-- | tox.ini | 5 |
4 files changed, 28 insertions, 87 deletions
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml deleted file mode 100644 index 1e8541b..0000000 --- a/.github/workflows/ci-tests.yml +++ /dev/null @@ -1,84 +0,0 @@ -name: Build and test - -on: - # Only on pushes to master or one of the release branches we build on push - push: - branches: - - master - - "[0-9].[0-9]+-branch" - tags: - # Build pull requests - pull_request: - -jobs: - test: - strategy: - matrix: - py: - - "3.7" - - "3.8" - - "3.9" - - "3.10" - - "pypy-3.7" - os: - - "ubuntu-latest" - - "windows-latest" - - "macos-latest" - architecture: - - x64 - - x86 - exclude: - # Linux and macOS don't have x86 python - - os: "ubuntu-latest" - architecture: x86 - - os: "macos-latest" - architecture: x86 - name: "Python: ${{ matrix.py }}-${{ matrix.architecture }} on ${{ matrix.os }}" - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v2 - - name: Setup python - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.py }} - architecture: ${{ matrix.architecture }} - - run: pip install tox - - name: Running tox - run: tox -e py - # coverage: - # runs-on: ubuntu-latest - # name: Validate coverage - # steps: - # - uses: actions/checkout@v2 - # - name: Setup python 3.10 - # uses: actions/setup-python@v2 - # with: - # python-version: "3.10" - # architecture: x64 - - # - run: pip install tox - # - run: tox -e py310,coverage - docs: - runs-on: ubuntu-latest - name: Build the documentation - steps: - - uses: actions/checkout@v2 - - name: Setup python - uses: actions/setup-python@v2 - with: - python-version: "3.10" - architecture: x64 - - run: pip install tox - - run: tox -e docs - # lint: - # runs-on: ubuntu-latest - # name: Lint the package - # steps: - # - uses: actions/checkout@v2 - # - name: Setup python - # uses: actions/setup-python@v2 - # with: - # python-version: "3.10" - # architecture: x64 - # - run: pip install tox - # - run: tox -e lint @@ -7,4 +7,3 @@ htmlcov .eggs build dist -env* diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..07423a8 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,25 @@ +sudo: false +dist: xenial +language: python +install: + - pip install tox +script: + - tox +matrix: + include: + - python: 2.7 + env: TOXENV=py27 + - python: 3.4 + env: TOXENV=py34 + - python: 3.5 + env: TOXENV=py35 + - python: 3.6 + env: TOXENV=py36 + - python: 3.7 + env: TOXENV=py37 + - python: pypy + env: TOXENV=pypy + dist: trusty + - python: pypy3 + env: TOXENV=pypy3 + dist: trusty @@ -1,6 +1,5 @@ [tox] -envlist = - py37,py38,py39,py310,pypy3, +envlist = py27, py34, py35, py36, py37, pypy, pypy3, docs [testenv] @@ -13,6 +12,8 @@ commands = py.test --cov=paste/deploy --cov-report=xml --cov-report=html --cov-report=term-missing {posargs} [testenv:docs] +# pin to 3.5 to match what RTD uses +basepython = python3.5 whitelist_externals = make commands = make -C docs html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E" |