Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
jaraco committed Oct 25, 2017
2 parents 84c832f + 34958cc commit 227c31e
Show file tree
Hide file tree
Showing 11 changed files with 101 additions and 72 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
50 changes: 29 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,32 @@
dist: trusty
sudo: false
language: python
python:
- 2.7
- 3.6

jobs:
fast_finish: true
include:
- python: 2.7
- python: &latest_py3 3.6
- stage: deploy
if: tag IS present
python: *latest_py3
install: skip
script: skip
deploy:
provider: pypi
on:
tags: true
all_branches: true
user: jaraco
password:
secure: H5SkLmo52n7lQZYwYjf1C57sjgQy0ZEfHMpHAyDKrlR3SVrdbyeS8z1ekQFeTgldB4KHLoBSu/vuK668xy3F6TpJDWxAvRvX6P3CJX/avw6RkNKLhKw01ud7ByfYXeGSzOFhtEewn/3+jTPOIPHjkQhhHQ1AkMZgyRm2xtuUn4hNPCZtp2q6pJkZP5nqlslMXdu6Guilug3XrLEZU1OpRkT/euKVJ97AN6/ArdF5OUCHezY/rp8/iHxdkD1nXkPqkETr3v6sYyQLGwLHnY5lpIpN6I3AdaeWX0JGapueCGMQv4Iq0hIs0yojQ51CtcNVV0uyIO6DjTP579SoZB3K7TnGMhWQoD3jAv8nZrLd22naZcb0HWR2CTfPw+d/+ylIZJqI/vsnfvMfgRgISnKX+vcesRHT95+/bWFIUN5X+Kb+3xAI7kCNT4HhltP6D5FJKPjhPwEA/fHfyoFZL6FwzvVEH/1C+8ruRJ3v9hiOEy0mOoUtMLqE7+AI0HYm/x/E/+9n3gQLD9lmD3wkNUoIXNo1S6dVE3EPIkbl3CvCc1HTahdOdC4j3QWKaaS2z6RAjMdQSfWcaIghB2pW2zifXx25Ww1grzswL++0AHjaCjljdhUxjzkqFURUfxZP4k6Ptq7PLA8kLyVaLFprRY/pJiG3b4C21+V6I05WkxLGv3o=
distributions: dists
skip_cleanup: true
skip_upload_docs: true

cache: pip

install:
- pip install tox "setuptools>=28.2"
script:
- tox
branches:
except:
- skeleton
deploy:
provider: pypi
server: https://upload.pypi.org/legacy/
on:
tags: true
all_branches: true
python: 3.6
user: jaraco
distributions: dists
skip_upload_docs: true
password:
secure: H5SkLmo52n7lQZYwYjf1C57sjgQy0ZEfHMpHAyDKrlR3SVrdbyeS8z1ekQFeTgldB4KHLoBSu/vuK668xy3F6TpJDWxAvRvX6P3CJX/avw6RkNKLhKw01ud7ByfYXeGSzOFhtEewn/3+jTPOIPHjkQhhHQ1AkMZgyRm2xtuUn4hNPCZtp2q6pJkZP5nqlslMXdu6Guilug3XrLEZU1OpRkT/euKVJ97AN6/ArdF5OUCHezY/rp8/iHxdkD1nXkPqkETr3v6sYyQLGwLHnY5lpIpN6I3AdaeWX0JGapueCGMQv4Iq0hIs0yojQ51CtcNVV0uyIO6DjTP579SoZB3K7TnGMhWQoD3jAv8nZrLd22naZcb0HWR2CTfPw+d/+ylIZJqI/vsnfvMfgRgISnKX+vcesRHT95+/bWFIUN5X+Kb+3xAI7kCNT4HhltP6D5FJKPjhPwEA/fHfyoFZL6FwzvVEH/1C+8ruRJ3v9hiOEy0mOoUtMLqE7+AI0HYm/x/E/+9n3gQLD9lmD3wkNUoIXNo1S6dVE3EPIkbl3CvCc1HTahdOdC4j3QWKaaS2z6RAjMdQSfWcaIghB2pW2zifXx25Ww1grzswL++0AHjaCjljdhUxjzkqFURUfxZP4k6Ptq7PLA8kLyVaLFprRY/pJiG3b4C21+V6I05WkxLGv3o=
- pip install tox

