Skip to content

Commit

Permalink
clean up docs / bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
e-lo committed Jun 20, 2024
1 parent 0a1c094 commit beef6cf
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 49 deletions.
1 change: 1 addition & 0 deletions network_wrangler/transit/selection.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
Note: The selection dictionary should conform to the SelectTransitTrips model defined in
the models.projects.transit_selection module.
"""

from __future__ import annotations
import copy

Expand Down
48 changes: 46 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[build-system]
requires = ["setuptools", "wheel"]
requires = ["setuptools", "setuptools-scm", "wheel"]
build-backend = "setuptools.build_meta"

[project]
name = "network-wrangler"
Expand All @@ -13,7 +14,6 @@ authors = [
{ name = "Lisa Zorn", email = "[email protected]"},
{ name = "Ashish Kulshrestha", email = "[email protected]"}
]

classifiers = [
"Development Status :: 1 - Planning",
"License :: OSI Approved :: Apache Software License",
Expand All @@ -22,6 +22,50 @@ classifiers = [
"Programming Language :: Python",
"Programming Language :: Python :: 3",
]
dependencies = [
"geographiclib",
"geojson",
"geopandas >= 0.8.0",
"osmnx >= 0.12",
"pandas >= 1.6",
"pandera[geopandas]",
"projectcard @ git+ssh://[email protected]/network-wrangler/projectcard.git",
"pyarrow",
"pydantic >= 2",
"pyogrio",
"pyyaml",
]


[project.optional-dependencies]
viz = [
"folium",
"jupyter",
"notebook",
]
docs = [
"fontawesome_markdown",
"jupyter",
"markdown == 3.3.1",
"mike",
"mkdocs",
"mkdocs-autorefs",
"mkdocs-awesome-pages-plugin",
"mkdocs-jupyter",
"mkdocs-macros-plugin",
"mkdocs-material",
"mkdocstrings",
"mkdocstrings-python",
]
tests = [
"coverage",
"mypy",
"pytest",
"pytest-benchmark",
"pytest-cov",
"ruff",
"vulture",
]

[tool.ruff]
line-length = 99
Expand Down
3 changes: 0 additions & 3 deletions requirements.tests.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
"black[jupyter]"
black
coverage
flake8
mypy
pytest
pytest-benchmark
Expand Down
41 changes: 0 additions & 41 deletions setup.py

This file was deleted.

8 changes: 5 additions & 3 deletions tests/test_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ def test_setup():
import subprocess
import shutil

subprocess.run(["python", "-m", "venv", "wranglertest"])
subprocess.run(["wranglertest/bin/pip", "install", "."])
subprocess.run(["python", "-m", "venv", "wranglertest"], check=True)
subprocess.run(["wranglertest/bin/pip", "install", "network_wrangler"], check=True)
# Test that network wrangler can be imported
import network_wrangler
# Test that dependencies were installed
import osmnx

shutil.rmtree('wranglertest')
shutil.rmtree("wranglertest")

0 comments on commit beef6cf

Please sign in to comment.