Skip to content

Commit

Permalink
Merge pull request #72 from sjsrey/pen
Browse files Browse the repository at this point in the history
Pengram
  • Loading branch information
sjsrey authored Aug 20, 2024
2 parents a2fe5ee + 77ac3e8 commit 3bea348
Show file tree
Hide file tree
Showing 14 changed files with 1,139 additions and 29 deletions.
3 changes: 3 additions & 0 deletions ci/310-MIN.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ dependencies:
- numpy=1.23
- scipy=1.8
# testing
- seaborn
- mapclassify
- geopandas
- pytest
- pytest-cov
- pytest-xdist
Expand Down
2 changes: 2 additions & 0 deletions ci/311.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ dependencies:
- libpysal
- numpy
- scipy
- seaborn
- mapclassify
# testing
- pytest
- pytest-cov
Expand Down
2 changes: 2 additions & 0 deletions ci/312-DEV.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ dependencies:
- pytest-cov
- pytest-xdist
- codecov
- seaborn
- pip:
# dev versions of packages
- --pre --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple --extra-index-url https://pypi.org/simple
- numpy
- scipy
- git+https://github.com/pysal/libpysal.git@main
- git+https://github.com/pysal/mapclassify.git@main
2 changes: 2 additions & 0 deletions ci/312.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ dependencies:
- pytest-cov
- pytest-xdist
- codecov
- seaborn
- mapclassify
# docs
- nbsphinx
- numpydoc
Expand Down
22 changes: 4 additions & 18 deletions docs/Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Minimal makefile for Sphinx documentation
#

# You can set these variables from the command line.
SPHINXOPTS =
SPHINXBUILD = sphinx-build
SPHINXPROJ = inequality
# You can set these variables from the command line, and also
# from the environment for the first two.
SPHINXOPTS ?=
SPHINXBUILD ?= sphinx-build
SOURCEDIR = .
BUILDDIR = _build

Expand All @@ -17,18 +17,4 @@ help:
# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@rsync -r --exclude '.ipynb_checkpoints/' ../notebooks/ ./notebooks/
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

github:
@make html

sync:
@rsync -avh _build/html/ ../docs/ --delete
@make clean
touch .nojekyll

clean:
rm -rf $(BUILDDIR)/*
rm -rf auto_examples/
rm -rf generated/
9 changes: 9 additions & 0 deletions docs/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,12 @@ Gini Inequality Measures
inequality.gini.Gini
inequality.gini.Gini_Spatial

Pengram
-------

.. autosummary::
:toctree: generated/

inequality.pen.pen
inequality.pen.pengram

16 changes: 9 additions & 7 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,11 @@ An Example: Spatial Inequality in Mexico: 1940-2000
Development
===========

inequality development is hosted on github_.
The package is currently maintained by `@sjsrey`_

.. _github : https://github.com/pysal/inequality

Discussions of development occurs on the
`developer list <http://groups.google.com/group/pysal-dev>`_
as well as gitter_.

.. _gitter : https://gitter.im/pysal/pysal?

https://github.com/pysal/inequality

Getting Involved
======================
Expand Down Expand Up @@ -124,3 +119,10 @@ WARRANTIES.
References <references>

.. _PySAL: https://github.com/pysal/pysal
.. _PySAL (Python Spatial Analysis Library): http://pysal.org
.. _GeoPandas: http://geopandas.org
.. _PySAL: http://pysal.org
.. _@sjsrey: http://github.org/sjsrey
.. _issue: https://github.com/pysal/inequality/issues/new/choose
.. _discussion: https://github.com/pysal/inequality/discussions
.. _Discord: https://discord.com/channels/1192517762103398401/1192517763986632766
Loading

0 comments on commit 3bea348

Please sign in to comment.