Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
os: [ ubuntu-latest ]
submodule:
- { name: "fixbikenet", pytest_args: "tests/test_fixbikenet.py" }
- { name: "functions", pytest_args: "tests/test_functions.py" }
- { name: "utils", pytest_args: "tests/test_utils.py" }
fail-fast: false

name: ${{ matrix.submodule.name }} (${{ matrix.python-version }} on ${{ matrix.os }})
Expand Down
16 changes: 8 additions & 8 deletions docs/source/reference_developer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@ This is the complete developer reference for the FixBikeNet package. If you are


fixbikenet.fixbikenet
-----------------------
---------------------

.. automodule:: fixbikenet.fixbikenet
:members:


fixbikenet.functions
---------------------
fixbikenet.osm
--------------

.. automodule:: fixbikenet.functions
.. automodule:: fixbikenet.osm
:members:
:private-members:


fixbikenet.osm
--------------
fixbikenet.utils
----------------

.. automodule:: fixbikenet.osm
.. automodule:: fixbikenet.utils
:members:
:private-members:


fixbikenet.settings
Expand Down
5 changes: 1 addition & 4 deletions docs/source/reference_user.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,17 @@ fixbikenet.fixbikenet

.. automodule:: fixbikenet.fixbikenet
:members:
:no-index:


fixbikenet.settings
-------------------

.. automodule:: fixbikenet.settings
:members:
:no-index:


fixbikenet.osm
--------------

.. automodule:: fixbikenet.osm
:members:
:no-index:
:members:
7 changes: 4 additions & 3 deletions environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ dependencies:
- python>=3.12
- osmnx>=2
- tqdm
- bikenetlib

# additional to the non-dev env
# Additional to the non-dev env
- ipykernel
- ipywidgets
- pytest
Expand All @@ -20,8 +21,8 @@ dependencies:
- jupyterlab
- matplotlib
- pip:
# not available via conda-forge:
# Not available via conda-forge:
- sphinx-copybutton
- sphinxext-opengraph
- furo
- fixbikenet
- fixbikenet # For docs, get latest version fast from pypi
3 changes: 2 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ channels:
dependencies:
- python>=3.12
- osmnx>=2
- tqdm
- tqdm
- bikenetlib
2 changes: 1 addition & 1 deletion fixbikenet/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from . import constants
from . import osm
from . import settings
from . import functions
from . import utils

__author__ = "FixBikeNet contributors"
__author_email__ = "michael@szell.net"
Expand Down
2 changes: 1 addition & 1 deletion fixbikenet/fixbikenet.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

import matplotlib.pyplot as plt

from fixbikenet.functions import (
from fixbikenet.utils import (
_get_weighted_distances,
_import_data_files,
_print_footer,
Expand Down
2 changes: 1 addition & 1 deletion fixbikenet/functions.py β†’ fixbikenet/utils.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Utility functions for `fixbikenet`."""
"""Utility utils for `fixbikenet`."""

import itertools
import os
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ dependencies = [
"osmnx>=2",
"geojson",
"tqdm",
"bikenetlib",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion tests/test_functions.py β†’ tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from shapely.geometry import Point

import fixbikenet as fbn
from fixbikenet.functions import *
from fixbikenet.utils import *

fbn.constants._ROUTING_PENALTY = {0: 5, 1: 1}
fbn.constants._BETWEENNESS_RANDOM_NODES = 300
Expand Down
Loading