Merge branch 'master' of github.com:arkottke/pyrvt

.coveragerc

@@ -1,6 +1,5 @@
 [report]
 omit =
-    *pyrvt/_version.py
     */python?.?/*
     */site-packages/nose/*
 exclude_lines =

.travis.yml

@@ -1,19 +1,21 @@
 language: python
+cache: pip
 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 test
 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:
+    tags: true
     distributions: sdist bdist_wheel
     repo: arkottke/pyrvt
-    tags: true

HISTORY.rst

@@ -1,12 +1,17 @@
-=======
-History
-=======
+========
+ History
+========
 
-0.7.1 (2020-01-29)
------------------
+0.7.2 (2020-01-29)
+------------------
 
 * Change to no python JIT compliation for Vanmarcke integration.
 
+0.7.1 (2018-11-30)
+------------------
+
+* Linked requirements file to fix rtfd builds.
+
 0.7.0 (2018-10-20)
 ------------------
 

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

README.rst

@@ -1,69 +1,47 @@
+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| |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
 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/
+.. _documentation: https://pyrvt.readthedocs.io/
 
 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)
+Citation
+--------
 
-* Liu & Pezeshk (1999)
+Please cite this software using the DOI_.
 
+.. _DOI: https://zenodo.org/badge/latestdoi/5086299
 
-Citation
---------
-Please cite this software using the following DOI:
+.. |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    
+   :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/5086299.svg
+   :target: https://zenodo.org/badge/latestdoi/5086299
 
-.. image:: https://zenodo.org/badge/21452/arkottke/pyrvt.svg
-   :target: https://zenodo.org/badge/latestdoi/21452/arkottke/pyrvt
-   :alt: DOI Information

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

requirements_dev.txt

@@ -1,7 +1,7 @@
 -r ./requirements.txt
 -r ./requirements_rtfd.txt
 
-coveralls
+codacy-coverage
 cryptography
 flake8
 pre-commit

setup.py

@@ -12,7 +12,13 @@
 setup(
     name='pyRVT',
     version='0.7.1',
-    packages=find_packages(exclude=['.*tests.*']),
+    description='Random vibration theory for earthquake ground motions.',
+    long_description=readme + '\n\n' + history,
+    author='Albert Kottke',
+    author_email='[email protected]',
+    url='http://github.com/arkottke/pyrvt',
+    license='MIT',
+    packages=find_packages(exclude=['tests']),
     entry_points={
         'console_scripts': [
             'pyrvt = pyrvt.runner:main',
@@ -34,18 +40,11 @@
     },
     zip_safe=False,
     test_suite='tests',
-    author='Albert Kottke',
-    author_email='[email protected]',
-    description='Random vibration theory for earthquake ground motions.',
-    license='MIT',
-    long_description=readme + '\n\n' + history,
-    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',