Merge pull request #95 from pysat/update_templates

MAINT: Update templates

.github/ISSUE_TEMPLATE/bug_report.md

@@ -26,4 +26,4 @@ solve the problem.
  - Other details about your setup that could be relevant
 
 # Additional context
-Add any other context about the problem here.
+Add any other context about the problem here, including expected behaviour.

.github/ISSUE_TEMPLATE/question.md

@@ -15,5 +15,5 @@ the full context of your question.
 
 ## Configuration
  - OS: [e.g. Hal]
- - Version [e.g. Python 3.47]
+ - Version: [e.g. Python 3.47]
  - Other details about your setup that could be relevant

.github/pull_request_template.md

@@ -1,6 +1,6 @@
 # Description
 
-Addresses # (issue)
+Addresses #(issue)
 
 Please include a summary of the change and which issue is fixed. Please also
 include relevant motivation and context. List any dependencies that are required
@@ -47,6 +47,7 @@ Test B
 - [ ] New and existing unit tests pass locally with my changes
 - [ ] Any dependent changes have been merged and published in downstream modules
 - [ ] Add a note to ``CHANGELOG.md``, summarizing the changes
+- [ ] Update zenodo.json file for new code contributors
 
 If this is a release PR, replace the first item of the above checklist with the
 release checklist on the pysat wiki:

.github/workflows/docs.yml

@@ -1,5 +1,6 @@
-# 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
+# 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: Documentation Check
 
@@ -8,11 +9,11 @@ on: [push, pull_request]
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ["ubuntu-latest"]
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9]
+        python-version: ["3.9"]
 
     name: Documentation tests
     steps:
@@ -21,11 +22,8 @@ jobs:
       uses: actions/setup-python@v4
       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
+    - name: Install with dependencies
+      run: pip install .[doc]
 
     - name: Set up pysat
       run: |

.github/workflows/main.yml

@@ -13,17 +13,21 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        python-version: ["3.9", "3.10"]
-        numpy_ver: ["latest"]
+        python-version: ["3.10", "3.11"]
+        test_config: ["latest"]
         include:
-          - python-version: "3.8"
+          # NEP29 compliance settings
+          - python-version: "3.9"
             numpy_ver: "1.21"
             os: ubuntu-latest
+            test_config: "NEP29"
+          # Operational compliance settings
           - python-version: "3.6.8"
             numpy_ver: "1.19.5"
             os: "ubuntu-20.04"
+            test_config: "Ops"
 
-    name: Python ${{ matrix.python-version }} on ${{ matrix.os }} with numpy ${{ matrix.numpy_ver }}
+    name: ${{ matrix.test_config }} Python ${{ matrix.python-version }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -32,15 +36,23 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Install standard dependencies
+    - name: Install Operational dependencies
+      if: ${{ matrix.test_config == 'Ops'}}
       run: |
+        pip install numpy==${{ matrix.numpy_ver }}
+        pip install -r requirements.txt
         pip install -r test_requirements.txt
-        pip install -r requirements.txt;
+        pip install .
 
     - name: Install NEP29 dependencies
-      if: ${{ matrix.numpy_ver != 'latest'}}
+      if: ${{ matrix.test_config == 'NEP29'}}
       run: |
         pip install numpy==${{ matrix.numpy_ver }}
+        pip install --upgrade-strategy only-if-needed .[test]
+
+    - name: Install standard dependencies
+      if: ${{ matrix.test_config == 'latest'}}
+      run: pip install .[test]
 
     - name: Set up pysat
       run: |
@@ -54,7 +66,7 @@ jobs:
       run: flake8 . --count --exit-zero --max-complexity=10 --statistics
 
     - name: Test with pytest
-      run: pytest -x --cov=pysatMadrigal/
+      run: pytest
 
     - name: Publish results to coveralls
       env:

.github/workflows/pip_rc_install.yml

@@ -1,6 +1,7 @@
-# This workflow will install Python dependencies and the latest RC of pysatNASA from test pypi.
-# This test should be manually run before a pysatMadrigal RC is officially approved and versioned.
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+# This workflow will install Python dependencies and the latest RC of
+# pysatMadrigal from test pypi. This test should be manually run before an RC is
+# officially approved and versioned. For more information see:
+# https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
 name: Test install of latest RC from pip
 
@@ -12,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        python-version: ["3.10"]  # Keep this version at the highest supported Python version
+        python-version: ["3.11"]  # Keep this version at the highest supported Python version
 
     name: Python ${{ matrix.python-version }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}

.github/workflows/pysat_rc.yml

@@ -1,5 +1,6 @@
-# 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
+# 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: Test with latest pysat RC
 
@@ -10,8 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-# TODO(#76): add windows tests when bugs are sorted
-        os: [ubuntu-latest, macos-latest]
+        os: ["ubuntu-latest", "macos-latest", "windows-latest"]
         python-version: ["3.10"]
 
     name: Python ${{ matrix.python-version }} on ${{ matrix.os }}
@@ -26,18 +26,16 @@ jobs:
     - name: Install pysat RC
       run: pip install --pre -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ pysat
 
-    - name: Install standard dependencies
-      run: |
-        pip install -r requirements.txt
-        pip install -r test_requirements.txt
+    - name: Install standard dependencies and package
+      run: run pip install .[test]
 
     - name: Set up pysat
       run: |
         mkdir pysatData
         python -c "import pysat; pysat.params['data_dirs'] = 'pysatData'"
 
     - name: Test with pytest
-      run: pytest -vs -x --cov=pysatMadrigal/
+      run: pytest
 
     - name: Publish results to coveralls
       env:

.readthedocs.yml

@@ -0,0 +1,25 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required version of readthedocs
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.10"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+   configuration: docs/conf.py
+
+
+# Declare the Python requirements required to build your docs
+python:
+   install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - doc

CHANGELOG.md

@@ -15,6 +15,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
   * Add manual GitHub Actions tests for pysatMadrigal RC
   * Update GitHub Actions workflows for newer versions of pip
   * Added clean warning test attributes to all Instruments
+  * Updated documentation to comply with current Ecosystem guidelines
+  * Replaced setup.py with pyproject.toml
 
 [0.1.0] - 2023-04-11
 --------------------

CODE_OF_CONDUCT.md

@@ -56,9 +56,9 @@ project may be further defined and clarified by project maintainers.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported by contacting the project team at pysat.developers@gmail.com. The
-project team will review and investigate all complaints, and will respond in a
-way that it deems appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an
+pysatMadrigal project team will review and investigate all complaints, and will
+respond in a way that it deems appropriate to the circumstances. The project
+team is obligated to maintain confidentiality with regard to the reporter of an
 incident. Further details of specific enforcement policies may be posted
 separately.
 
@@ -69,7 +69,14 @@ members of the project's leadership.
 ## Attribution
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.4, available at [https://contributor-covenant.org/version/1/4][version]
+version 1.4, available at
+[https://contributor-covenant.org/version/1/4][version]
+
+## FAQ
+
+For answers to common questions about this code of conduct, see
+[https://www.contributor-covenant.org/faq][faq]
 
 [homepage]: https://contributor-covenant.org
 [version]: https://contributor-covenant.org/version/1/4/
+[faq]: https://www.contributor-covenant.org/faq