Skip to content

Commit

Permalink
add a manifest and a tox step to check it
Browse files Browse the repository at this point in the history
  • Loading branch information
mmerickel committed Jun 28, 2017
1 parent 7c5880b commit e42ba53
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 30 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ matrix:
env: TOXENV=py34
- python: 3.5
env: TOXENV=py35
- python: 3.6
env: TOXENV=py36
- python: pypy
env: TOXENV=pypy
- python: 3.5
Expand All @@ -18,8 +20,8 @@ matrix:
env: TOXENV=docs
- python: 3.5
env: TOXENV=pep8
- python: 3.6
env: TOXENV=py36
- python: 3.5
env: TOXENV=sdist
- python: nightly
env: TOXENV=py37
allow_failures:
Expand Down
5 changes: 0 additions & 5 deletions HACKING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@ repo, from which you can submit a pull request.
To use the instructions in the steps that follow literally, use the
``export VENV=~/hack-on-pyramid/env`` command.

- Install ``setuptools-git`` into the virtual environment (for good measure, as
we're using git to do version control):

$ $VENV/bin/pip install setuptools-git

- Install Pyramid from the checkout into the virtual environment, where the
current working directory is the ``pyramid`` checkout directory. We will
install Pyramid in editable (development) mode as well as its testing
Expand Down
16 changes: 16 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
graft pyramid
graft docs
prune docs/_build

include README.rst
include CHANGES.txt HISTORY.txt BFG_HISTORY.txt
include CONTRIBUTORS.txt LICENSE.txt COPYRIGHT.txt

include contributing.md RELEASING.txt
include tox.ini appveyor.yml .travis.yml rtd.txt

include HACKING.txt hacking-tox.ini
include builddocs.sh coverage.sh scaffoldtests.sh
include TODO.txt

global-exclude __pycache__ *.py[cod]
13 changes: 3 additions & 10 deletions RELEASING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,9 @@ Prepare new release branch

- Change setup.py version to the release version number.

- Make sure PyPI long description renders (requires ``readme_renderer``
installed into your Python)::

$ python setup.py check -r -s -m

- Create a release tag.

- Make sure your Python has ``setuptools-git``, ``twine``, and ``wheel``
installed and release to PyPI::
- Build and publish to PyPI::

$ python setup.py sdist bdist_wheel
$ twine upload dist/pyramid-X.X-*
Expand Down Expand Up @@ -163,9 +157,8 @@ https://github.com/Pylons/pyramid/issues
```
Pyramid 1.X.X has been released.

Here are the changes:

<<changes>>
The full changelog is here:
https://docs.pylonsproject.org/projects/pyramid/en/1.X-branch/changes.html

What's New In Pyramid 1.X:
https://docs.pylonsproject.org/projects/pyramid/en/1.X-branch/whatsnew-1.X.html
Expand Down
10 changes: 10 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,13 @@ ignore =
W391
exclude = pyramid/tests/,pyramid/compat.py,pyramid/resource.py
show-source = True

[check-manifest]
ignore =
.gitignore
PKG-INFO
*.egg-info
*.egg-info/*
ignore-default-rules = true
ignore-bad-ideas =
pyramid/tests/pkgs/localeapp/*
16 changes: 6 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,14 @@
#
##############################################################################

import os

from setuptools import setup, find_packages

here = os.path.abspath(os.path.dirname(__file__))
try:
with open(os.path.join(here, 'README.rst')) as f:
README = f.read()
with open(os.path.join(here, 'CHANGES.txt')) as f:
CHANGES = f.read()
except IOError:
README = CHANGES = ''
def readfile(name):
with open(name) as f:
return f.read()

README = readfile('README.rst')
CHANGES = readfile('CHANGES.txt')

install_requires = [
'setuptools',
Expand Down
14 changes: 11 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
[tox]
envlist =
py27,py34,py35,py36,py37,pypy,
docs,pep8,
py27,py34,py35,py36,pypy,
docs,pep8,sdist,
{py2,py3}-cover,coverage,
skip_missing_interpreters = True

[testenv]
# Most of these are defaults but if you specify any you can't fall back
Expand Down Expand Up @@ -59,6 +58,15 @@ commands =
deps =
flake8

[testenv:sdist]
basepython = python3.5
commands =
python setup.py check -r -s -m
check-manifest
deps =
readme_renderer
check-manifest

[testenv:docs]
basepython = python3.5
whitelist_externals = make
Expand Down

0 comments on commit e42ba53

Please sign in to comment.