Skip to content

Commit 0d1d1a0

Browse files
AshishKulsAshishKuls
authored
Merge pull request #135 from BayAreaMetro/acceptance-criteria-integration
Transit Improvements and Acceptance Criteria Summaries
2 parents c0f9467 + aa5303f commit 0d1d1a0

File tree

61 files changed

+1396531
-1013
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1396531
-1013
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
---
2-
name: Bug report
2+
name: 🐛 Bug report
33
about: Create a report to help us improve
4-
title: "[BUG] Description of problem"
4+
title: "🐛 Bug: "
55
labels: bug
66
assignees: ''
7-
87
---
98

109
## Describe the bug
11-
12-
A clear and concise description of what the bug is or the error code you got. e.g.
13-
14-
```python
10+
<!--A clear and concise description of what the bug is or the error code you got. e.g.
11+
```python
1512
KeyError: 'Passing list-likes to .loc or [] with any missing labels is no longer supported, see https://pandas.pydata.org/pandas-docs/stable/user_guide/indexing.html#deprecate-loc-reindex-listlike'
1613
```
14+
-->
15+
16+
Progress:
17+
18+
- [ ] Sufficient information provided
19+
- [ ] Cause identified/found
20+
- [ ] Test developed/identified
21+
- [ ] Approach determined
22+
- [ ] Test passes
1723

1824
## To Reproduce
1925

@@ -27,7 +33,7 @@ Steps to reproduce the behavior:
2733
### Failing tests
2834

2935
- [ ] No applicable test failed, need to create.
30-
- [ ]
36+
- [ ] other...specify
3137

3238
### Triggering line of code
3339

‎.github/ISSUE_TEMPLATE/chore_issue.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
name: 🧹 Chore
3+
about: Something that isn't a feature or a bug
4+
title: "🧹 Chore: "
5+
labels: chore
6+
assignees: ''
7+
---
8+
9+
<!--Short Description-->
10+
11+
Progress:
12+
13+
- [ ] Sufficiently defined
14+
- [ ] Approach decided
15+
- [ ] Implemented
16+
17+
## Considerations
18+
<!--Short Description-->

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,43 @@
11
---
2-
name: Feature request
3-
about: Suggest an idea for this project
4-
title: "[FEATURE]"
2+
name: 🚀 Feature request
3+
about: Suggest an enhancement
4+
title: "🚀 Feature:"
55
labels: enhancement
66
assignees: ''
7-
87
---
9-
108
### User Story
119

1210
*As a ...insert type of user... I'd like to ...insert desired feature or behavior...*
1311

14-
### Priority
12+
Progress:
13+
14+
- [ ] Sufficiently defined
15+
- [ ] Approach determined
16+
- [ ] Tests developed
17+
- [ ] User story satisfied
18+
- [ ] Doc strings
19+
- [ ] General documentation
20+
- [ ] Passing tests
21+
22+
### Priority
1523

1624
### Level of Effort
1725

1826
### Resolution Ideas
1927

2028
### Project
21-
22-
*Is there a funder or project associated with this feature?*
29+
<!--Is there a funder or project associated with this feature?-->
2330

2431
### Who should be involved?
25-
26-
Implementer:
27-
Commenters:
28-
Users:
29-
Reviewers:
32+
Users:
33+
Reviewers:
3034

3135
### Risk
32-
33-
*Will this potentially break anything?*
36+
<!--Will this potentially break anything?-->
3437

3538
#### Tests
39+
<!--What are relevant tests or what tests need to be created in order to determine that this issue is complete?-->
40+
41+
- [ ] Test for...
42+
3643

37-
*What are relevant tests or what tests need to be created in order to determine that this issue is complete?*

‎.github/workflows/docs.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Publish docs
2+
on:
3+
workflow_dispatch:
4+
push:
5+
branches:
6+
- develop
7+
8+
jobs:
9+
mkdocs:
10+
name: Publish docs
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v2
15+
16+
- name: Deploy docs
17+
uses: mhausenblas/mkdocs-deploy-gh-pages@master
18+
env:
19+
REQUIREMENTS: docs/requirements.txt
20+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/publish.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# This workflow will upload a Python Package using Twine when a release is created
2+
# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
3+
4+
name: Upload Python Package
5+
6+
on:
7+
release:
8+
types: [created]
9+
10+
jobs:
11+
12+
deploy:
13+
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- uses: actions/checkout@v2
18+
- name: Set up Python
19+
uses: actions/setup-python@v2
20+
with:
21+
python-version: '3.7'
22+
- name: Install dependencies
23+
run: |
24+
python -m pip install --upgrade pip
25+
pip install setuptools wheel twine
26+
- name: Build and publish
27+
env:
28+
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
29+
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
30+
run: |
31+
python setup.py sdist bdist_wheel
32+
twine upload dist/*

‎.github/workflows/push.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ jobs:
66
build:
77

88
runs-on: ubuntu-latest
9+
if: "!contains(github.event.head_commit.message, 'skip ci')"
910
strategy:
1011
matrix:
1112
python-version: [3.8]
@@ -41,10 +42,10 @@ jobs:
4142
- name: Test with pytest
4243
run: |
4344
pytest -s -m "not skipci"
44-
- name: Configure Git user
45-
run: |
46-
git config --local user.email "github-actions[bot]@users.noreply.github.com"
47-
git config --local user.name "github-actions[bot]"
48-
- name: Build docs
49-
run: |
50-
mike deploy --push --rebase ${{ github.ref_name }}
45+
- name: Test documentation build
46+
uses: Tiryoh/actions-mkdocs@v0
47+
with:
48+
mkdocs_version: 'latest'
49+
requirements: 'docs/requirements.txt'
50+
configfile: 'mkdocs.yml'
51+

‎.github/workflows/release_plan.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Release Planning Milestone
2+
3+
on:
4+
milestone:
5+
types:
6+
- created
7+
8+
jobs:
9+
create_issue:
10+
name: Create Full Test with Emme Issue
11+
runs-on: ubuntu-latest
12+
permissions:
13+
issues: write
14+
env:
15+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
16+
MILESTONE: ${{ github.event.milestone.number }}
17+
steps:
18+
- name: Create Full Test with Emme Issue
19+
uses: imjohnbo/issue-bot@3daae12aa54d38685d7ff8459fc8a2aee8cea98b
20+
with:
21+
assignees: "flaviatsang"
22+
labels: "test-run"
23+
title: "Run Full Emme Tests for $MILESTONE"
24+
body: |
25+
### Checklist
26+
27+
- [ ] Run full tests with Emme environment installed
28+
- [ ] Generate bug issues for any failing tests
29+
- [ ] Update any relevant EmmeMock output
30+
milestone: $MILESTONE
31+
pinned: false
32+
close-previous: false
33+

‎.gitignore

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dist/
1818
downloads/
1919
eggs/
2020
.eggs/
21-
lib/
21+
#lib/
2222
lib64/
2323
parts/
2424
sdist/
@@ -63,6 +63,7 @@ scratch/*
6363
*.bak
6464
.cache
6565
.hubstorinfo
66+
examples/temp_acceptance/*
6667

6768
# Unit test / coverage reports
6869
htmlcov/
@@ -85,6 +86,9 @@ coverage.xml
8586
# mkdocs documentation
8687
site/*
8788

89+
# mkdocs documentation
90+
site/*
91+
8892
# Jupyter
8993
.ipynb_checkpoints
9094
profile_default/
@@ -128,4 +132,17 @@ dmypy.json
128132

129133
# Pyre type checker
130134
.pyre/
131-
*.log
135+
136+
# Acceptance Criteria temps
137+
examples/temp_acceptance/boardings_by_line_am.csv
138+
notebooks/acceptance-transit-network.geojson
139+
notebooks/boardings_by_segment_am.geojson
140+
notebooks/tl_2010_06_bg10.*
141+
notebooks/*.twbx
142+
143+
# Interim data
144+
data/interim/*
145+
146+
# R Scripts
147+
scripts/.Rproj.user/*
148+
scripts/.Rhistory

‎README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,13 @@ In troubleshooting, sometimes DLL load failure errors would occur which may be r
5858

5959
At load time, the EMME API will always load the geos_c co-located with the EMME API, unless it was already loaded from some other location, which is the case when you import GDAL first. EMME API seems to be compatible with the newer GDAL/geos_c (reminder: not tested!). But this does not appear to be the case the other way around (newer GDAL is not compatible with older geos_c).
6060

61+
Copy and unzip [example_union_test_highway.zip](https://mtcdrive.box.com/s/3entr016e9teq2wt46x1os3fjqylfoge) to a local
62+
drive and from within that directory run:
63+
64+
```sh
65+
get_test_data <location>
66+
tm2py -s scenario.toml -m model.toml
67+
```
6168

6269
See [starting out](http://bayareametro.github.com/tm2py) section of documentation for more details.
6370

‎bin/get_test_data.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ECHO "Retreiving %TEST_DATA_NAME% data from %TEST_DATA_LOCATION%
1111

1212
SET OUTDIR=%1
1313
if "%OUTDIR%"=="" SET OUTDIR=DEFAULT_DIRECTORY
14-
if not exist %OUTDIR% mkdir %OUTDIR%
14+
if not exist %OUTDIR% mkdir %OUTDIR%
1515
CD %OUTDIR%
1616
ECHO "Writing to %CD%"
1717

0 commit comments

Comments
 (0)