Skip to content

Commit fa79f64

Browse files
authored
Merge pull request #88 from likeness-pop/develop
prep `v2.2.8` - merge `develop` into `main`
2 parents 86faa4c + ecedd7c commit fa79f64

4 files changed

Lines changed: 61 additions & 2 deletions

File tree

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
files: "pymedm\/|notebooks\/"
22
repos:
33
- repo: https://github.com/astral-sh/ruff-pre-commit
4-
rev: "v0.14.14"
4+
rev: "v0.15.0"
55
hooks:
66
- id: ruff-check
77
- id: ruff-format

README.md

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,70 @@
11
# PyMEDM: Penalized Maximum-Entropy Dasymetric Modeling (P-MEDM) in Python
22

33
![tag](https://img.shields.io/github/v/release/likeness-pop/pymedm?include_prereleases&sort=semver)
4+
[![PyPI version](https://badge.fury.io/py/pymedm.svg)](https://badge.fury.io/py/pymedm)
5+
[![Conda Version](https://img.shields.io/conda/vn/conda-forge/pymedm.svg)](https://anaconda.org/conda-forge/pymedm)
6+
47
[![Continuous Integration](https://github.com/likeness-pop/pymedm/actions/workflows/continuous_integration.yml/badge.svg)](https://github.com/likeness-pop/pymedm/actions/workflows/continuous_integration.yml)
58
[![codecov](https://codecov.io/gh/likeness-pop/pymedm/branch/develop/graph/badge.svg)](https://codecov.io/gh/likeness-pop/pymedm)
69
[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
710

8-
This is a GPU-ready Python port of [PMEDMrcpp](https://bitbucket.org/jovtc/pmedmrcpp/src/master) via `jax` and `jaxopt`.
11+
This is a GPU-ready Python port of [PMEDMrcpp](https://bitbucket.org/jovtc/pmedmrcpp/src/master) via `jax` and `jaxopt`. Support for usage on Windows is not guaranteed.
12+
13+
## Installation
14+
15+
### Conda-forge (recommended)
16+
17+
The `pymedm` feedstock is available via the [conda-forge channel](https://github.com/conda-forge/pymedm-feedstock).
18+
19+
```
20+
$ conda install --channel conda-forge pymedm
21+
```
22+
23+
### PyPI
24+
25+
`pymedm` is available on the [Python Package Index](https://pypi.org/project/pymedm/).
26+
27+
```
28+
$ pip install pymedm
29+
```
30+
31+
### Source
32+
33+
#### Directly via GitHub + `pip`
34+
35+
```
36+
$ pip install git+https://github.com/likeness-pop/pymedm.git@develop
37+
```
38+
39+
#### Download + `pip`
40+
41+
Download the source distribution (``.tar.gz``) and decompress where desired. From that location:
42+
43+
```
44+
$ pip install .
45+
```
46+
47+
## Usage
48+
49+
* See usage examples in [`./notebooks/`](https://github.com/likeness-pop/pymedm/tree/main/notebooks)
50+
51+
## Development
52+
53+
1. Clone the repository to the desired location.
54+
2. Install in editable mode
55+
* Navigate to where the repo was cloned locally.
56+
* Within that directory:
57+
```
58+
$ pip install -e .
59+
```
60+
3. Open an Issue for discussion
61+
4. In a branch off `develop`, implement update/bug fix/etc.
62+
5. Create a minimal Pull Request with clear description linked back to the associated issue from (3.)
63+
6. Wait for review from maintainers
64+
7. Adjust as directed
65+
8. Once merged, fetch down `origin/develop` and merge into the local `develop`
66+
9. Delete the branch created in (4.)
67+
10. Start over at (2.)
968
1069
## References
1170

notebooks/.gitkeep

Whitespace-only changes.

resources/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)