Skip to content

Commit

Permalink
Merge a60728f into caf9c8c
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Garthwaite committed May 22, 2017
2 parents caf9c8c + a60728f commit 37d32c2
Show file tree
Hide file tree
Showing 96 changed files with 6,019 additions and 3,355 deletions.
4 changes: 2 additions & 2 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ omit =
# omit these files
pyrate/pyratelog.py
pyrate/scripts/main.py
pyrate/aps.py
pyrate/pyaps.py
pyrate/compat.py
*__init__*

[report]
# Regexes for lines to exclude from consideration
Expand Down Expand Up @@ -45,6 +44,7 @@ exclude_lines =
raise PreprocessError
raise TimeSeriesError
raise OrbitalError
raise CorrectionStatusError

# Don't complain if non-runnable code isn't run:
if 0:
Expand Down
10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,14 @@ out
.tox/
build/
docs/_build/
tests/test_data/
#tests/test_data/
PyAPS/
.cache/
# .coverage tmp files
.coverage.*
.coverage.*
.vscode/
dist/
*.egg-info/
.installed.cfg
*.egg
*__pycache__/
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ expected-line-ending-format=
[BASIC]

# Good variable names which should always be accepted, separated by a comma
good-names=i,j,k,ex,Run,_,x,w,f,n,v,t,r,d,c,cd,g,r,q,V,m,A,b,log,y,id,ds,gt,md
good-names=ts,i,j,k,ex,Run,_,x,w,f,n,v,t,r,d,c,cd,g,r,q,V,m,A,b,log,y,id,ds,gt,md

# Bad variable names which should always be refused, separated by a comma
bad-names=foo,bar,baz,toto,tutu,tata
Expand Down
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ before_install:
- pip install -U pip
- pip install wheel
- pip install python-daemon==2.1.1
- . ./scripts/travis_gdal_install.sh
- . ./utils/travis_gdal_install.sh
- export PATH=$GDALINST/gdal-$GDALVERSION/bin:$PATH
- export LD_LIBRARY_PATH=$GDALINST/gdal-$GDALVERSION/lib:$LD_LIBRARY_PATH

Expand All @@ -59,7 +59,8 @@ install:

# command to run tests, e.g. python setup.py test
script:
- py.test --cov-report term-missing:skip-covered --cov=pyrate tests/
- if [[ $TRAVIS_PYTHON_VERSION == 2.7 && $GDALVERSION == 2.0.0 ]]; then mpirun -n 4 pytest --cov-report term-missing:skip-covered --cov=pyrate tests/test_mpi.py; fi
- pytest --cov-report term-missing:skip-covered --cov=pyrate tests/

cache:
- apt
Expand Down
1 change: 1 addition & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Contributors
* Ben Davies (NCI)
* Matt Garthwaite (GA)
* Simon Knapp (GA)
* Sarah Lawrie (GA)
* Negin Moghaddam (GA)
* Vanessa Newey (GA)
* Garrick Paskos (GA)
17 changes: 8 additions & 9 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ If you are reporting a bug, please include:
* Any details about your local setup that might be helpful in troubleshooting.
* Detailed steps to reproduce the bug.

As an example of how to report a bug please see: https://github.com/GeoscienceAustralia/PyRate/issues/146
For an example of how to report a bug please see: https://github.com/GeoscienceAustralia/PyRate/issues/146

Fix Bugs
~~~~~~~~
Expand Down Expand Up @@ -57,10 +57,9 @@ If you are proposing a feature:
Get Started!
------------

Ready to contribute? Here's how to set up `PyRate` for
local development.
Ready to contribute? Here's how to set up `PyRate` for local development.

1. Fork_ the `PyRate` repo on GitHub.
1. Fork_ the `PyRate` repository on GitHub.
2. Clone your fork locally::

$ git clone git@github.com:GeoscienceAustralia/PyRate.git
Expand All @@ -71,13 +70,12 @@ local development.

Now you can make your changes locally.

4. When you're done making changes, check that your changes pass style and unit
4. When you're finished making changes, check that your changes pass style and unit
tests, including testing other Python versions with tox::

$ pip install tox
$ tox

To get tox, just pip install it.

5. Commit your changes and push your branch to GitHub::

$ git add .
Expand All @@ -94,11 +92,12 @@ Pull Request Guidelines
Before you submit a pull request, check that it meets these guidelines:

1. The pull request should include tests.
2. If the pull request adds functionality, the docs should be updated. Put
your new functionality into a function with a docstring, and add the
2. If the pull request adds functionality, the documentation should be updated.
Put your new functionality into a function with a docstring, and add the
feature to the list in README.rst.
3. The pull request should work for Python 2.7, and 3.3, 3.4, 3.5, 3.6, 3.7
and for PyPy.

Check https://travis-ci.org/GeoscienceAustralia/PyRate
under pull requests for active pull requests or run the ``tox`` command and
make sure that the tests pass for all supported Python versions.
Expand Down
9 changes: 7 additions & 2 deletions HISTORY.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
.. :changelog:
History
-------
Release History
---------------

0.1.0 (2017-01-31)
++++++++++++++++++

* First release on PyPI.

0.2.0 (2017-05-22)
++++++++++++++++++

* Stable beta release.

0 comments on commit 37d32c2

Please sign in to comment.