Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
jaraco committed Nov 16, 2017
2 parents 6e4d0e8 + ce5e0eb commit 43b9e46
Show file tree
Hide file tree
Showing 10 changed files with 68 additions and 71 deletions.
5 changes: 5 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
python:
version: 3
extra_requirements:
- docs
pip_install: true
34 changes: 21 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
language: python
os: linux
dist: trusty
sudo: false
language: python

python:
- 2.6
- 2.7
- 3.3
- 3.4
- 3.5
- &pypy2 pypy2.7-5.8.0
- &pypy3 pypy3.5-5.8.0

group: edge
_base_envs:
- &stage_lint
Expand All @@ -17,7 +26,7 @@ _base_envs:
- &pyenv_base
<<: *stage_test
language: generic
python: &pypy2 pypy2.7-5.8.0
python: *pypy2
env:
- &env_pypy2 PYTHON_VERSION=pypy2.7-5.8.0
- &env_pyenv PYENV_ROOT="$HOME/.pyenv"
Expand Down Expand Up @@ -61,14 +70,7 @@ _base_envs:
<<: *stage_lint
python: *mainstream_python
after_failure: skip
python:
- 2.6
- 2.7
- 3.3
- 3.4
- 3.5
- *pypy2
- &pypy3 pypy3.5-5.8.0

jobs:
fast_finish: true
allow_failures:
Expand Down Expand Up @@ -134,27 +136,33 @@ jobs:
- *env_path
# pypy3.5-5.8.0 fails under OS X because it's unsupported (PR #26)
- <<: *stage_deploy
if: tag IS present

This comment has been minimized.

Copy link
@webknjaz

webknjaz Nov 21, 2017

Member

@jaraco it's not needed at job level, this duplicates condition at stage level.

This comment has been minimized.

Copy link
@jaraco

jaraco Nov 21, 2017

Author Member

Do you mean deploy.on.tags: true, removed below? Or something else? Which technique is better? If the other form, I'd like the skeleton project to adopt that techniue.

This comment has been minimized.

Copy link
@webknjaz

webknjaz Nov 21, 2017

Member

I mean that there's a stages section declared in the end of this file. It's better to keep this check there as it would affect multiple jobs, which might belong to *stage_deploy (if we had more than one). And it's there anyway.

This comment has been minimized.

Copy link
@webknjaz

webknjaz Nov 21, 2017

Member

I mean that there's a stages section declared in the end of this file. It's better to keep this check there as it would affect multiple jobs, which might belong to *stage_deploy (if we had more than one). And it's there anyway.

This comment has been minimized.

Copy link
@jaraco

jaraco Nov 21, 2017

Author Member

I see. Then at this point it's probably better to remove it from the other location so as to be minimally divergent from skeleton unless necessary.

python: *mainstream_python
install: skip
script: skip
deploy:
provider: pypi
on:
tags: true
all_branches: true
user: jaraco
distributions: dists
password:
secure: RAfz06AINvz7bfij/YhfkAreRqamgxS8a6jSRNxntYhtJke3ZszUbIDag8+n1I+G5XT2LnMhHqPNR7Plc+AeMz7VXTuy+b81Li5kse20NYlPhd7mBVmTUpXtqYQashV5J39F4qkATBLznCOrMEomM07VTXjO/o2hmQuXniab2Uo=
distributions: dists
skip_cleanup: true
skip_upload_docs: true

cache:
pip: true
directories:
- $HOME/.pre-commit
- $HOME/Library/Caches/Homebrew

install:
- pip install tox "setuptools>=28.2"

script:
- tox

after_failure:
- echo "Here's a list of installed Python packages:"
- pip list --format=columns
Expand Down
7 changes: 7 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Copyright Jason R. Coombs

This comment has been minimized.

Copy link
@webknjaz

webknjaz Nov 21, 2017

Member

@jaraco did you really mean to re-license it?

This comment has been minimized.

Copy link
@jaraco

jaraco Nov 21, 2017

Author Member

