Merge pull request #65 from CosmicStudioSoftware/v1.1.0-RC

Release Candidate V1.1.0

Author: rstoneback

.github/workflows/docs.yml

@@ -29,11 +29,6 @@ jobs:
         pip install -r test_requirements.txt
         pip install -r requirements.txt
 
-    - name: Set up pysat
-      run: |
-        mkdir pysatData
-        python -c "import pysat; pysat.params['data_dirs'] = 'pysatData'"
-
     - name: Check documentation build
       run: sphinx-build -E -b html docs dist/docs
 

.github/workflows/main.yml

@@ -5,20 +5,39 @@
 
 name: Pytest with Flake8
 
-on: [pull_request, push]
+on:
+  pull_request:
+  push:
+  schedule:
+    - cron: "0 3 * * 1"  # Runs 03:00 UT on Mondays
 
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
-        python-version: ["3.9", "3.10"]
-        numpy_ver: [latest]
+        os: ["ubuntu-latest"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        numpy_ver: ["latest"]
         include:
-          - python-version: "3.8"
-            numpy_ver: "1.19"
+          # Support different GA Mac environments
+          - python-version: "3.9"
+            os: "macos-13"
+            numpy_ver: "latest"
+          - python-version: "3.12"
+            os: "macos-13"
+            numpy_ver: "latest"
+          - python-version: "3.9"
+            os: "macos-latest"
+            numpy_ver: "latest"
+          - python-version: "3.12"
+            os: "macos-latest"
+            numpy_ver: "latest"
+          # NEP29 compliance settings
+          - python-version: "3.10"
+            numpy_ver: "1.25"
             os: "ubuntu-latest"
+            test_config: "NEP29"
 
     name: Python ${{ matrix.python-version }} on ${{ matrix.os }} with numpy ${{ matrix.numpy_ver }}
     runs-on: ${{ matrix.os }}
@@ -29,6 +48,16 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
 
+    - name: Install Windows-specific dependencies for non-pip install
+      if: ${{ matrix.os == 'windows-latest' }}
+      run: |
+           choco install ninja mingw
+           choco install rtools --no-progress
+           echo "c:\rtools40\ucrt64\bin;" >> $env:GITHUB_PATH
+           gfortran --version
+           pip install flake8 meson-python pytest pytest-cov pytest-xdist scipy
+           pip install "numpy>=1.19.5"
+
     - name: Install standard dependencies
       run: |
         python -m pip install --upgrade pip
@@ -51,14 +80,70 @@ jobs:
     - name: Evaluate complexity
       run: flake8 . --count --exit-zero --max-complexity=10 --statistics
 
-    - name: Run OMMBV setup.py
+    - name: Install on Linux
+      if: ${{ matrix.os == 'ubuntu-latest' }}
+      run: |
+        pip install --upgrade-strategy only-if-needed .
+
+    - name: Install on MacOS-13
+      if: ${{ matrix.os == 'macos-13' }}
       run: |
-        python setup.py develop
+        brew reinstall gcc@14
+        CC=/usr/local/bin/gcc-14 pip install --upgrade-strategy only-if-needed .
 
-    - name: Run unit and integration tests
-      run: pytest --cov=OMMBV/
+    - name: Install on MacOS-Latest
+      if: ${{ matrix.os == 'macos-latest' }}
+      run: |
+        brew reinstall gcc@14
+        CC=/opt/homebrew/bin/gcc-14 pip install --upgrade-strategy only-if-needed .
+
+    - name: Install on Windows
+      if: ${{ matrix.os == 'windows-latest' }}
+      run: |
+        meson setup build
+        ninja -j 2 -C build
+        cd build
+        meson install --destdir=${{ env.Python3_ROOT_DIR }} 
 
-    - name: Publish results to coveralls
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: coveralls --rcfile=setup.cfg --service=github
+    - name: Run unit and integration tests Mac/Linux
+      if: ${{ matrix.os != 'windows-latest' }}
+      run: |
+        rm -rf ./OMMBV 
+        mkdir new_dir
+        cd new_dir
+        coverage run -m --source=OMMBV --omit=__init__.py pytest ../tests
+        coverage report
+        coverage xml
+        mkdir ../OMMBV
+        mv coverage.xml ../OMMBV/coverage.xml
+
+    - name: Run unit and integration tests on Windows
+      if: ${{ matrix.os == 'windows-latest' }}
+      run: |
+        rm ./OMMBV -r -force
+        cd ..
+        pytest ./OMMBV/tests -v --cov
+        
+        coverage report
+        coverage xml
+        mv coverage.xml .\OMMBV\.
+
+    - name: Publish results to coveralls upon success
+      uses: coverallsapp/github-action@v2
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        flag-name: run=${{ join(matrix.*, '-') }}
+        parallel: true
+        format: cobertura
+
+  finish:
+    name: Finish Coverage Analysis
+    needs: build
+    if: ${{ always() }}
+    runs-on: ubuntu-latest
+    steps:
+    - name: Coveralls Finished
+      uses: coverallsapp/github-action@v2
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        parallel-finished: true

.readthedocs.yml

@@ -5,6 +5,12 @@
 # Required
 version: 2
 
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.10"
+
+
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
   configuration: docs/conf.py
@@ -20,7 +26,6 @@ formats:
 # Optionally set the version of Python and requirements
 # required to build your docs
 python:
-  version: 3.7
   install:
     - requirements: docs/requirements.txt
 

CHANGELOG.md

@@ -2,6 +2,15 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.1.0] - 2025-04-07
+- Switched away from distutils to Meson for build system
+- Updated coupling to coveralls
+- Updated package version for security issue in sphinx
+- Updated online unit testing
+- Updated to IGRF14
+- Updated documentation
+- Updated unit tests to latest standards
+
 ## [1.0.1] - 2022-01-04
 - Added pyproject.toml to support systems without numpy.
 - Modified manifest.ini to include version.txt

CODE_OF_CONDUCT.md

@@ -4,10 +4,10 @@
 
 In the interest of fostering an open and welcoming environment, we as
 contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
+our community a harassment-free experience for everyone, regardless of age,
+body size, disability, ethnicity, gender identity and expression, level of
+experience, nationality, personal appearance, race, religion, or sexual
+identity and orientation.
 
 ## Our Standards
 
@@ -23,13 +23,13 @@ include:
 Examples of unacceptable behavior by participants include:
 
 * The use of sexualized language or imagery and unwelcome sexual attention or
- advances
+  advances
 * Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
 * Publishing others' private information, such as a physical or electronic
- address, without explicit permission
+  address, without explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
- professional setting
+  professional setting
 
 ## Our Responsibilities
 
@@ -48,29 +48,35 @@ threatening, offensive, or harmful.
 This Code of Conduct applies both within project spaces and in public spaces
 when an individual is representing the project or its community. Examples of
 representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
+address, posting via an official social media account, or acting as an
+appointed representative at an online or offline event. Representation of a
+project may be further defined and clarified by project maintainers.
 
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at pysat.developers@gmail.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and 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.
+reported by contacting the project team at contact@cosmicstudio.io. The
+pysat 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.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good
 faith may face temporary or permanent repercussions as determined by other
 members of the project's leadership.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.4, available at
+[https://contributor-covenant.org/version/1/4][version]
 
-[homepage]: https://www.contributor-covenant.org
+## FAQ
 
 For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
+[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