Skip to content

Commit 1185925

Browse files
authored
Merge pull request #196 from NREL/ndr/update-deps
update documentation; update tests; osmnx to 2.0
2 parents aa509d6 + b806fa0 commit 1185925

93 files changed

Lines changed: 5964 additions & 5380 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/assign_or_assign.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

.github/workflows/deploy-docs.yaml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: deploy-docs
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- docs/**
9+
- .github/workflows/deploy-docs.yaml
10+
11+
12+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
13+
permissions:
14+
contents: read
15+
pages: write
16+
id-token: write
17+
18+
jobs:
19+
deploy-docs:
20+
runs-on: ubuntu-latest
21+
defaults:
22+
run:
23+
shell: bash -el {0}
24+
steps:
25+
- uses: actions/checkout@v4
26+
27+
- uses: conda-incubator/setup-miniconda@v3
28+
with:
29+
auto-update-conda: true
30+
python-version: "3.12"
31+
32+
- name: Install package
33+
run: |
34+
conda install -c conda-forge osmnx
35+
pip install ".[dev]"
36+
37+
- name: Build book
38+
run: |
39+
jupyter-book build docs/
40+
41+
# Push the book's HTML to github-pages
42+
- name: GitHub Pages action
43+
uses: peaceiris/actions-gh-pages@v3
44+
with:
45+
github_token: ${{ secrets.GITHUB_TOKEN }}
46+
publish_dir: ./docs/_build/html
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ jobs:
1313
matrix:
1414
python-version: ["3.9", "3.10", "3.11", "3.12"]
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717
- name: Set up Python ${{ matrix.python-version }}
18-
uses: actions/setup-python@v3
18+
uses: actions/setup-python@v5
1919
with:
2020
python-version: ${{ matrix.python-version }}
2121
- name: Install dependencies
2222
run: |
2323
python -m pip install --upgrade pip
2424
pip install .[tests]
25-
- name: Run black
26-
run: black . --check
27-
- name: Run ruff
25+
- name: Run ruff linting
2826
run: ruff check .
27+
- name: Run ruff formatting
28+
run: ruff format --check
2929
- name: Run mypy
3030
run: mypy .
3131
- name: Run Tests

.github/workflows/release.yaml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,26 @@ jobs:
88
deploy:
99
runs-on: ubuntu-latest
1010
environment:
11-
name: pypi
12-
url: https://pypi.org/project/mappymatch/
11+
name: pypi
12+
url: https://pypi.org/project/mappymatch/
1313
permissions:
14-
id-token: write
14+
id-token: write
1515
steps:
16-
- uses: actions/checkout@v3
17-
- name: Set up Python
18-
uses: actions/setup-python@v4
19-
with:
20-
python-version: '3.9'
21-
- name: Install dependencies
22-
run: |
23-
python -m pip install --upgrade pip
24-
pip install build
25-
- name: Build package
26-
run: |
27-
python -m build
28-
- name: Upload artifacts
29-
uses: actions/upload-artifact@v3
30-
with:
16+
- uses: actions/checkout@v4
17+
- name: Set up Python
18+
uses: actions/setup-python@v5
19+
with:
20+
python-version: "3.9"
21+
- name: Install dependencies
22+
run: |
23+
python -m pip install --upgrade pip
24+
pip install hatch
25+
- name: Build package
26+
run: |
27+
hatch build
28+
- name: Upload artifacts
29+
uses: actions/upload-artifact@v3
30+
with:
3131
path: ./dist/*
32-
- name: Publish package
33-
uses: pypa/gh-action-pypi-publish@release/v1
32+
- name: Publish package
33+
uses: pypa/gh-action-pypi-publish@release/v1

.pre-commit-config.yaml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
repos:
2-
- repo: https://github.com/psf/black
3-
rev: 22.10.0
4-
hooks:
5-
- id: black
6-
args: [--config, pyproject.toml]
7-
- repo: https://github.com/charliermarsh/ruff-pre-commit
8-
rev: v0.0.188
9-
hooks:
10-
- id: ruff
11-
1+
repos:
2+
- repo: https://github.com/charliermarsh/ruff-pre-commit
3+
rev: v0.8.0
4+
hooks:
5+
- id: ruff
6+
- id: ruff-format
7+
8+
- repo: https://github.com/pre-commit/mirrors-mypy
9+
rev: "v1.13.0"
10+
hooks:
11+
- id: mypy
12+
additional_dependencies:
13+
[matplotlib, pandas-stubs, pytest, types-requests]

.readthedocs.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# Contributing to mappymatch
2+
3+
Thank you for considering contributing to mappymatch.
4+
This document provides a high-level overview of how you can get involved.
5+
6+
## Asking Questions
7+
8+
Have a question? Rather than opening an issue directly, please ask questions
9+
or post comments in [Q&A Discussions](https://github.com/NREL/mappymatch/discussions/categories/q-a).
10+
The NREL team or other members of the community will assist. Your well-worded
11+
question will serve as a resource to others searching for help.
12+
13+
## Providing Feedback
14+
15+
Your comments and feedback are very welcome. Please post to
16+
[General Discussions](https://github.com/NREL/mappymatch/discussions/categories/general)
17+
with lots of information and detail. It is beneficial to consider
18+
how someone else will understand your comments in order to make
19+
them most effective.
20+
21+
## Reporting Issues
22+
23+
Have you identified a reproducible problem in mappymatch?
24+
Have a feature request? We want to hear about it! Here's how you can make
25+
reporting your issue as effective as possible.
26+
27+
### Look For an Existing Issue
28+
29+
Before you create a new issue, please do a search in
30+
[open issues](https://github.com/NREL/mappymatch/issues) to see if
31+
the issue or feature request has already been filed.
32+
33+
If you find your issue already exists, make relevant comments and add your
34+
[reaction](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments).
35+
Use a reaction in place of a "+1" comment:
36+
37+
- 👍 - upvote
38+
- 👎 - downvote
39+
40+
If you cannot find an existing issue that describes your bug or feature,
41+
create a new issue using the guidelines below.
42+
43+
### Writing Good Bug Reports and Feature Requests
44+
45+
File a single issue per problem and feature request. Do not enumerate
46+
multiple bugs or feature requests in the same issue.
47+
48+
Do not add your issue as a comment to an existing issue unless it's for the
49+
identical input. Many issues look similar, but have different causes.
50+
51+
The more information you can provide, the more likely someone will
52+
be successful at reproducing the issue and finding a fix.
53+
54+
Please follow the issue template guidelines to include relevant information
55+
that will help in diagnosing the problem.
56+
57+
### Final Checklist
58+
59+
Please remember to do the following:
60+
61+
- [ ] Search the issue repository to ensure your report is a new issue
62+
63+
- [ ] Recreate the issue with a minimally descriptive example
64+
65+
- [ ] Simplify your code around the issue to better isolate the problem
66+
67+
## Contributing Fixes
68+
69+
If you are interested in writing code to fix an issue or
70+
submit a new feature, let us know in
71+
[Ideas Discussions](https://github.com/NREL/mappymatch/discussions/categories/ideas)!

docs/Makefile

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
mappymatch.constructs.coordinate
2+
================================
3+
4+
.. automodule:: mappymatch.constructs.coordinate
5+
6+
7+
.. rubric:: Classes
8+
9+
.. autosummary::
10+
11+
Coordinate
12+

0 commit comments

Comments
 (0)