Merge 38abaaf into 0eac9a7

pysat · Apr 27, 2021 · 62beac6 · 62beac6
2 parents 0eac9a7 + 38abaaf
commit 62beac6
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 94 deletions.
diff --git a/.flake8 b/.flake8
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,50 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Pytest with Flake8
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [3.7, 3.8, 3.9]
+
+    name: Python ${{ matrix.python-version }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r test_requirements.txt
+        pip install -r requirements.txt
+        # Manual installs required
+        pip install --no-binary :pysatMagVect: pysatMagVect
+
+    - name: Set up pysat
+      run: |
+        mkdir pysatData
+        python -c "import pysat; pysat.params['data_dirs'] = './pysatData'"
+
+    - name: Test PEP8 compliance
+      run: flake8 . --count --select=E,F,W --show-source --statistics
+
+    - name: Evaluate complexity
+      run: flake8 . --count --exit-zero --max-complexity=10 --statistics
+
+    - name: Test with pytest
+      run: |
+        pytest --cov=pysatMissions/
+
+    - name: Publish results to coveralls
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: coveralls --rcfile=setup.cfg --service=github
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Update sat_id to inst_id for pysat 3.0 compatibility
 - migrate pyglow interface to pysatIncubator
 - Style updates for consistency with pysat 3.0
+- Migrate CI testing to Github Actions
 
 ## [0.2.1] - 2020-07-29
 - Use conda to manage Travis CI environment

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 [![Documentation Status](https://readthedocs.org/projects/pysatMissions/badge/?version=latest)](http://pysatMissions.readthedocs.io/en/latest/?badge=latest)
 [![DOI](https://zenodo.org/badge/209358908.svg)](https://zenodo.org/badge/latestdoi/209358908)
 
-[![Build Status](https://travis-ci.com/pysat/pysatMissions.svg?branch=main)](https://travis-ci.com/pysat/pysatMissions)
+[![Build Status](https://github.com/github/docs/actions/workflows/main.yml/badge.svg)](https://github.com/github/docs/actions/workflows/main.yml/badge.svg)
 [![Coverage Status](https://coveralls.io/repos/github/pysat/pysatMissions/badge.svg?branch=main)](https://coveralls.io/github/pysat/pysatMissions?branch=main)
 [![Maintainability](https://api.codeclimate.com/v1/badges/83011911691b9d2076e9/maintainability)](https://codeclimate.com/github/pysat/pysatMissions/maintainability)
 

diff --git a/pysatMissions/tests/test_methods_magcoord.py b/pysatMissions/tests/test_methods_magcoord.py
@@ -11,7 +11,7 @@ class TestBasics():
     def setup(self):
         """Runs before every method to create a clean testing setup."""
         self.testInst = pysat.Instrument(platform='pysat', name='testing',
-                                         inst_id='100', clean_level='clean')
+                                         num_samples=100, clean_level='clean')
 
     def teardown(self):
         """Clean up test environment after tests"""

diff --git a/pysatMissions/tests/test_methods_spacecraft.py b/pysatMissions/tests/test_methods_spacecraft.py
@@ -31,7 +31,7 @@ class TestBasics():
     def setup(self):
         """Runs before every method to create a clean testing setup."""
         self.testInst = pysat.Instrument(platform='pysat', name='testing',
-                                         inst_id='9', clean_level='clean')
+                                         num_samples=9, clean_level='clean')
         self.testInst.custom_attach(add_eci)
 
     def teardown(self):

diff --git a/requirements.txt b/requirements.txt
@@ -5,4 +5,3 @@ sgp4
 pyEphem
 apexpy
 aacgmv2
-pysatMagVect
diff --git a/setup.cfg b/setup.cfg
@@ -38,13 +38,19 @@ long_description_content_type = text/markdown
   packages = find:
   install_requires = file: requirements.txt
 
+[coverage:report]
+
+[flake8]
+max-line-length = 90
+ignore =
+  W503
+exclude =
+  docs/conf.py
+
 [tool:pytest]
 markers =
     all_inst: tests all instruments
     download: tests for downloadable instruments
     no_download: tests for instruments without download support
     first: first tests to run
     second: second tests to run
-flake8-ignore =
-  *.py W503
-  docs/conf.py ALL