script: tox
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

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.
13 changes: 3 additions & 10 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,22 +1,15 @@
Models and classes to supplement the stdlib 'collections' module.

.. image:: https://img.shields.io/pypi/v/jaraco.collections.svg
:target: https://pypi.io/project/jaraco.collections

.. image:: https://img.shields.io/pypi/pyversions/jaraco.collections.svg

.. image:: https://img.shields.io/pypi/dm/jaraco.collections.svg

.. image:: https://img.shields.io/travis/jaraco/jaraco.collections/master.svg
:target: http://travis-ci.org/jaraco/jaraco.collections

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

License
=======

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>`_.
Models and classes to supplement the stdlib 'collections' module.

RangeMap
--------
Expand Down
21 changes: 21 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
environment:

APPVEYOR: true

matrix:
- PYTHON: "C:\\Python36-x64"
- PYTHON: "C:\\Python27-x64"

install:
# symlink python from a directory with a space
- "mklink /d \"C:\\Program Files\\Python\" %PYTHON%"
- "SET PYTHON=\"C:\\Program Files\\Python\""
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"

build: off

test_script:
- "python -m pip install tox"
- "tox"

version: '{build}'
38 changes: 6 additions & 32 deletions docs/conf.py
Original file line number Diff line number Diff line change
@@ -1,56 +1,30 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-

import os
import sys
import subprocess
import datetime

if 'check_output' not in dir(subprocess):
import subprocess32 as subprocess

extensions = [
'sphinx.ext.autodoc',
'jaraco.packaging.sphinx',
'rst.linker',
]

# General information about the project.

root = os.path.join(os.path.dirname(__file__), '..')
setup_script = os.path.join(root, 'setup.py')
fields = ['--name', '--version', '--url', '--author']
dist_info_cmd = [sys.executable, setup_script] + fields
output_bytes = subprocess.check_output(dist_info_cmd, cwd=root)
project, version, url, author = output_bytes.decode('utf-8').strip().split('\n')

origin_date = datetime.date(2015,1,1)
today = datetime.date.today()

copyright = '{origin_date.year}-{today.year} {author}'.format(**locals())

# The full version, including alpha/beta/rc tags.
release = version

master_doc = 'index'

link_files = {
'../CHANGES.rst': dict(
using=dict(
GH='https://github.com',
project=project,
url=url,
),
replace=[
dict(
pattern=r"(Issue )?#(?P<issue>\d+)",
url='{url}/issues/{issue}',
pattern=r'(Issue )?#(?P<issue>\d+)',
url='{package_url}/issues/{issue}',
),
dict(
pattern=r"^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n",
with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n",
pattern=r'^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n',
with_scm='{text}\n{rev[timestamp]:%d %b %Y}\n',
),
dict(
pattern=r"PEP[- ](?P<pep_number>\d+)",
pattern=r'PEP[- ](?P<pep_number>\d+)',
url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
),
],
Expand Down
1 change: 0 additions & 1 deletion docs/requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
release = dists upload
dists = clean --all sdist bdist_wheel

[wheel]
[bdist_wheel]
universal = 1
23 changes: 22 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@

name = 'jaraco.collections'
description = ''
nspkg_technique = 'managed'
"""
Does this package use "native" namespace packages or
pkg_resources "managed" namespace packages?
"""

params = dict(
name=name,
Expand All @@ -22,12 +27,28 @@
url="https://github.com/jaraco/" + 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.7',
install_requires=[
'jaraco.text',
'jaraco.classes',
'six>=1.7.0',
],
extras_require={
'testing': [
'pytest>=2.8',
'pytest-sugar',
'collective.checkdocs',
],
'docs': [
'sphinx',
'jaraco.packaging>=3.2',
'rst.linker>=1.9',
],
},
setup_requires=[
'setuptools_scm>=1.15.0',
],
Expand Down
2 changes: 0 additions & 2 deletions tests/requirements.txt

This file was deleted.

11 changes: 7 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
[testenv]
deps =
-rtests/requirements.txt
[tox]
minversion = 2.4

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

0 comments on commit 227c31e

Please sign in to comment.