Skip to content

Commit

Permalink
Merge pull request #30 from UDST/release-prep
Browse files Browse the repository at this point in the history
v0.1.7 release prep
  • Loading branch information
smmaurer authored Aug 8, 2023
2 parents e1ab4df + 1ba50a8 commit 47cfec0
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 16 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
language: python

python:
- '3.6'
# - '3.7' # drop tests in 3.7 for now due to Travis build error
- '3.8'
- '3.9'
- '3.10'
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
v0.1.7
======

2023/8/7

* adds support for Shapely 2.0

v0.1.6
======

Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ build: false

environment:
matrix:
- PYTHON: 3.6
- PYTHON: 3.8

init:
- "ECHO %PYTHON%"
Expand Down
6 changes: 3 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
source_suffix = '.rst'
master_doc = 'index'
project = u'OSMnet'
copyright = u'2022, UrbanSim Inc.'
copyright = u'2023, UrbanSim Inc.'
author = u'UrbanSim Inc.'
version = u'0.1.6'
release = u'0.1.6'
version = u'0.1.7'
release = u'0.1.7'
language = None

nitpicky = True
Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ OSMnet

Tools for the extraction of `OpenStreetMap`_ (OSM) street network data. Intended to be used in tandem with `Pandana`_ and `UrbanAccess`_ libraries to extract street network nodes and edges.

v0.1.6, released July 13, 2020.
v0.1.7, released August 7, 2023.

Contents
--------
Expand Down
2 changes: 1 addition & 1 deletion osmnet/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .load import *

__version__ = "0.1.6"
__version__ = "0.1.7"

version = __version__
8 changes: 4 additions & 4 deletions osmnet/tests/test_load.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ def test_node_pairs_two_way(dataframes2):

assert pair.from_id == fn
assert pair.to_id == tn
npt.assert_allclose(pair.distance, 101.48279182499789)
npt.assert_allclose(pair.distance, 100.575284)


def test_node_pairs_one_way(dataframes2):
Expand All @@ -275,7 +275,7 @@ def test_node_pairs_one_way(dataframes2):

assert pair.from_id == p1
assert pair.to_id == p2
npt.assert_allclose(pair.distance, 101.48279182499789)
npt.assert_allclose(pair.distance, 100.575284)


def test_column_names(bbox4):
Expand All @@ -297,8 +297,8 @@ def test_custom_query_pass(bbox5):
nodes, edges = load.network_from_bbox(
bbox=bbox5, custom_osm_filter='["highway"="service"]'
)
assert len(nodes) == 24
assert len(edges) == 32
assert len(nodes) == 25
assert len(edges) == 33
assert edges['highway'].unique() == 'service'


Expand Down
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

setup(
name='osmnet',
version='0.1.6',
version='0.1.7',
license='AGPL',
description=('Tools for the extraction of OpenStreetMap street network '
'data for use in Pandana accessibility analyses.'),
Expand All @@ -17,12 +17,10 @@
'Intended Audience :: Science/Research',
'Topic :: Scientific/Engineering :: Information Analysis',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Development Status :: 3 - Alpha',
'License :: OSI Approved :: GNU Affero General Public License v3'
],
Expand Down

0 comments on commit 47cfec0

Please sign in to comment.