Skip to content

Commit

Permalink
Merge pull request #296 from jGaboardi/new_attributes_etc
Browse files Browse the repository at this point in the history
New attributes & functionality for `locate` models
  • Loading branch information
jGaboardi authored Nov 8, 2022
2 parents 799cd86 + 8c072af commit 2ac4039
Show file tree
Hide file tree
Showing 21 changed files with 10,828 additions and 9,808 deletions.
16 changes: 14 additions & 2 deletions .github/workflows/unittests.yml → .github/workflows/testing.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
name: Continuous Integration

on:
push:
branches:
Expand All @@ -9,12 +11,12 @@
- cron: '59 23 * * *'

jobs:
unittests:
tests:
name: ${{ matrix.os }}, ${{ matrix.environment-file }}
runs-on: ${{ matrix.os }}
timeout-minutes: 30
env:
RUN_TEST: pytest spopt --cov spopt -v -n auto --cov-config .coveragerc --cov-report xml --color yes --cov-append --cov-report term-missing
RUN_TEST: pytest spopt -v -r a -n auto --cov spopt --cov-config .coveragerc --cov-report xml --color yes --cov-append --cov-report term-missing
strategy:
matrix:
os: [ubuntu-latest]
Expand Down Expand Up @@ -46,6 +48,16 @@
run: pip install git+https://github.com/pysal/libpysal.git@master
if: matrix.os == 'ubuntu-latest' && contains(matrix.environment-file, 'DEV')

- name: environment info
shell: bash -l {0}
run: |
micromamba info
micromamba list
- name: spatial versions
shell: bash -l {0}
run: 'python -c "import geopandas; geopandas.show_versions();"'

- name: run tests - bash
shell: bash -l {0}
run: ${{ env.RUN_TEST }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#### Regionalization, facility location, and transportation-oriented modeling

![tag](https://img.shields.io/github/v/release/pysal/spopt?include_prereleases&sort=semver)
[![unittests](https://github.com/pysal/spopt/workflows/.github/workflows/unittests.yml/badge.svg)](https://github.com/pysal/spopt/actions?query=workflow%3A.github%2Fworkflows%2Funittests.yml)
[![CI](https://github.com/pysal/spopt/workflows/.github/workflows/testing.yml/badge.svg)](https://github.com/pysal/spopt/actions?query=workflow%3A.github%2Fworkflows%testing.yml)
[![codecov](https://codecov.io/gh/pysal/spopt/branch/main/graph/badge.svg)](https://codecov.io/gh/pysal/spopt)
[![Documentation](https://img.shields.io/static/v1.svg?label=docs&message=current&color=9cf)](http://pysal.org/spopt/)
[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
Expand Down
Loading

0 comments on commit 2ac4039

Please sign in to comment.