Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
251 commits
Select commit Hold shift + click to select a range
7101ae3
update version documentation
e-lo Feb 28, 2019
707af0e
Make setup.py work for python 2.X
e-lo Mar 20, 2019
a1f4f5c
typo on line ending
e-lo Mar 20, 2019
ac70cb3
forgot i took out os.path
e-lo Mar 20, 2019
419e06d
another path...
e-lo Mar 20, 2019
b94b991
Clarifying documentation on pathfinding
e-lo May 29, 2019
02597df
trying to fix travis
e-lo May 29, 2019
06a73fa
deprecates Python 2
pedrocamargo Jul 3, 2021
fbd693f
formatting
pedrocamargo Jul 3, 2021
313ab49
Updates method calling and syntax for dependencies
pedrocamargo Jul 4, 2021
a356756
Fixes tests to deal with behavior changes in Python and to get around…
pedrocamargo Jul 13, 2021
b7f765a
Merge branch 'master' of github.com:janzill/fast-trips into deprecate…
pedrocamargo Jul 13, 2021
f0d7e4f
Fixes tests to deal with behavior changes in Python and to get around…
pedrocamargo Jul 13, 2021
b3333ad
Merge branch 'fixes_issues' of github.com:janzill/fast-trips into dep…
pedrocamargo Jul 13, 2021
ef0a68d
Merge pull request #1 from janzill/fixes_issues
janzill Jul 13, 2021
a31222f
Reverts added empty lines
pedrocamargo Jul 13, 2021
22dfee5
First stab at automated testing on Windows
pedrocamargo Jul 13, 2021
323e962
Second stab at automated testing on Windows
pedrocamargo Jul 13, 2021
ff0b61c
Merge branch 'master' of github.com:janzill/fast-trips into ci_cd
pedrocamargo Jul 13, 2021
72605fc
Second stab at automated testing on Windows
pedrocamargo Jul 13, 2021
01593f3
first attempt at integrating one to all in current setup
Jul 14, 2021
726924f
remove left overs
Jul 14, 2021
73295e6
follow current member variable naming convention
Jul 14, 2021
08f33d3
don't use python syntax in c++
Jul 14, 2021
4cae100
fixes path cost calculation for egress link, still some debug logging…
Jul 14, 2021
c05607f
adds skim class as copy of passenger because I want the path extracti…
Jul 14, 2021
ce1b073
Second stab at automated testing on Windows
pedrocamargo Jul 14, 2021
954854e
Adds all current Python versions to CI workflows
pedrocamargo Jul 14, 2021
60abd56
Addresses comments
pedrocamargo Jul 14, 2021
475c19e
Merge pull request #2 from janzill/deprecates_python2
janzill Jul 14, 2021
a0d2828
using existing pathset infrastructure for c++ results
Jul 14, 2021
07baee7
trying to extract skimming paths
Jul 15, 2021
6ab02b3
fix skim df columns
Jul 15, 2021
4a4cc5f
generalises code to skim for all tazs that are connected to the pt ne…
Jul 15, 2021
fa3f7ec
make it const
Jul 15, 2021
c94d0c4
removes num_zones
Jul 15, 2021
50f9753
cherry picks test updates so they pass
Jul 15, 2021
ec765f9
removes unused member variable
Jul 15, 2021
e216113
introduces id columns for skimming and assignment such that person-ba…
Jul 16, 2021
06dfff1
removes non-existent column reference for skimming fare calculation
Jul 16, 2021
65f6ec8
refactoring in line with rest of software, adds fares and trip times …
Jul 16, 2021
00e3272
starts work on skim matrix class
Jul 16, 2021
3f0e6e1
comments
Jul 16, 2021
9c8b5b4
clean up
Jul 17, 2021
5bdec4c
Merge pull request #3 from janzill/ci_cd
janzill Jul 17, 2021
1fd3cf3
builder workflow for Linux
pedrocamargo Jul 17, 2021
299690a
Merge branch 'master' of github.com:janzill/fast-trips into build_wor…
pedrocamargo Jul 17, 2021
b0a7831
builder workflow for Windows and keeps wheels available after workflo…
pedrocamargo Jul 17, 2021
00cecfc
Further work on building workflows
pedrocamargo Jul 17, 2021
dc8bcea
Merge pull request #5 from janzill/build_workflows
janzill Jul 17, 2021
046a505
skim creation wip
Jul 17, 2021
5c5d610
Merge remote-tracking branch 'origin/master' into janzill/skimming_wi…
Jul 17, 2021
f5f5f5e
pandas int and object merge value error fix, more skimming work
Jul 17, 2021
390f5be
make none comparison explicit so numpy arrays dont make it throw
Jul 17, 2021
77ab59b
round not square
Jul 17, 2021
f16a480
minimize diffs
Jul 17, 2021
a635bfc
adds fare skim
Jul 17, 2021
cf3f7e1
Ensures testing for all versions of Python
pedrocamargo Jul 17, 2021
8ab244f
Merge pull request #6 from janzill/pedro/ci_fix
janzill Jul 17, 2021
16da30d
Documentation CI
pedrocamargo Jul 18, 2021
269a910
Documentation CI
pedrocamargo Jul 18, 2021
59562ed
Documentation CI
pedrocamargo Jul 18, 2021
518e6e2
Documentation CI
pedrocamargo Jul 18, 2021
0d4c265
Fixes configuration
pedrocamargo Jul 18, 2021
3c4cd7b
builds before computing
pedrocamargo Jul 18, 2021
b256585
builds before computing
pedrocamargo Jul 18, 2021
d266eed
builds before computing
pedrocamargo Jul 18, 2021
aa61903
builds before computing
pedrocamargo Jul 18, 2021
10486e8
doco
pedrocamargo Jul 18, 2021
548fc85
Simplifies requirement files
pedrocamargo Jul 18, 2021
50a9044
Merge branch 'requirement_files' of github.com:janzill/fast-trips int…
pedrocamargo Jul 18, 2021
aa8e439
Simplifies requirement files
pedrocamargo Jul 18, 2021
156d66f
Merge branch 'requirement_files' of github.com:janzill/fast-trips int…
pedrocamargo Jul 18, 2021
b55666b
Adds dynamic reference to current SHA during documentation build
pedrocamargo Jul 18, 2021
d18ea86
Adds dynamic reference to current SHA during documentation build
pedrocamargo Jul 18, 2021
962a576
Formatting of documentation (mostly 120 characters max per line)
pedrocamargo Jul 18, 2021
32c48fc
Merge pull request #8 from janzill/requirement_files
janzill Jul 18, 2021
798f058
doco
pedrocamargo Jul 19, 2021
b9cd194
Merge branch 'master' of github.com:janzill/fast-trips into documenta…
pedrocamargo Jul 19, 2021
27d5483
Set theme jekyll-theme-cayman
janzill Jul 19, 2021
31f2013
doco
pedrocamargo Jul 19, 2021
c7e710a
doco
pedrocamargo Aug 1, 2021
c26805c
doco
pedrocamargo Aug 3, 2021
5539177
Merge pull request #7 from janzill/documentation
pedrocamargo Aug 3, 2021
bffc058
towards time point sampling
Aug 26, 2021
b64b15b
towards time point sampling
Aug 26, 2021
0f8cd25
adds time sampling dimension to path link processing
Aug 26, 2021
cf85625
replaces list by dict
Aug 26, 2021
3f43ace
subclass np.ndarray to avoid overloading simple arithmetic operators
Aug 26, 2021
55b392b
adds omitted return value
Aug 26, 2021
6631319
adds skim averager
Aug 26, 2021
a58c45d
refactor passenger for skimming compatibility
m-richards Aug 27, 2021
caf8539
further passenger refactor
m-richards Aug 27, 2021
b433c2c
implement skimming using the passenger method
m-richards Aug 27, 2021
2b8700e
clean up the df creation duplication
m-richards Aug 27, 2021
cc3d8ea
errors I should have caught beforehand
m-richards Aug 27, 2021
abdcdb5
wip redo the multiprocessing code
m-richards Aug 30, 2021
72508bf
further finish queue class implementation
m-richards Aug 30, 2021
cd0ef7f
cleanup and bugfixes
m-richards Aug 30, 2021
b3f3d93
Merge pull request #9 from janzill/m-richards/skimming_cleanup
janzill Aug 30, 2021
fe7cfaa
cleanup and bug fixes
m-richards Aug 30, 2021
4819925
fix accidentally committing local gitignore
m-richards Aug 30, 2021
4028294
add basic tests for multiprocessing utils
m-richards Aug 31, 2021
ed77313
Update .gitignore
m-richards Aug 31, 2021
7888e1c
fix tests, were in wrong dir
m-richards Aug 31, 2021
b263888
Merge branch 'm-richards/skimming_cleanup_multiprocess' of github.com…
m-richards Aug 31, 2021
e1d44f0
fix tests for python 3.6
m-richards Aug 31, 2021
1f38817
add note on module rationale
m-richards Sep 1, 2021
45974d2
get num processes from config file
m-richards Sep 1, 2021
6ed9a08
add note on integrating serial behaviour
m-richards Sep 1, 2021
03b1922
Merge pull request #10 from janzill/m-richards/skimming_cleanup_multi…
janzill Sep 1, 2021
d6f5cd1
get skimming sampling from config file
m-richards Sep 2, 2021
fbd1ae2
test skimming config
m-richards Sep 2, 2021
d2213d0
switch config reader to use class attributes to be consistent with ot…
m-richards Sep 7, 2021
bb00249
implement true single processed behaviour
m-richards Sep 7, 2021
5ffe527
disable multiprocess tests on GHA, they seem to fail stochastically
m-richards Sep 8, 2021
5faaeb6
fix
m-richards Sep 8, 2021
524cf8a
debugging linux
m-richards Sep 8, 2021
eecf121
more checks
m-richards Sep 8, 2021
5b12cdc
use not multiprocessing queue for single process, cleanup
m-richards Sep 8, 2021
35f0569
start of skimming mode combination validation
m-richards Sep 8, 2021
a13c797
Merge pull request #12 from janzill/m-richards/true_single_process_sk…
janzill Sep 8, 2021
5ab7063
implement validation side of config parsing
m-richards Sep 9, 2021
48e21c3
fix existing tests, further on implementation
m-richards Sep 9, 2021
e1f9c64
add purpose, user class, mode failure tests
m-richards Sep 9, 2021
2769cc2
test for expected skimming config output
m-richards Sep 9, 2021
0dbad7f
skim parsing now sets return values
m-richards Sep 9, 2021
c6b9c37
debug paths on linux
m-richards Sep 9, 2021
e2cbefd
switch to relative path like other tests
m-richards Sep 9, 2021
4071fcc
trying to diagnose why examples are missing
m-richards Sep 9, 2021
78ae0b7
more ci debugging
m-richards Sep 10, 2021
3078850
fix global variables with global variables
m-richards Sep 10, 2021
22808e7
cleanup mess of debuggin
m-richards Sep 10, 2021
e0377d9
implement skim averaging
m-richards Sep 10, 2021
5783f42
implement user classes and purposes
m-richards Sep 10, 2021
ec7f9f6
resolve disconnected path issue
m-richards Sep 10, 2021
0229ff5
fix missing rows in skims caused by disconnected access / egress modes
m-richards Sep 10, 2021
67db315
refactor skim calculation into a single method
m-richards Sep 10, 2021
c8306e9
Merge pull request #11 from janzill/m-richards/skimming_config
janzill Sep 20, 2021
ad0f0c9
Merge pull request #13 from janzill/m-richards/skim_averaging
janzill Sep 20, 2021
40286d9
BUG: fix tuple unpacking, not sure how this worked before
m-richards Sep 21, 2021
8fc9d6e
pull up num zones and zone numbers to class level
Oct 18, 2021
42c38fd
skeleton for adding skimming at the end of assignment
Oct 28, 2021
ccec2bb
no early departures for skimming
Oct 28, 2021
8dbf679
read assignment configs for skimming child processes also
Oct 28, 2021
9fddc64
work on integrating passenger.cost method into skimming
Oct 31, 2021
71d4eab
more passenger.cost integration work
Nov 1, 2021
07b6f27
work on skimming trip_list for passenger.cost calcs
Nov 1, 2021
292f7d1
work on skimming trip_list for passenger.cost calcs
Nov 1, 2021
7eb92cb
named tuple usage
Nov 1, 2021
8d2de85
work on skimming trip_list for passenger.cost calcs
Nov 1, 2021
8fa2386
path cost calculations for skimming
Nov 1, 2021
e181f14
adds destination to skimming id columns
Nov 1, 2021
b5c7f28
corrects early exit mistake in path set for all destinations
Nov 1, 2021
64a4417
use gen cost for path calculations, not time like deterministic assig…
Nov 1, 2021
de69790
Revert "use gen cost for path calculations, not time like determinist…
Nov 1, 2021
2890ef7
fixes skimming pathlink order bug, and therefore fare calcs
Nov 1, 2021
609228b
Cleans workflows
pedrocamargo Nov 9, 2021
2bafd94
more components
Nov 10, 2021
d888c51
return component skims
Nov 10, 2021
2feb7d8
use seconds for skims, use correct pathset mode names
Nov 10, 2021
97084c6
better default values
Nov 10, 2021
0d28e09
adds gen cost to components
Nov 10, 2021
91de0c9
adds skim writer
Nov 10, 2021
4ceefe7
more saving skims, a bit of assignment integration work
Nov 10, 2021
6ec8b16
fix aggregation
Nov 11, 2021
c9280f4
towards writing skims, numpy reduction op not working so not dumping …
Nov 11, 2021
0a2aa84
implements skim time slice aggregation without numpy 3d array conversion
Nov 11, 2021
1ba79da
saves attributes in skim file
Nov 12, 2021
684d18e
uses existing create_skims attribute in Assignment, start of doco
Nov 12, 2021
1f9da91
doco
Nov 12, 2021
a860d7e
more doco
Nov 12, 2021
96d688f
output file doco
Nov 12, 2021
4ea7745
doco update
Nov 12, 2021
e0a87da
merge origin/master
Nov 12, 2021
119168c
removes python3.9 from github workflows because omx uses pytables, wh…
Nov 12, 2021
43de763
doc updates
Nov 12, 2021
43cdee2
doco indentation
Nov 12, 2021
314f828
doco of skim components
Nov 12, 2021
a824ffb
fixes skimming config test
Nov 12, 2021
bebcfcd
doco update
Nov 12, 2021
7dd89b2
removes circular assignment of child thread assignment attributes
Nov 12, 2021
b228b9a
removes duplicate line
Nov 13, 2021
d099337
doco update
Nov 13, 2021
070b251
towards several skim time periods and better config handling
Nov 13, 2021
8e90197
more options parsing
Nov 13, 2021
c3c67ed
option validation in SkimCOnfig
Nov 13, 2021
230dfe7
skim config things
Nov 13, 2021
f62fb33
new skim config object
Nov 13, 2021
3fc93f8
bringin skim config all the way through
Nov 13, 2021
d09e1c7
string parsing omg
Nov 13, 2021
a27d382
doco update
Nov 13, 2021
168e37d
doco update
Nov 13, 2021
5ae487f
more doco
Nov 13, 2021
d69fd05
try hyperlink fixes
Nov 13, 2021
ce91544
doco update, test culling
Nov 13, 2021
8e067df
tests need replacing, comment for now
Nov 13, 2021
ea51e24
cross refs
Nov 13, 2021
ec1972a
cross refs
Nov 13, 2021
52a94ac
more cross refs
Nov 13, 2021
6c657f2
fixes bugs in assignment for simulation=False
Nov 13, 2021
186cb3c
cleaning, warn when path finding time window smaller than sampling in…
Nov 14, 2021
db5f2ec
fixes datetime comparison bug
Nov 14, 2021
943d4a4
adds skimming example configs
Nov 14, 2021
1cadb1e
add skimming to springfield example
Nov 14, 2021
886c58c
adds skimming example
Nov 14, 2021
c33f2db
example readme
Nov 14, 2021
e0ca0c8
example in separate script
Nov 14, 2021
ead2ec8
readme update to reflect example with skimming path weights
Nov 14, 2021
8b2e5b5
tidy up
Nov 14, 2021
0b9349c
table fix
Nov 15, 2021
4efdc8f
adds type checking for skimconfig ints
Nov 15, 2021
548cf63
vot is float or int
Nov 15, 2021
533ffae
skim config tests
Nov 15, 2021
9eecf89
adds post assignment test
Nov 15, 2021
d92c889
adds skimming tests
Nov 15, 2021
ccaa677
adds skim matrix tests
Nov 15, 2021
1e963f2
doc strings and clean up
Nov 15, 2021
d6d4190
random subdirs for tests
Nov 15, 2021
0c9dc38
failures on CI, sigh
Nov 15, 2021
e5f1048
disable fasttrips run because of problems with ci. ci why
Nov 15, 2021
c824a55
make skim config field errors consistent
Nov 16, 2021
7023be3
make column name checks explicit for skim_classes
Nov 16, 2021
ab1c344
update example script ot python3
Nov 16, 2021
9fb13e6
ci test
Nov 16, 2021
8e76309
ci test
Nov 16, 2021
a793d89
try setting pathweights, global variables seem to have been interfere…
Nov 16, 2021
88ecab7
tests again
Nov 16, 2021
ca408ce
desperate attempt at solving global variable issues
Nov 16, 2021
c0d76bb
try another way omg
Nov 16, 2021
f374502
rename tests
Nov 16, 2021
914e730
fixes filename for skimming example
Nov 16, 2021
8b59222
newline fix
Nov 16, 2021
270d9fc
don't set globals from each process
Nov 17, 2021
859595f
separate tests into two
Nov 17, 2021
ee041e6
not not no
Nov 17, 2021
0d92cb6
pandas>=1.2 for cross merge
Nov 17, 2021
86bf8a8
deprecate p36 and add linux 39, win/mac not possible yet w/o tables f…
Nov 17, 2021
23756bc
no malloc
Nov 17, 2021
8d9ea88
throws on empty pathfinding return
Nov 17, 2021
58beb62
clean up, logging, reset pathfinder
Nov 17, 2021
dd963f1
separate tests on ci
Nov 17, 2021
b49d0ac
update doc to reflect changed python versions
Nov 17, 2021
b77d6d4
clear destination in c++ code when clearing all state; removes code d…
Nov 17, 2021
cb7fbe9
combine tests now that all state in c++ is cleared and running in sam…
Nov 17, 2021
120f5e7
Merge pull request #4 from janzill/janzill/skimming_with_current_setup
janzill Nov 17, 2021
d0180e1
Merge pull request #14 from janzill/wflows
janzill Nov 17, 2021
caf9e78
readme update
Nov 17, 2021
91d88d0
missing excl mark [skip ci]
Nov 17, 2021
a0f8284
Merge pull request #15 from janzill/janzill/readme
janzill Nov 17, 2021
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
48 changes: 48 additions & 0 deletions .github/workflows/build_linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Build and upload Linux Python Package

