Skip to content

Finish fixing manifest #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 3, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
Changelog
*********

1.0.3 -- 2018-05-03
===================
* Finish fixing ``MANIFEST.in``.

1.0.2 -- 2018-05-03
===================
* Fill out ``MANIFEST.in`` to correctly include necessary files in source build.
Expand Down
7 changes: 6 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,9 @@ include LICENSE
include requirements.txt

recursive-include doc *
recursive-include test *.py
recursive-exclude doc .DS_Store *.pyc
prune doc/build
prune doc/lib/generated

recursive-include test *
recursive-exclude test .DS_Store *.pyc
2 changes: 1 addition & 1 deletion src/dynamodb_encryption_sdk/identifiers.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from enum import Enum

__all__ = ('LOGGER_NAME', 'CryptoAction', 'EncryptionKeyType', 'KeyEncodingType')
__version__ = '1.0.2'
__version__ = '1.0.3'

LOGGER_NAME = 'dynamodb_encryption_sdk'
USER_AGENT_SUFFIX = 'DynamodbEncryptionSdkPython/{}'.format(__version__)
Expand Down
2 changes: 1 addition & 1 deletion test/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
hypothesis
mock
git+https://github.com/spulec/moto.git
moto>=1.3.3
pytest>=3.3.1
pytest-cov
pytest-mock
Expand Down
27 changes: 27 additions & 0 deletions test/source-build-check.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/bin/bash
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we add a note for users that this is intended to verify MANIFEST.in and is not of much interest to end users?

# Verify that tests can be successfully run from the source build.
#
#NOTE: Humans should not run this file directly. If you want to run this check, use the
# tox to run the "sourcebuildcheck" test environment.

WORKINGDIR=$1
DISTDIR=$2

echo "Locating the source build and copying it into the working directory."
DISTFILE=`ls $DISTDIR/dynamodb-encryption-sdk-*.tar.gz | tail -1`
cp $DISTFILE $WORKINGDIR
DISTFILE=`ls $WORKINGDIR/dynamodb-encryption-sdk-*.tar.gz | tail -1`

echo "Extracting the source build."
cd $WORKINGDIR
tar xzvf $DISTFILE
rm $DISTFILE
EXTRACTEDDIR=`ls | tail -1`
cd $EXTRACTEDDIR

echo "Installing requirements from extracted source build."
pip install -r test/requirements.txt
pip install -e .

echo "Running tests from extracted source build."
pytest --cov dynamodb_encryption_sdk -m "local and not slow and not veryslow and not nope"
13 changes: 12 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py{27,34,35,36}-{local,integ,examples}-fast, nocmk,
py{27,34,35,36}-{local,integ,examples}-fast, nocmk, sourcebuildcheck,
bandit, doc8, readme,
flake8, pylint,
flake8-tests, pylint-tests,
Expand Down Expand Up @@ -66,6 +66,17 @@ sitepackages = False
deps = -rtest/requirements.txt
commands = {[testenv:base-command]commands} -m "local and not slow and not veryslow and not nope"

# Verify that tests can be successfully run from the source build.
[testenv:sourcebuildcheck]
basepython = python3
sitepackages = False
recreate = True
deps =
{[testenv:build]deps}
commands =
{[testenv:build]commands}
{toxinidir}/test/source-build-check.sh {envtmpdir} {toxinidir}/dist

# mypy
[testenv:mypy-coverage]
commands =
Expand Down