Skip to content

Commit

Permalink
Merge pull request #36 from jGaboardi/initial_sglm_modernizer
Browse files Browse the repository at this point in the history
initial SPGLM modernization
  • Loading branch information
jGaboardi authored Oct 11, 2023
2 parents 615d63e + 443abac commit 621ebfb
Show file tree
Hide file tree
Showing 8 changed files with 151 additions and 7 deletions.
75 changes: 75 additions & 0 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: Continuous Integration

on:
push:
branches:
- '*'
pull_request:
branches:
- '*'
schedule:
- cron: '59 23 * * *'
workflow_dispatch:
inputs:
version:
description: Manual Unittest Run
default: test
required: false

jobs:
unittests:
env:
RUN_TEST: pytest spglm --cov spglm -v -n auto -r a --cov-report xml --color yes --cov-append --cov-report term-missing
name: ${{ matrix.os }}, ${{ matrix.environment-file }}
runs-on: ${{ matrix.os }}
defaults:
run:
shell: bash -l {0}
timeout-minutes: 60
strategy:
matrix:
os: [ubuntu-latest]
environment-file:
- ci/39-MIN.yaml
- ci/310.yaml
- ci/311.yaml
- ci/311-DEV.yaml
include:
- environment-file: ci/311.yaml
os: macos-latest
- environment-file: ci/311.yaml
os: windows-latest
fail-fast: false

steps:
- name: checkout repo
uses: actions/checkout@v4

- name: setup micromamba
uses: mamba-org/setup-micromamba@v1
with:
environment-file: ${{ matrix.environment-file }}
micromamba-version: 'latest'

- name: install bleeding edge libpysal & spreg (Ubuntu / latest Python)
shell: bash -l {0}
run: |
pip install git+https://github.com/pysal/libpysal.git@main
pip install git+https://github.com/pysal/spreg.git@main
if: matrix.os == 'ubuntu-latest' && contains(matrix.environment-file, 'DEV')

- name: environment info
shell: bash -l {0}
run: |
micromamba info
micromamba list
- name: run tests
run: ${{ env.RUN_TEST }}

- name: codecov
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml
name: spglm-codecov
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
**G**eneralized **L**inear **M**odeling
=======================================

[![Build Status](https://travis-ci.org/pysal/spglm.svg?branch=master)](https://travis-ci.org/pysal/spglm)
[![Continuous Integration](https://github.com/pysal/spglm/actions/workflows/testing.yml/badge.svg)]
[![Documentation Status](https://readthedocs.org/projects/spglm/badge/?version=latest)](https://spglm.readthedocs.io/en/latest/?badge=latest)
[![PyPI version](https://badge.fury.io/py/spglm.svg)](https://badge.fury.io/py/spglm)

Expand Down
17 changes: 17 additions & 0 deletions ci/310.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: test
channels:
- conda-forge
dependencies:
- python=3.10
# required
- git
- libpysal
- numpy
- pip
- scipy
- spreg
# testing
- codecov
- pytest
- pytest-cov
- pytest-xdist
13 changes: 13 additions & 0 deletions ci/311-DEV.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: test
channels:
- conda-forge
dependencies:
- python=3.11
# required
- git
- pip
# testing
- codecov
- pytest
- pytest-cov
- pytest-xdist
23 changes: 23 additions & 0 deletions ci/311.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: test
channels:
- conda-forge
dependencies:
- python=3.11
# required
- git
- libpysal
- numpy
- pip
- scipy
- spreg
# testing
- codecov
- pytest
- pytest-cov
- pytest-xdist
# docs (this env only)
- nbsphinx
- numpydoc
- sphinx>=1.4.3
- sphinxcontrib-bibtex
- sphinx_bootstrap_theme
17 changes: 17 additions & 0 deletions ci/39-MIN.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: test
channels:
- conda-forge
dependencies:
- python=3.9
# required
- git
- libpysal=4.5
- numpy=1.23
- pip
- scipy=1.8
- spreg=1.2
# testing
- codecov
- pytest
- pytest-cov
- pytest-xdist
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scipy>=0.11
numpy>=1.3
libpysal>=4.0.0
spreg>=1.0.4
scipy>=1.8
numpy>=1.23
libpysal>=4.5
spreg>=1.2
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ def setup_package():
'Topic :: Scientific/Engineering :: GIS',
'License :: OSI Approved :: BSD License',
'Programming Language :: Python',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7'
'Programming Language :: Python :: 3',
],
license='3-Clause BSD',
packages=find_packages(),
Expand Down

0 comments on commit 621ebfb

Please sign in to comment.