From 96712baaaa66743bc71590fce45c34cacd4882db Mon Sep 17 00:00:00 2001 From: Taavi Teska Date: Sat, 9 Nov 2019 00:07:38 +0200 Subject: [PATCH] Project setup (#1) - Remove PyCharm configuration folder and ignore it - Run linters in travis-ci with flake8 - Fix unused import issue - Use make commands in travis-ci and reuse values from init in setup.py - Add coveralls - Make badges always use master branch - Add encrypted pypi password for deploys --- .gitignore | 3 + .idea/encodings.xml | 6 -- .idea/inspectionProfiles/Project_Default.xml | 6 -- .idea/misc.xml | 91 -------------------- .idea/modules.xml | 8 -- .idea/pyevr.iml | 11 --- .idea/workspace.xml | 31 ------- .travis.yml | 12 ++- AUTHORS.rst | 2 +- README.rst | 11 ++- setup.py | 8 +- tests/test_pyevr.py | 1 - 12 files changed, 25 insertions(+), 165 deletions(-) delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/pyevr.iml delete mode 100644 .idea/workspace.xml diff --git a/.gitignore b/.gitignore index 84229f4..795e8ba 100644 --- a/.gitignore +++ b/.gitignore @@ -100,3 +100,6 @@ ENV/ # mypy .mypy_cache/ + +# PyCharm +.idea/ diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index c6cc8c8..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 5e6dbdd..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index fa14b78..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/pyevr.iml b/.idea/pyevr.iml deleted file mode 100644 index 6711606..0000000 --- a/.idea/pyevr.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index b703845..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index f3d881a..d54d104 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,16 @@ python: - 2.7 # Command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors -install: pip install -U tox-travis +install: + - if [ $TRAVIS_PYTHON_VERSION == "3.8" ]; then pip install -r requirements_dev.txt; fi + - pip install -U tox-travis flake8 coveralls # Command to run tests, e.g. python setup.py test -script: tox +script: + - make lint + - make test-all + - if [ $TRAVIS_PYTHON_VERSION == "3.8" ]; then coverage run --source pyevr -m pytest; fi + - if [ $TRAVIS_PYTHON_VERSION == "3.8" ]; then coveralls; fi # Assuming you have installed the travis-ci CLI tool, after you # create the Github repo and add it to Travis, run the @@ -23,7 +29,7 @@ deploy: distributions: sdist bdist_wheel user: thorgate password: - secure: PLEASE_REPLACE_ME + secure: AxfqY940GesaqOB8UsR8rMxIOajZ9HTCD5c/ijAynluUN9vVlmokTil2EHy+sl+48gyh3PaUI4Bj+kPxKg+NehzF/zcDQvabxYrN3dvt1UO722/42N86FvBqvBfzNiXQCPBE1+53VHLSDil3Li7pPYa+AfB7WR0fEAJPoeqOTV47ca7czUJn7cXgF3VRmIHpkbErk8veeXr0Ccn7W0BvfIGhGSKnxFZa3AHHJhsf3j0OBMoxsm+acpuXP+F9OPJYEgCk0OtBqX/C94+QGg1QdPlv8XjThQi6s0BbgxNQcQMwoWDN+CW2tf4zBnoZqPJ3jowlr/MLt6PV+4Q+Fp2KpvNoQz0I9zUbfLGYBE3QO2rjgRwKL0cr0cWcpnw23yoQmPESplx9EHNfdEM8YFYCoB4/iIuuoP27IRJEAyASZp9QLIfjPuBibhbtvmNRpJqCK7dPbDW3rp4ZMIncFiJUV4y4qnjAYIyWBMsh2+uXfGslHABI8LFiZauegfJVeA6ABMwnofwxxKTp9Y1VnNTRPouNg/ouo5k0sSIA3S3uDbHOTXJ6dzByMsK1RFVPu8XR65knCbita2Ok1qzjkNLufRxKF38YkPSQ4fIIO3YLelsTPwBXkniTGbvUSILD9LnF/+4il+hr4bx+9pbnYNaUXxxqi4G0lXrOae5P+XsSISc= on: tags: true repo: thorgate/pyevr diff --git a/AUTHORS.rst b/AUTHORS.rst index fd291c0..60e24e2 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -10,4 +10,4 @@ Development Lead Contributors ------------ -None yet. Why not be the first? +* Taavi Teska diff --git a/README.rst b/README.rst index 8c5e713..55771fc 100644 --- a/README.rst +++ b/README.rst @@ -6,17 +6,20 @@ pyevr .. image:: https://img.shields.io/pypi/v/pyevr.svg :target: https://pypi.python.org/pypi/pyevr -.. image:: https://img.shields.io/travis/thorgate/pyevr.svg +.. image:: https://travis-ci.org/thorgate/pyevr.svg?branch=master :target: https://travis-ci.org/thorgate/pyevr .. image:: https://readthedocs.org/projects/pyevr/badge/?version=latest :target: https://pyevr.readthedocs.io/en/latest/?badge=latest :alt: Documentation Status - .. image:: https://pyup.io/repos/github/thorgate/pyevr/shield.svg - :target: https://pyup.io/repos/github/thorgate/pyevr/ - :alt: Updates + :target: https://pyup.io/repos/github/thorgate/pyevr/ + :alt: Updates + +.. image:: https://coveralls.io/repos/github/thorgate/pyevr/badge.svg?branch=master + :target: https://coveralls.io/github/thorgate/pyevr?branch=master + :alt: Test coverage diff --git a/setup.py b/setup.py index 01f4d47..0575e57 100644 --- a/setup.py +++ b/setup.py @@ -5,6 +5,8 @@ from setuptools import setup, find_packages +import pyevr + with open('README.rst') as readme_file: readme = readme_file.read() @@ -18,8 +20,8 @@ test_requirements = ['pytest>=3', ] setup( - author="Thorgate", - author_email='code@thorgate.eu', + author=pyevr.__author__, + author_email=pyevr.__email__, python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*', classifiers=[ 'Development Status :: 2 - Pre-Alpha', @@ -51,6 +53,6 @@ test_suite='tests', tests_require=test_requirements, url='https://github.com/thorgate/pyevr', - version='0.1.0', + version=pyevr.__version__, zip_safe=False, ) diff --git a/tests/test_pyevr.py b/tests/test_pyevr.py index 40a6f8a..1f2e31e 100644 --- a/tests/test_pyevr.py +++ b/tests/test_pyevr.py @@ -7,7 +7,6 @@ from click.testing import CliRunner -from pyevr import pyevr from pyevr import cli