on: [pull_request, release]

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install packages
run: |
python -m pip install setuptools --upgrade
python -m pip install pytest wheel
python -m pip install -r requirements.txt
python -m pip install -r requirements_dev.txt
python -m pip install --upgrade cffi twine

- name: Build manylinux Python wheels
uses: RalfG/python-wheels-manylinux-build@v0.3.3-manylinux2014_x86_64
with:
python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39'
build-requirements: 'setuptools numpy pandas partridge psutil future configparser openmatrix'
pip-wheel-args: '--no-deps'

- name: Moves wheels
run: |
mkdir -p dist
cp -v ./*-manylinux*.whl dist/

- name: Keep wheels on GitHub
# if: ${{ github.event_name == 'push'}}
uses: actions/upload-artifact@v2
with:
name: library
path: dist/*.whl
if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
#
# - name: Publish wheels to PyPI
# if: ${{ github.event_name == 'release'}}
# env:
# TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
# TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
# run: |
# twine upload dist/*-manylinux*.whl
50 changes: 50 additions & 0 deletions .github/workflows/build_mac.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Build and upload MacOS Python Package

on: [pull_request, release]

jobs:
deploy:
runs-on: macos-latest
strategy:
matrix:
python-version: ['3.7', '3.8']
steps:
- uses: actions/checkout@v2
- name: Set Python environment
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
architecture: x64
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
pip install -r requirements_dev.txt
pip install setuptools wheel twine

- name: Build
run: |
python setup.py sdist bdist_wheel

- name: Keep wheels on GitHub
# if: ${{ github.event_name == 'push'}}
uses: actions/upload-artifact@v2
with:
name: library
path: dist/*.whl
if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`

- name: Publish
if: ${{ github.event_name == 'release'}}
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
twine upload dist/*.whl

- name: Publish tar files
if: ${{ github.event_name == 'release' && matrix.python-version == '3.8'}}
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: twine upload dist/*.gz
49 changes: 49 additions & 0 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Build and upload Windows Python Package

on: [pull_request, release]

jobs:
deploy:
runs-on: windows-latest
strategy:
matrix:
python-version: ['3.7', '3.8']
architecture: ['x64']
steps:
- uses: actions/checkout@v2
- name: Set Python environment
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
architecture: ${{ matrix.architecture }}

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine
pip install -r requirements.txt
pip install -r requirements_dev.txt
pip install pytest

- name: Compile library
run: |
pip install -e .

- name: Build
run: python setup.py sdist bdist_wheel


- name: Keep wheels on GitHub
# if: ${{ github.event_name == 'push'}}
uses: actions/upload-artifact@v2
with:
name: library
path: dist/*.whl
if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`

- name: Publish
if: ${{ github.event_name == 'release'}}
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: twine upload dist/*.whl
49 changes: 49 additions & 0 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Documentation

on: [pull_request, release]

jobs:
build:
runs-on: ubuntu-latest
strategy:
max-parallel: 1
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.8
uses: actions/setup-python@v1
with:
python-version: 3.8
- name: Install dependencies
run: |
sudo apt-get install doxygen
python -m pip install setuptools --upgrade
python -m pip install pytest wheel
python -m pip install -r requirements.txt
python -m pip install -r requirements_dev.txt
python -m pip install --upgrade cffi twine

- name: Compile library
run: |
pip install -e .

- name: Builds documentation
run: |
cd doc
doxygen doxygen.conf
ls
sphinx-build -b html source build

- name: Keeps documentation on GitHub
uses: actions/upload-artifact@v2
with:
name: documentation
path: doc/build/
if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`

# YOU CAN UNCOMMENT THE SECTION BELOW TO DEPLOY THE DOCUMENTATION TO THE PAGES BRANCH
# - name: Deploy 🚀
## if: ${{ github.event_name == 'release'}}
# uses: JamesIves/github-pages-deploy-action@4.1.4
# with:
# branch: gh-pages # The branch the action should deploy to.
# folder: doc/build # The folder the action should deploy.
42 changes: 42 additions & 0 deletions .github/workflows/test_linux_with_coverage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Test Linux

on: [pull_request]
# pull_request:
# types: [ready_for_review, merge]

jobs:
testing:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.7', '3.8', '3.9']
steps:
- uses: actions/checkout@v2
- name: Set Python environment
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
pip3 install setuptools --upgrade
pip3 install pytest wheel
pip3 install -r requirements.txt
pip3 install -r requirements_dev.txt
- name: Compile library
run: |
pip install -e .
- name: Runs tests
run: |
py.test
# - name: Generate coverage report
# run: |
# python3 -m pytest --cov=./ --cov-report=xml
# - name: Upload coverage to Codecov
# uses: codecov/codecov-action@v1
# with:
# token: ${{ secrets.CODECOV_TOKEN }}
# file: ./coverage.xml
# flags: unittests
# name: codecov-umbrella
# yml: ./codecov.yml
# fail_ci_if_error: true
55 changes: 55 additions & 0 deletions .github/workflows/test_windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Tests on Windows

on: [pull_request]

jobs:
# linting:
# runs-on: windows-latest
# steps:
# - uses: actions/checkout@v2
# - name: Set Python environment
# uses: actions/setup-python@v1
# with:
# python-version: 3.7
# architecture: x64
#
# - name: Install dependencies
# run: |
# python -m pip install --upgrade pip
# pip install setuptools wheel
# pip install -r requirements.txt
# pip install flake8
#
# - name: Lint with flake8
# run: |
# pip install
# flake8
testing:
# needs: linting
runs-on: windows-latest
strategy:
matrix:
python-version: ['3.7', '3.8']
architecture: ['x64']
max-parallel: 20
steps:
- uses: actions/checkout@v2
- name: Set Python environment
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
architecture: ${{ matrix.architecture }}

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel
pip install -r requirements.txt
pip install -r requirements_dev.txt
pip install pytest


- name: Compile library and run tests
run: |
pip install -e .
py.test
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@ install:
- sudo apt-get update
- pip install -r requirements.txt
- pip install .
- pip install sphinx numpydoc sphinx_rtd_theme breathe;
- sudo apt-get install doxygen
- if [ "$TRAVIS_BRANCH" == "master" ] && [ $TRAVIS_PYTHON_VERSION == 2.6 ];
then pip install sphinx numpydoc sphinx_rtd_theme breathe;
fi
- if [ "$TRAVIS_BRANCH" == "master" ] && [ $TRAVIS_PYTHON_VERSION == 2.6 ];
then sudo apt-get install doxygen;
fi

script:
- if [ "$TRAVIS_BRANCH" == "master" ] | [ "$TRAVIS_BRANCH" == "develop" ];
Expand All @@ -18,7 +22,7 @@ script:
fi

after_success:
- if [ "$TRAVIS_BRANCH" == "master" ] | [ "$TRAVIS_BRANCH" == "develop" ];
- if [ "$TRAVIS_BRANCH" == "master" ] && [ $TRAVIS_PYTHON_VERSION == 2.6 ];
then sh bin/travis-update-documentation.sh;
fi

Expand Down
20 changes: 20 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
## Changelog

# 1.0b2

* Reduce copies of data to downsize memory needs
* Updates tests
* Adds a learning variable for iterations to remove jumpiness
* Exit labeling loop if find a negative cost
* Re-implements Utility scaling for labeling to avoid negative costs
* Python 3 compliant and backward compatible to 2.6 using future
* Add compiler flags and adjust some code so that it works with modern CPP
* Update TRAVIS and add auto creation and deployment of documentation at end of successful tests
* Move majority of documentation to sphinx-based github site

# 1.0b1

* Test scenarios: new scenarios, re-organization, and notebooks to view
* Flexible preferred departure and arrival times with
* Ability to add functional forms to variables
* Add updateStopStatesForTrips

# Alpha
Major changes to fast-trips since the original FAST-TrIPs (https://github.com/MetropolitanTransportationCommission/FAST-TrIPs-1)

To be filled in further but including:
Expand Down
Loading