Run pre-commit tests on all files.

.pre-commit-config.yaml

@@ -24,16 +24,16 @@ repos:
   - id: check-ast
   - id: check-builtin-literals
   - id: check-docstring-first
-#  - id: check-executables-have-shebangs # Doesn't work on windows
+# - id: check-executables-have-shebangs # Doesn't work on windows
   - id: check-merge-conflict
   - id: check-json
   - id: check-added-large-files
   - id: check-yaml
-  - id: double-quote-string-fixer
+# - id: double-quote-string-fixer
   - id: debug-statements
   - id: name-tests-test
     args: ['--django']
   - id: requirements-txt-fixer
-    #  - id: flake8
+# - id: flake8
   - id: pretty-format-json
   - id: sort-simple-yaml

.shippable.yaml

@@ -36,4 +36,3 @@ build:
     # Run test and code coverage and output results to the right folder
     - pytest --junitxml=shippable/testresults/nosetests.xml
     - pytest --cov=spectrum_overload --cov-report=xml:shippable/codecoverage/coverage.xml --durations=10
-

MANIFEST.in

@@ -1,5 +1,4 @@
 include README.md
 recursive-include spectrum_overload/data *
-recursive-include Notebooks * 
-recursive-include docs * 
-
+recursive-include Notebooks *
+recursive-include docs *

README.md

@@ -3,7 +3,7 @@
 [![PyPI version](https://badge.fury.io/py/spectrum-overload.svg)](https://badge.fury.io/py/spectrum-overload)[![Updates](https://pyup.io/repos/github/jason-neal/spectrum_overload/shield.svg)](https://pyup.io/repos/github/jason-neal/spectrum_overload/)[![Python 3](https://pyup.io/repos/github/jason-neal/spectrum_overload/python-3-shield.svg)](https://pyup.io/repos/github/jason-neal/spectrum_overload/)
 
 [![Documentation Status](https://readthedocs.org/projects/spectrum-overload/badge/?version=latest)](http://spectrum-overload.readthedocs.io/en/latest/?badge=latest) [![Build Status](https://travis-ci.org/jason-neal/spectrum_overload.svg?branch=master)](https://travis-ci.org/jason-neal/spectrum_overload) [![Coverage Status](https://coveralls.io/repos/github/jason-neal/spectrum_overload/badge.svg?branch=master)](https://coveralls.io/github/jason-neal/spectrum_overload?branch=master) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/3e9a2cf4ad914e0ebc24b6b2b83059db)](https://www.codacy.com/app/jason-neal/spectrum_overload?utm_source=github.com&utm_medium=referral&utm_content=jason-neal/spectrum_overload&utm_campaign=badger)[![Test Coverage](https://codeclimate.com/github/jason-neal/spectrum_overload/badges/coverage.svg)](https://codeclimate.com/github/jason-neal/spectrum_overload/coverage) [![Code Climate](https://codeclimate.com/github/jason-neal/spectrum_overload/badges/gpa.svg)](https://codeclimate.com/github/jason-neal/spectrum_overload)[![Issue Count](https://codeclimate.com/github/jason-neal/spectrum_overload/badges/issue_count.svg)](https://codeclimate.com/github/jason-neal/spectrum_overload)  
- 
+
 
 ## Overview
 The purpose of this was project was to learn how to use and create Classes, and to create a Spectrum object to use within my Phd work.
@@ -22,10 +22,10 @@ Further documentation can be found on [read the docs](https://spectrum-overload.
 
 ## Installation
 ### Pip
-    
+
     pip install spectrum-overload
 
-### git / manual 
+### git / manual
 Currently to install and use Spectrum class for your own projects.
 
 clone the git repository where you want it then type:
@@ -52,7 +52,7 @@ or :
 
 or how ever else you would like to import it.
 
-A tutorial is provided [here](Notebooks/Tutorial.ipynb) to show an example of how to use this class. 
+A tutorial is provided [here](Notebooks/Tutorial.ipynb) to show an example of how to use this class.
 
 
 ## Contributions

conftest.py

@@ -3,9 +3,9 @@
 import numpy as np
 import pytest
 from astropy.io import fits
+from hypothesis import Verbosity, settings
 from pkg_resources import resource_filename
 
-from hypothesis import Verbosity, settings
 from spectrum_overload import Spectrum
 
 settings.register_profile("ci", settings(max_examples=1000))

pre-commit.sh

@@ -1,12 +1,12 @@
 #!/bin/sh
 # pre-commit.sh
 # GitHook for running tests before commiting
-# To use link it to 
+# To use link it to
 # ln -s pre-commit.sh .git/hooks/pre-commit
 
 git stash -q --keep-index
 bash run_tests.sh
 RESULT=$?
 git stash pop -q
 [ $RESULT -ne 0 ] && exit 1
-exit 0
+exit 0

requirements.txt

@@ -1,6 +1,5 @@
-numpy==1.15.0
-matplotlib==2.2.3
 astropy==3.0.4
-scipy==1.1.0
+matplotlib==2.2.3
+numpy==1.15.0
 pyastronomy==0.13.0
-
+scipy==1.1.0

run_tests.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # Run pytest on codebase.
-py.test
+py.test

setup.cfg

@@ -10,4 +10,3 @@ addopts = --verbose
 
 [metadata]
 description-file = README.md
-

spectrum_overload/spectrum.py

@@ -1,5 +1,7 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
+"""Spectrum class to represent and manipulate astronomical spectra."""
+
 
 from __future__ import division, print_function
 
@@ -16,8 +18,6 @@
 
 import spectrum_overload.norm as norm
 
-"""Spectrum Class."""
-
 
 class Spectrum(object):
     """Spectrum class to represent and manipulate astronomical spectra.

spectrum_overload/test/install_and_test.sh

@@ -1,6 +1,6 @@
 #!\bin\bash
 # automatic install and then test script for Spectrum
-# install package 
+# install package
 python setup.py install
 # Test package
 py.test

spectrum_overload/test/test_Spectrum.py

@@ -7,16 +7,14 @@
 """
 from __future__ import division, print_function
 
+import hypothesis.strategies as st
 import numpy as np
 import pytest
 from astropy.io import fits
+from hypothesis import example, given
 from pkg_resources import resource_filename
 from PyAstronomy import pyasl
 
-import hypothesis.strategies as st
-
-# Test using hypothesis
-from hypothesis import example, given
 from spectrum_overload import Spectrum, SpectrumError
 
 

spectrum_overload/test/test_overloaded_operators.py

@@ -5,11 +5,11 @@
 
 import types
 
+import hypothesis.strategies as st
 import numpy as np
 import pytest
-
-import hypothesis.strategies as st
 from hypothesis import given
+
 from spectrum_overload import Spectrum, SpectrumError