Skip to content

Commit

Permalink
Cleanup and actions
Browse files Browse the repository at this point in the history
  • Loading branch information
smmaurer committed Aug 23, 2022
1 parent 88ec50a commit ddcd908
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 20 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ jobs:
# with:
# ref: 'v0.6' # enable to check out prior version of codebase
- name: Build wheels
uses: RalfG/python-wheels-manylinux-build@v0.3.4
uses: RalfG/python-wheels-manylinux-build@v0.5.0
with:
python-versions: 'cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39'
python-versions: 'cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310'
- name: Save artifacts
uses: actions/upload-artifact@v2
with:
Expand All @@ -42,7 +42,7 @@ jobs:
strategy:
matrix:
os: [macos-latest, windows-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.6, 3.7, 3.8, 3.9, '3.10']
steps:
- uses: actions/checkout@v2
# with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cross-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
python-version: [3.6, 3.7, 3.8]
python-version: [3.6, 3.7, 3.8, 3.9, '3.10']
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -42,7 +42,7 @@ jobs:
strategy:
matrix:
os: [windows-latest]
python-version: [3.6, 3.7, 3.8]
python-version: [3.6, 3.7, 3.8, 3.9, '3.10']
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/installation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
# Pip installation for Windows is not supported. Pip installation for Mac is
# broken in the GitHub Actions environment with Pandana v0.6 but should be fixed
# in the next Pandana release.
python-version: [3.6, 3.7, 3.8]
python-version: [3.6, 3.7, 3.8, 3.9, '3.10']
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
v0.7
====

2022/08/24

* Adds support for calculating accessibility isochrones: which nodes are within x network distance of a source node
* Allows a maximum distance to be set for POIs
* Supports PyTables 3.7+
* Switches to pyproject.toml packaging standards
* Adds newer binaries on PyPI
* Improves compilation in MacOS 12+

v0.6.1
======

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ As of March 2021, binary installers are provided for Mac, Linux, and Windows thr
- `pip install pandana`
- `conda install pandana --channel conda-forge`

Pandana is easiest to install in Python 3.6 to 3.9. The last version of Pandana with Python 2.7 binaries is v0.4.4 on Conda Forge. The last version with Python 3.5 binaries is v0.6 on Pip.
Pandana is easiest to install in Python 3.6 to 3.10. The last version of Pandana with Python 2.7 binaries is v0.4.4 on Conda Forge. The last version with Python 3.5 binaries is v0.6 on Pip.

See the documentation for information about other [installation options](http://udst.github.io/pandana/installation.html).

Expand Down
4 changes: 2 additions & 2 deletions docs/source/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.6.1'
version = '0.7'
# The full version, including alpha/beta/rc tags.
release = '0.6.1'
release = '0.7'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Pandana

Pandana is a Python library for network analysis that uses `contraction hierarchies <https://en.wikipedia.org/wiki/Contraction_hierarchies>`_ to calculate super-fast travel accessibility metrics and shortest paths. The numerical code is in C++.

v0.6.1, released March 17, 2021.
v0.7, released August 24, 2022.


Acknowledgments
Expand Down
2 changes: 1 addition & 1 deletion docs/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Or Conda::

conda install pandana --channel conda-forge

Pandana is easiest to install in Python 3.6 to 3.9. The last version of Pandana with Python 2.7 binaries is v0.4.4 on Conda Forge. The last version with Python 3.5 binaries is v0.6 on Pip.
Pandana is easiest to install in Python 3.6 to 3.10. The last version of Pandana with Python 2.7 binaries is v0.4.4 on Conda Forge. The last version with Python 3.5 binaries is v0.6 on Pip.


ARM-based Macs
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.7.dev0'
version = __version__ = '0.7'
15 changes: 7 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@
)
)

if "10.15" in os.popen("sw_vers").read():
if " 10.15" in os.popen("sw_vers").read():
os.environ["CC"] = cc_catalina
elif "11." in os.popen("sw_vers").read():
os.environ["CC"] = cc_catalina
else:
elif " 10." in os.popen("sw_vers").read(): # 10.14 and earlier
os.environ["CC"] = cc
else: # 11.x, 12.x, etc.
os.environ["CC"] = cc_catalina

else:
print(
Expand Down Expand Up @@ -93,7 +93,7 @@
## Standard setup
###############################################

version = "0.7.dev0"
version = "0.7"

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

Expand All @@ -117,16 +117,15 @@
'pandas >=0.17',
'requests >=2.0',
'scikit-learn >=0.18',
'tables >=3.1, <3.6; python_version <"3.6"',
'tables >=3.1, <3.7; python_version >="3.6"'
'tables >=3.1'
],
classifiers=[
"Development Status :: 4 - Beta",
"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",
"License :: OSI Approved :: GNU Affero General Public License v3",
],
)

0 comments on commit ddcd908

Please sign in to comment.