Skip to content

Commit

Permalink
Merge pull request #1 from globality-corp/release-1.14.1
Browse files Browse the repository at this point in the history
Unblock a patch release without the `cryptography` version upper bound
  • Loading branch information
jessemyers committed Jan 5, 2018
2 parents 908240e + 3d37e08 commit 759b9fc
Show file tree
Hide file tree
Showing 7 changed files with 71 additions and 18 deletions.
8 changes: 8 additions & 0 deletions .bumpversion.cfg
@@ -0,0 +1,8 @@
[bumpversion]
current_version = 1.14.0
commit = False
tag = False

[bumpversion:file:setup.py]
search = version = "{current_version}"
replace = version = "{new_version}"
10 changes: 0 additions & 10 deletions .travis.yml

This file was deleted.

35 changes: 35 additions & 0 deletions circle.yml
@@ -0,0 +1,35 @@
# CircleCI Configuration file

machine:
python:
version: 3.6.2

general:
artifacts:
- "dist"
- "cover"

dependencies:
override:
- pip install tox tox-pyenv
- pyenv local 3.6.2

test:
override:
- tox

deployment:
pypi:
tag: v/[0-9]+(\.[0-9]+)*/
owner: globality-corp
commands:
- echo "[distutils]" > ~/.pypirc
- echo "index-servers =" >> ~/.pypirc
- echo " pypi" >> ~/.pypirc
- echo >> ~/.pypirc
- echo "[pypi]" >> ~/.pypirc
- echo "username:$PYPI_USERNAME" >> ~/.pypirc
- echo "password:$PYPI_PASSWORD" >> ~/.pypirc
- echo >> ~/.pypirc
- python setup.py register -r pypi
- python setup.py sdist upload -r pypi
2 changes: 0 additions & 2 deletions credstash.py
Expand Up @@ -52,8 +52,6 @@
'SHA256': hashes.SHA256,
'SHA384': hashes.SHA384,
'SHA512': hashes.SHA512,
'RIPEMD': hashes.RIPEMD160,
'WHIRLPOOL': hashes.Whirlpool,
'MD5': hashes.MD5,
}

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
@@ -1,2 +1,2 @@
cryptography>=1.5,<2.1
cryptography>=1.5
boto3>=1.1.1
17 changes: 12 additions & 5 deletions setup.py 100644 → 100755
@@ -1,11 +1,15 @@
#!/usr/bin/env python
from setuptools import setup

name = 'credstash-any-crypto'
version = '1.14.0'

setup(
name='credstash',
version='1.14.0',
name=name,
version=version,
description='A utility for managing secrets in the cloud using AWS KMS and DynamoDB',
license='Apache2',
url='https://github.com/LuminalOSS/credstash',
url="https://github.com/globality-corp/credstash",
classifiers=[
'Intended Audience :: Developers',
'Intended Audience :: System Administrators',
Expand All @@ -14,7 +18,7 @@
scripts=['credstash.py'],
py_modules=['credstash'],
install_requires=[
'cryptography>=1.5, <2.1',
'cryptography>=1.5',
'boto3>=1.1.1',
],
extras_require={
Expand All @@ -24,5 +28,8 @@
'console_scripts': [
'credstash = credstash:main'
]
}
},
setup_requires=[
'nose>=1.3.6',
],
)
15 changes: 15 additions & 0 deletions tox.ini
@@ -0,0 +1,15 @@
[tox]
envlist = py36, lint

[testenv]
commands =
python setup.py nosetests --with-coverage --cover-package=openapi --cover-erase --cover-html
python setup.py sdist
deps =
setuptools>=17.1

[testenv:lint]
commands=flake8 --max-line-length 120 openapi
basepython=python3.6
deps=
flake8

0 comments on commit 759b9fc

Please sign in to comment.