From 6c3ac53da254a82cf85c9d60a43c4bcbba330d12 Mon Sep 17 00:00:00 2001 From: Albert Kottke Date: Fri, 13 Sep 2019 13:03:48 -0700 Subject: [PATCH 1/9] Updated to codacy. --- .travis.yml | 19 +++++------ HISTORY.rst | 5 +++ README.rst | 76 ++++++++++++++------------------------------ requirements_dev.txt | 2 +- setup.py | 25 ++++++++------- 5 files changed, 54 insertions(+), 73 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d15a76..ed8efdd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,20 @@ language: python python: -- '3.6' + - '3.7' install: -- pip install -r requirements_dev.txt -- python setup.py install + - pip install -r requirements_dev.txt + - python setup.py install script: -- py.test --flake8 --cov-report html --cov pyrvt tests/ + - make tests after_success: -- coveralls + - coverage xml + - python-codacy-coverage -r coverage.xml deploy: provider: pypi user: arkottke password: secure: eIhb+3akjYdSP9aS9ef10WhiD81Mq9TG1p0irsSVwcCa2mUPaKx8Kq/KQ4Bt7Ha+vZKTu9OWedjmrwmzyVmr77NIJTF7I+UCmFDCR8zjMrweQuIlgQ9L/JmNXmmqOdji9Lp94shqzO/hDgwj3w+Fudvek+PCz8x83dYGxtUdi4A= - on: - distributions: sdist bdist_wheel - repo: arkottke/pyrvt - tags: true + on: + distributions: sdist bdist_wheel + repo: arkottke/pyrvt + tags: true diff --git a/HISTORY.rst b/HISTORY.rst index f2fee5f..cad34e0 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,6 +2,11 @@ History ======= +0.7.1 (2018-11-30) +------------------ + +* Linked requirements file to fix rtfd builds. + 0.7.0 (2018-10-20) ------------------ diff --git a/README.rst b/README.rst index d5277ee..1b63221 100644 --- a/README.rst +++ b/README.rst @@ -1,69 +1,41 @@ +pyRVT ===== -pyrvt -===== - -.. image:: https://img.shields.io/pypi/v/pyrvt.svg - :target: https://pypi.python.org/pypi/pyrvt - :alt: PyPi Cheese Shop - -.. image:: https://img.shields.io/travis/arkottke/pyrvt.svg - :target: https://travis-ci.org/arkottke/pyrvt - :alt: Build Status - -.. image:: https://readthedocs.org/projects/pyrvt/badge/?version=latest&style=flat - :target: https://pyrvt.readthedocs.org - :alt: Documentation Status -.. image:: https://coveralls.io/repos/github/arkottke/pyrvt/badge.svg?branch=master - :target: https://coveralls.io/github/arkottke/pyrvt?branch=master - :alt: Test Coverage - -.. image:: https://landscape.io/github/arkottke/pyrvt/master/landscape.svg?style=flat - :target: https://landscape.io/github/arkottke/pyrvt/master - :alt: Code Health - -.. image:: https://img.shields.io/badge/license-MIT-blue.svg - :alt: License - -.. image:: https://zenodo.org/badge/21452/arkottke/pyrvt.svg - :target: https://zenodo.org/badge/latestdoi/21452/arkottke/pyrvt - :alt: DOI Information +|PyPi Cheese Shop| |Build Status| |Code Quality| |Test Coverage| |License| |DOI| A Python library and command-line application for using random vibration theory to transform between acceleration Fourier amplitude spectrum and acceleration response spectrum. -* Free software: MIT license -* Documentation: https://pyrvt.readthedocs.org. - Information on the installation and usage can be found in the documentation_. -.. _documentation: http://pyrvt.readthedocs.org/ - Features -------- Peak factor implementations: - -* Vanmarcke (1975) - -* Davenport (1964) - -* Der Kiureghian (1985) - -* Toro & McGuire (1987) - -* Cartwright & Longuet-Higgins (1956) - -* Boore & Joyner (1984) - -* Liu & Pezeshk (1999) + - Vanmarcke (1975) + - Davenport (1964) + - Der Kiureghian (1985) + - Toro & McGuire (1987) + - Cartwright & Longuet-Higgins (1956) + - Boore & Joyner (1984) + - Liu & Pezeshk (1999) Citation -------- -Please cite this software using the following DOI: - -.. image:: https://zenodo.org/badge/21452/arkottke/pyrvt.svg - :target: https://zenodo.org/badge/latestdoi/21452/arkottke/pyrvt - :alt: DOI Information +Please cite this software using the following DOI_: + +.. _DOI: https://zenodo.org/badge/latestdoi/21452 + +.. |PyPi Cheese Shop| image:: https://img.shields.io/pypi/v/pyrvt.svg + :target: https://img.shields.io/pypi/v/pyrvt.svg +.. |Build Status| image:: https://travis-ci.org/arkottke/pyrvt.svg?branch=master + :target: https://travis-ci.org/arkottke/pyrvt +.. |Code Quality| image:: https://api.codacy.com/project/badge/Grade/4f1fe64804bc45f89b6386666ae20696 + :target: https://www.codacy.com/manual/arkottke/pyrvt +.. |Test Coverage| image:: https://api.codacy.com/project/badge/Coverage/4f1fe64804bc45f89b6386666ae20696 + :target: https://www.codacy.com/manual/arkottke/pyrvt +.. |License| image:: https://img.shields.io/badge/license-MIT-blue.svg +.. |DOI| image:: https://zenodo.org/badge/21452.svg + :target: https://zenodo.org/badge/latestdoi/21452 diff --git a/requirements_dev.txt b/requirements_dev.txt index 74b0705..419d7dc 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,7 +1,7 @@ -r ./requirements.txt -r ./requirements_rtfd.txt -coveralls +codacy-coverage cryptography flake8 pre-commit diff --git a/setup.py b/setup.py index 6a7df3d..9455214 100644 --- a/setup.py +++ b/setup.py @@ -3,13 +3,23 @@ from setuptools import setup, find_packages -with open('README.rst') as readme_file: - readme = readme_file.read() +with open('README.rst') as fp: + readme = fp.read() + +with open('HISTORY.rst') as fp: + history = fp.read() + setup( name='pyRVT', - version='0.7.0', - packages=find_packages(exclude=['.*tests.*']), + version='0.7.1', + description='Random vibration theory for earthquake ground motions.', + long_description=readme + '\n\n' + history, + author='Albert Kottke', + author_email='albert.kottke@gmail.com', + url='http://github.com/arkottke/pyrvt', + license='MIT', + packages=find_packages(exclude=['tests']), entry_points={ 'console_scripts': [ 'pyrvt = pyrvt.runner:main', @@ -31,18 +41,11 @@ }, zip_safe=False, test_suite='tests', - author='Albert Kottke', - author_email='albert.kottke@gmail.com', - description='Random vibration theory for earthquake ground motions.', - license='MIT', - long_description=readme, - url='http://github.com/arkottke/pyrvt', classifiers=[ 'License :: OSI Approved :: MIT License', 'Environment :: Console', 'Natural Language :: English', 'Operating System :: OS Independent', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python', 'Topic :: Scientific/Engineering', 'Intended Audience :: Science/Research', From f08cab4190d3e995a9fb1c81a35c6bbd5b95a6d9 Mon Sep 17 00:00:00 2001 From: Albert Kottke Date: Fri, 13 Sep 2019 13:16:45 -0700 Subject: [PATCH 2/9] Updated badges and links. --- README.rst | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 1b63221..58009f7 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ pyRVT ===== -|PyPi Cheese Shop| |Build Status| |Code Quality| |Test Coverage| |License| |DOI| +|PyPi Cheese Shop| |Documentation| |Build Status| |Code Quality| |Test Coverage| |License| |DOI| A Python library and command-line application for using random vibration theory to transform between acceleration Fourier amplitude spectrum and acceleration @@ -9,6 +9,8 @@ response spectrum. Information on the installation and usage can be found in the documentation_. +.. _documentation: https://pyrvt.readthedocs.io/ + Features -------- @@ -24,12 +26,15 @@ Peak factor implementations: Citation -------- + Please cite this software using the following DOI_: -.. _DOI: https://zenodo.org/badge/latestdoi/21452 +.. _DOI: https://zenodo.org/badge/latestdoi/5086299 .. |PyPi Cheese Shop| image:: https://img.shields.io/pypi/v/pyrvt.svg :target: https://img.shields.io/pypi/v/pyrvt.svg +.. |Documentation| image:: https://readthedocs.org/projects/pyrvt/badge/?version=latest + :target: https://pyrvt.readthedocs.io/?badge=latest .. |Build Status| image:: https://travis-ci.org/arkottke/pyrvt.svg?branch=master :target: https://travis-ci.org/arkottke/pyrvt .. |Code Quality| image:: https://api.codacy.com/project/badge/Grade/4f1fe64804bc45f89b6386666ae20696 @@ -37,5 +42,6 @@ Please cite this software using the following DOI_: .. |Test Coverage| image:: https://api.codacy.com/project/badge/Coverage/4f1fe64804bc45f89b6386666ae20696 :target: https://www.codacy.com/manual/arkottke/pyrvt .. |License| image:: https://img.shields.io/badge/license-MIT-blue.svg -.. |DOI| image:: https://zenodo.org/badge/21452.svg - :target: https://zenodo.org/badge/latestdoi/21452 +.. |DOI| image:: https://zenodo.org/badge/5086299.svg + :target: https://zenodo.org/badge/latestdoi/5086299 + From e7cb3bdd941991bd12998c68b360cb30c51a2ac0 Mon Sep 17 00:00:00 2001 From: Albert Kottke Date: Fri, 13 Sep 2019 13:19:47 -0700 Subject: [PATCH 3/9] Removed extra dotfiles. --- .gitattributes | 1 - .landscape.yml | 9 --------- .pre-commit-config.yaml | 9 --------- 3 files changed, 19 deletions(-) delete mode 100644 .gitattributes delete mode 100644 .landscape.yml delete mode 100644 .pre-commit-config.yaml diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 8421881..0000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -pyrvt/_version.py export-subst diff --git a/.landscape.yml b/.landscape.yml deleted file mode 100644 index e9be00e..0000000 --- a/.landscape.yml +++ /dev/null @@ -1,9 +0,0 @@ -doc-warnings: yes -strictness: high -python-targets: - - 2 - - 3 -ignore-paths: - - docs/conf.py - - pyrvt/_version.py - - versioneer.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml deleted file mode 100644 index f1ce189..0000000 --- a/.pre-commit-config.yaml +++ /dev/null @@ -1,9 +0,0 @@ -- repo: git://github.com/pre-commit/pre-commit-hooks - sha: 5bf6c09bfa1297d3692cadd621ef95f1284e33c0 - hooks: - - id: trailing-whitespace - - id: end-of-file-fixer - - id: flake8 - exclude: docs/conf.py - - id: check-yaml - - id: check-merge-conflict From d99b39665c3aab1e86f2097d5111d2b633e218e7 Mon Sep 17 00:00:00 2001 From: Albert Kottke Date: Fri, 13 Sep 2019 13:21:37 -0700 Subject: [PATCH 4/9] Fixed test call. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ed8efdd..9ad1c97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ install: - pip install -r requirements_dev.txt - python setup.py install script: - - make tests + - make test after_success: - coverage xml - python-codacy-coverage -r coverage.xml From 68f40bdf1218c7ac65bdd941b3be0b69d7bbd9ad Mon Sep 17 00:00:00 2001 From: Albert Kottke Date: Fri, 13 Sep 2019 13:33:30 -0700 Subject: [PATCH 5/9] Extended copyright. --- pyrvt/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyrvt/__init__.py b/pyrvt/__init__.py index 781a0c3..2678e31 100644 --- a/pyrvt/__init__.py +++ b/pyrvt/__init__.py @@ -14,7 +14,7 @@ ] __author__ = 'Albert Kottke' -__copyright__ = 'Copyright 2016 Albert Kottke' +__copyright__ = 'Copyright 2016-2019 Albert Kottke' __license__ = 'MIT' __title__ = 'pyRVT' __version__ = get_distribution('pyRVT').version From b952e664c9df5b17eb791c3c5ddf1cceedb989cd Mon Sep 17 00:00:00 2001 From: Albert Kottke Date: Fri, 13 Sep 2019 13:39:40 -0700 Subject: [PATCH 6/9] Changed tags ordered. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9ad1c97..3817170 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: python +cache: pip python: - '3.7' install: @@ -15,6 +16,6 @@ deploy: password: secure: eIhb+3akjYdSP9aS9ef10WhiD81Mq9TG1p0irsSVwcCa2mUPaKx8Kq/KQ4Bt7Ha+vZKTu9OWedjmrwmzyVmr77NIJTF7I+UCmFDCR8zjMrweQuIlgQ9L/JmNXmmqOdji9Lp94shqzO/hDgwj3w+Fudvek+PCz8x83dYGxtUdi4A= on: + tags: true distributions: sdist bdist_wheel repo: arkottke/pyrvt - tags: true From 4cb4457a641e3e74574a5f9676bea1832fa2b9e5 Mon Sep 17 00:00:00 2001 From: Albert Kottke Date: Fri, 13 Sep 2019 13:46:03 -0700 Subject: [PATCH 7/9] Fixed test coverage. --- .coveragerc | 1 - Makefile | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.coveragerc b/.coveragerc index adc0382..5df69e9 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,6 +1,5 @@ [report] omit = - *pyrvt/_version.py */python?.?/* */site-packages/nose/* exclude_lines = diff --git a/Makefile b/Makefile index 5513e3b..f393ea4 100644 --- a/Makefile +++ b/Makefile @@ -50,10 +50,10 @@ lint: pydocstyle pyrvt/*.py test: - python setup.py test + py.test --flake8 --cov-report html --cov=pyrvt tests/ coverage: - coverage run --source pyrvt setup.py test + coverage run --source pyrvt setup.py tests coverage report -m coverage html $(BROWSER) htmlcov/index.html From a77025ca111125a1c91bb73e2abbc5dfc73bc502 Mon Sep 17 00:00:00 2001 From: Albert Kottke Date: Fri, 13 Sep 2019 13:47:12 -0700 Subject: [PATCH 8/9] Fixed indent. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3817170..10509ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ deploy: user: arkottke password: secure: eIhb+3akjYdSP9aS9ef10WhiD81Mq9TG1p0irsSVwcCa2mUPaKx8Kq/KQ4Bt7Ha+vZKTu9OWedjmrwmzyVmr77NIJTF7I+UCmFDCR8zjMrweQuIlgQ9L/JmNXmmqOdji9Lp94shqzO/hDgwj3w+Fudvek+PCz8x83dYGxtUdi4A= - on: - tags: true - distributions: sdist bdist_wheel - repo: arkottke/pyrvt + on: + tags: true + distributions: sdist bdist_wheel + repo: arkottke/pyrvt From a7339f42cc9726c07d04b7ef6d3eb079dd00cad1 Mon Sep 17 00:00:00 2001 From: Albert Kottke Date: Fri, 13 Sep 2019 13:53:39 -0700 Subject: [PATCH 9/9] Minor typo. --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 58009f7..33bebd2 100644 --- a/README.rst +++ b/README.rst @@ -27,7 +27,7 @@ Peak factor implementations: Citation -------- -Please cite this software using the following DOI_: +Please cite this software using the DOI_. .. _DOI: https://zenodo.org/badge/latestdoi/5086299