Skip to content

Commit

Permalink
Merge pull request #2486 from pypa/feature/skeleton
Browse files Browse the repository at this point in the history
Adopt jaraco/skeleton
  • Loading branch information
jaraco committed Dec 20, 2020
2 parents 30b66d8 + e52ace4 commit 957b7a1
Show file tree
Hide file tree
Showing 20 changed files with 348 additions and 539 deletions.
7 changes: 2 additions & 5 deletions .coveragerc
@@ -1,8 +1,5 @@
[run]
source=
pkg_resources
setuptools
omit=
*/_vendor/*
omit = .tox/*

[report]
show_missing = True
22 changes: 12 additions & 10 deletions .flake8
@@ -1,12 +1,14 @@
[flake8]
exclude=
.tox
setuptools/_vendor,
pkg_resources/_vendor
max-line-length = 88
exclude =
setuptools/_vendor
pkg_resources/_vendor
ignore =
# W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513
W503
# W504 has issues https://github.com/OCA/maintainer-quality-tools/issues/545
W504
setuptools/site-patch.py F821
setuptools/py*compat.py F811
# W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513
W503
# W504 has issues https://github.com/OCA/maintainer-quality-tools/issues/545
W504
# Black creates whitespace before colon
E203
setuptools/site-patch.py F821
setuptools/py*compat.py F811
42 changes: 42 additions & 0 deletions .github/workflows/main.yml
@@ -0,0 +1,42 @@
name: Automated Tests

on: [push, pull_request]

jobs:
test:
strategy:
matrix:
python: [3.6, 3.8, 3.9, pypy3]
platform: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v2
- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python }}
- name: Install tox
run: |
python -m pip install tox
- name: Run tests
run: tox

release:
needs: test
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: 3.9
- name: Install tox
run: |
python -m pip install tox
- name: Release
run: tox -e release
env:
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
138 changes: 0 additions & 138 deletions .github/workflows/python-tests.yml

This file was deleted.

10 changes: 10 additions & 0 deletions .pre-commit-config.yaml
@@ -0,0 +1,10 @@
repos:
- repo: https://github.com/psf/black
rev: stable
hooks:
- id: black

- repo: https://github.com/asottile/blacken-docs
rev: v1.8.0
hooks:
- id: blacken-docs
4 changes: 0 additions & 4 deletions .readthedocs.yml
@@ -1,8 +1,4 @@
# Read the Docs configuration file
# https://docs.readthedocs.io/en/stable/config-file/v2.html

version: 2

python:
install:
- requirements: docs/requirements.txt
60 changes: 0 additions & 60 deletions .travis.yml

This file was deleted.

24 changes: 12 additions & 12 deletions LICENSE
@@ -1,19 +1,19 @@
Copyright (C) 2016 Jason R Coombs <jaraco@jaraco.com>
Copyright Jason R. Coombs

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
13 changes: 6 additions & 7 deletions README.rst
Expand Up @@ -6,14 +6,13 @@

.. _PyPI link: https://pypi.org/project/setuptools

.. image:: https://dev.azure.com/jaraco/setuptools/_apis/build/status/pypa.setuptools?branchName=master
:target: https://dev.azure.com/jaraco/setuptools/_build/latest?definitionId=1&branchName=master
.. image:: https://github.com/jaraco/setuptools/workflows/Automated%20Tests/badge.svg
:target: https://github.com/jaraco/setuptools/actions?query=workflow%3A%22Automated+Tests%22
:alt: Automated Tests

.. image:: https://img.shields.io/travis/pypa/setuptools/master.svg?label=Linux%20CI&logo=travis&logoColor=white
:target: https://travis-ci.org/pypa/setuptools

.. image:: https://img.shields.io/appveyor/ci/pypa/setuptools/master.svg?label=Windows%20CI&logo=appveyor&logoColor=white
:target: https://ci.appveyor.com/project/pypa/setuptools/branch/master
.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
:target: https://github.com/psf/black
:alt: Code style: Black

.. image:: https://img.shields.io/readthedocs/setuptools/latest.svg
:target: https://setuptools.readthedocs.io
Expand Down

0 comments on commit 957b7a1

Please sign in to comment.