Skip to content

Commit

Permalink
Merge pull request #119 from UDST/include-functional
Browse files Browse the repository at this point in the history
Adding "#include <functional>" to fix compilation on certain platforms
  • Loading branch information
smmaurer authored Aug 28, 2019
2 parents 946da88 + 125eebd commit 947b440
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 9 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
v0.4.3
======

2019/8/28

* Improved compiler support.

v0.4.2
======

Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
# built documents.
#
# The short X.Y version.
version = '0.4.2'
version = '0.4.3'
# The full version, including alpha/beta/rc tags.
release = '0.4.2'
release = '0.4.3'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion pandana/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from .network import Network

version = __version__ = '0.4.2'
version = __version__ = '0.4.3'
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,10 @@ def run(self):
## Standard setup
###############################################

version = '0.4.2'
version = '0.4.3'

packages = find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"])

# read long description from README
with open('README.md', 'r') as f:
long_description = f.read()

setup(
packages=packages,
name='pandana',
Expand All @@ -118,7 +114,11 @@ def run(self):
license='AGPL',
description=('Pandas Network Analysis - '
'dataframes of network queries, quickly'),
long_description=long_description,
long_description=(
'Pandana performs hundreds of thousands of network queries in under a '
'second (for walking-scale distances) using a Pandas-like API. The '
'computations are parallelized for multi-core machines using an '
'underlying C++ library.'),
url='https://udst.github.io/pandana/',
ext_modules=[cyaccess],
install_requires=[
Expand Down
1 change: 1 addition & 0 deletions src/accessibility.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "accessibility.h"
#include <algorithm>
#include <cmath>
#include <functional>
#include <utility>
#include "graphalg.h"

Expand Down

0 comments on commit 947b440

Please sign in to comment.