Skip to content

Commit 621ebfb

Browse files
jGaboardijGaboardi
authored
Merge pull request #36 from jGaboardi/initial_sglm_modernizer
initial SPGLM modernization
2 parents 615d63e + 443abac commit 621ebfb

File tree

8 files changed

+151
-7
lines changed

8 files changed

+151
-7
lines changed

‎.github/workflows/testing.yml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: Continuous Integration
2+
3+
on:
4+
push:
5+
branches:
6+
- '*'
7+
pull_request:
8+
branches:
9+
- '*'
10+
schedule:
11+
- cron: '59 23 * * *'
12+
workflow_dispatch:
13+
inputs:
14+
version:
15+
description: Manual Unittest Run
16+
default: test
17+
required: false
18+
19+
jobs:
20+
unittests:
21+
env:
22+
RUN_TEST: pytest spglm --cov spglm -v -n auto -r a --cov-report xml --color yes --cov-append --cov-report term-missing
23+
name: ${{ matrix.os }}, ${{ matrix.environment-file }}
24+
runs-on: ${{ matrix.os }}
25+
defaults:
26+
run:
27+
shell: bash -l {0}
28+
timeout-minutes: 60
29+
strategy:
30+
matrix:
31+
os: [ubuntu-latest]
32+
environment-file:
33+
- ci/39-MIN.yaml
34+
- ci/310.yaml
35+
- ci/311.yaml
36+
- ci/311-DEV.yaml
37+
include:
38+
- environment-file: ci/311.yaml
39+
os: macos-latest
40+
- environment-file: ci/311.yaml
41+
os: windows-latest
42+
fail-fast: false
43+
44+
steps:
45+
- name: checkout repo
46+
uses: actions/checkout@v4
47+
48+
- name: setup micromamba
49+
uses: mamba-org/setup-micromamba@v1
50+
with:
51+
environment-file: ${{ matrix.environment-file }}
52+
micromamba-version: 'latest'
53+
54+
- name: install bleeding edge libpysal & spreg (Ubuntu / latest Python)
55+
shell: bash -l {0}
56+
run: |
57+
pip install git+https://github.com/pysal/libpysal.git@main
58+
pip install git+https://github.com/pysal/spreg.git@main
59+
if: matrix.os == 'ubuntu-latest' && contains(matrix.environment-file, 'DEV')
60+
61+
- name: environment info
62+
shell: bash -l {0}
63+
run: |
64+
micromamba info
65+
micromamba list
66+
67+
- name: run tests
68+
run: ${{ env.RUN_TEST }}
69+
70+
- name: codecov
71+
uses: codecov/codecov-action@v3
72+
with:
73+
token: ${{ secrets.CODECOV_TOKEN }}
74+
file: ./coverage.xml
75+
name: spglm-codecov

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
**G**eneralized **L**inear **M**odeling
22
=======================================
33

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

‎ci/310.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: test
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python=3.10
6+
# required
7+
- git
8+
- libpysal
9+
- numpy
10+
- pip
11+
- scipy
12+
- spreg
13+
# testing
14+
- codecov
15+
- pytest
16+
- pytest-cov
17+
- pytest-xdist

‎ci/311-DEV.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: test
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python=3.11
6+
# required
7+
- git
8+
- pip
9+
# testing
10+
- codecov
11+
- pytest
12+
- pytest-cov
13+
- pytest-xdist

‎ci/311.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: test
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python=3.11
6+
# required
7+
- git
8+
- libpysal
9+
- numpy
10+
- pip
11+
- scipy
12+
- spreg
13+
# testing
14+
- codecov
15+
- pytest
16+
- pytest-cov
17+
- pytest-xdist
18+
# docs (this env only)
19+
- nbsphinx
20+
- numpydoc
21+
- sphinx>=1.4.3
22+
- sphinxcontrib-bibtex
23+
- sphinx_bootstrap_theme

‎ci/39-MIN.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: test
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python=3.9
6+
# required
7+
- git
8+
- libpysal=4.5
9+
- numpy=1.23
10+
- pip
11+
- scipy=1.8
12+
- spreg=1.2
13+
# testing
14+
- codecov
15+
- pytest
16+
- pytest-cov
17+
- pytest-xdist

‎requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
scipy>=0.11
2-
numpy>=1.3
3-
libpysal>=4.0.0
4-
spreg>=1.0.4
1+
scipy>=1.8
2+
numpy>=1.23
3+
libpysal>=4.5
4+
spreg>=1.2

‎setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ def setup_package():
5050
'Topic :: Scientific/Engineering :: GIS',
5151
'License :: OSI Approved :: BSD License',
5252
'Programming Language :: Python',
53-
'Programming Language :: Python :: 3.6',
54-
'Programming Language :: Python :: 3.7'
53+
'Programming Language :: Python :: 3',
5554
],
5655
license='3-Clause BSD',
5756
packages=find_packages(),

0 commit comments

Comments
 (0)