Not exactly, though it's difficult for me to ascertain the differences between these licenses. Such is the problem with declaring the license in several ways. I'll revert this file to BSD license. MIT license was a mistake.


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 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.
30 changes: 0 additions & 30 deletions LICENSE.md

This file was deleted.

12 changes: 3 additions & 9 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,14 @@

.. image:: https://img.shields.io/pypi/pyversions/cheroot.svg

.. image:: https://img.shields.io/pypi/dm/cheroot.svg

.. image:: https://codecov.io/gh/cherrypy/cheroot/branch/master/graph/badge.svg
:target: https://codecov.io/gh/cherrypy/cheroot
:alt: codecov

Cheroot is the high-performance, pure-Python HTTP server used by CherryPy.

License
=======
.. image:: https://readthedocs.org/projects/cheroot/badge/?version=latest
:target: http://cheroot.readthedocs.io/en/latest/?badge=latest

License is indicated in the project metadata (typically one or more
of the Trove classifiers). For more details, see `this explanation
<https://github.com/jaraco/skeleton/issues/1>`_.
Cheroot is the high-performance, pure-Python HTTP server used by CherryPy.

Status
======
Expand Down
2 changes: 2 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ build_script:
test_script:
- tox

version: '{build}'

after_test:
- ps: |
$wc = New-Object 'System.Net.WebClient'
Expand Down
4 changes: 0 additions & 4 deletions docs/requirements.txt

This file was deleted.

8 changes: 4 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
release = dists upload
dists = clean --all sdist bdist_wheel

[metadata]
license_file = LICENSE.md

This comment has been minimized.

Copy link
@webknjaz

webknjaz Nov 21, 2017

Member

@jaraco don't forget to restore this as well


[wheel]
[bdist_wheel]
universal = 1

[metadata]
license_file = LICENSE
27 changes: 20 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@

name = 'cheroot'
description = 'Highly-optimized, pure-python HTTP server'
nspkg_technique = 'native'
"""
Does this package use "native" namespace packages or
pkg_resources "managed" namespace packages?
"""

params = dict(
name=name,
Expand All @@ -23,26 +28,34 @@
url='https://github.com/cherrypy/' + name,
packages=setuptools.find_packages(),
include_package_data=True,
namespace_packages=name.split('.')[:-1],
namespace_packages=(
name.split('.')[:-1] if nspkg_technique == 'managed'
else []
),
python_requires='>=2.6,!=3.0.*',
install_requires=[
'six>=1.11.0',
],
extras_require={
'docs': [
'sphinx',
'docutils',
'alabaster',
'rst.linker>=1.9',
'jaraco.packaging>=3.2',

'docutils',
'alabaster',
],
'testing': [
'coverage', # inspects tests coverage
'codecov', # sends tests coverage to codecov.io

'pytest>=2.8',
'pytest-cov',
'pytest-sugar',
'collective.checkdocs',

# measure test coverage
'coverage',
# send test coverage to codecov.io
'codecov',

'pytest-cov',
'backports.unittest_mock',
'portend',
],
Expand Down
10 changes: 6 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[tox]
minversion = 2.4
envlist = python

[testenv]
usedevelop = True
commands =
pytest {posargs}
py.test {posargs}
python setup.py checkdocs

This comment has been minimized.

Copy link
@webknjaz

webknjaz Nov 21, 2017

Member

@jaraco I'd move this to [testenv:setup-check] section.

This comment has been minimized.

Copy link
@jaraco

jaraco Nov 21, 2017

Author Member

That makes sense except in light of my attempts to consolidate packaging techniques across projects. If we can merge that concept into the skeleton, that'd be awesome.

codecov -f coverage.xml -X gcov
usedevelop = True
extras = testing

passenv =
WEBTEST_INTERACTIVE
CI
Expand All @@ -15,8 +19,6 @@ passenv =
APPVEYOR_*
setenv =
WEBTEST_INTERACTIVE=false
extras =
testing

[testenv:pre-commit]
deps = pre-commit
Expand Down

0 comments on commit 43b9e46

Please sign in to comment.