Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Infrastructure changes #592

Merged
merged 68 commits into from
Sep 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
6d887b7
Added mwcog small area
AndrewTheTM Aug 15, 2022
4d6287d
missed one edit
AndrewTheTM Aug 15, 2022
e1fe792
reformatting
AndrewTheTM Aug 16, 2022
788a2db
Update README.MD
AndrewTheTM Aug 16, 2022
af8e1b9
call as module
jpn-- Aug 16, 2022
6226a56
github actions tests
jpn-- Aug 16, 2022
d16b5fb
pre commit hooks
jpn-- Aug 16, 2022
800989a
pyproject toml
jpn-- Aug 16, 2022
c05204e
limit numpy
jpn-- Aug 16, 2022
3d08096
docs for mamba instead of conda
jpn-- Aug 16, 2022
f72ce38
ignore generated files
jpn-- Aug 16, 2022
098ed44
add nbmake to test env
jpn-- Aug 16, 2022
1fb852a
fix dupe line
jpn-- Aug 16, 2022
8c8cba4
repair test multiple zones for github actions
jpn-- Aug 17, 2022
0cc4439
publish develop docs
jpn-- Aug 17, 2022
03dc574
fix docbuild env
jpn-- Aug 17, 2022
38cfde8
Update .travis.yml
AndrewTheTM Aug 18, 2022
175219f
fixed testing files
AndrewTheTM Aug 18, 2022
997669b
Merge branch 'develop' of https://github.com/AndrewTheTM/activitysim …
AndrewTheTM Aug 18, 2022
3db9db5
fixed testing files (again)
AndrewTheTM Aug 18, 2022
493dc9a
fixed test script again
AndrewTheTM Aug 18, 2022
f325e99
publish docs to branch name
jpn-- Aug 19, 2022
093ead1
updated testing scripts (note shorter travis script for now)
AndrewTheTM Aug 22, 2022
2bfdea2
fixed slash (windows vs. linux testing issue)
AndrewTheTM Aug 22, 2022
8b4f081
added output folders
AndrewTheTM Aug 22, 2022
fb74cd0
updated travis script to run all tests, should pass
AndrewTheTM Aug 22, 2022
b785d67
docs cleaning
jpn-- Aug 23, 2022
b3af10e
docs re-style
jpn-- Aug 23, 2022
69de8d2
rebuild
jpn-- Aug 23, 2022
a0188a2
dynamic versioning docs
jpn-- Aug 23, 2022
8159f17
version switcher
jpn-- Aug 23, 2022
f2e8e9b
blacken
jpn-- Aug 23, 2022
3e254ff
fix switcher url
jpn-- Aug 23, 2022
30455f2
fix conf
jpn-- Aug 23, 2022
91beb97
switcher update
jpn-- Aug 23, 2022
1cba29e
master to main
jpn-- Aug 23, 2022
82efce4
deployment actions
jpn-- Aug 23, 2022
04feee0
actions
jpn-- Aug 23, 2022
62b1fb7
Merge pull request #586 from camsys/infrastructure
jpn-- Aug 23, 2022
d311432
build wheel
jpn-- Aug 23, 2022
e7d34a1
Merge pull request #588 from camsys/infrastructure
jpn-- Aug 23, 2022
73378a8
fix for testpypi
jpn-- Aug 24, 2022
f979a84
blacken
jpn-- Aug 24, 2022
8d419f3
manual switcher
jpn-- Aug 24, 2022
569d563
branch docs service [makedocs]
jpn-- Aug 24, 2022
6d20cef
syntax [makedocs]
jpn-- Aug 24, 2022
b61f78b
travis depends
jpn-- Aug 24, 2022
05940d5
checkout v3, fix versioning in docs
jpn-- Aug 24, 2022
c6b9c9f
only build develop docs once
jpn-- Aug 24, 2022
822e177
failsafe version
jpn-- Aug 24, 2022
9a782f8
documentation repairs
jpn-- Aug 24, 2022
8b7737c
python-simplified-semver
jpn-- Aug 24, 2022
6bb1d53
front cards
jpn-- Aug 24, 2022
4944aef
end testing w travis
jpn-- Aug 25, 2022
dbae2f3
merge to latest
jpn-- Aug 25, 2022
df70b6c
add mwcog test to gh-actions
jpn-- Aug 25, 2022
4cbeccb
add mwcog to docs
jpn-- Aug 25, 2022
8fb416d
point to data not copy it
jpn-- Aug 29, 2022
35586ff
sort dependencies
jpn-- Aug 29, 2022
5fd488f
req sh 2.2.4
jpn-- Aug 29, 2022
f51c609
account for variance across platforms in trip dest est
jpn-- Aug 29, 2022
236072e
copy bike skims for sandag test
jpn-- Aug 29, 2022
45b1709
Merge pull request #1 from camsys/develop-mwcog
AndrewTheTM Aug 30, 2022
96bf698
Merge pull request #585 from AndrewTheTM/develop
jpn-- Aug 30, 2022
156c771
param on rtol
jpn-- Aug 31, 2022
7455375
fix sandag_2 test files
jpn-- Sep 1, 2022
f14c078
fix test file names
jpn-- Sep 1, 2022
7ead422
Merge pull request #594 from camsys/develop
jpn-- Sep 2, 2022
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
55 changes: 55 additions & 0 deletions .github/workflows/branch-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: ActivitySim Branch Docs
# This workflow is provided as a service for forks to build branch-specific documentation.

on: push

jobs:
docbuild:
if: "contains(github.event.head_commit.message, '[makedocs]') && (github.repository_owner != 'ActivitySim') && (github.ref_name != 'develop')"
# develop branch docs are built at the end of the core test workflow, regardless of repository owner or commit message flags
name: ubuntu-latest py3.9
runs-on: ubuntu-latest
defaults:
run:
shell: bash -l {0}
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # get all tags, lets setuptools_scm do its thing
- name: Set up Python 3.9
uses: actions/setup-python@v2
with:
python-version: 3.9
- name: Install dependencies
uses: conda-incubator/setup-miniconda@v2
with:
miniforge-variant: Mambaforge
miniforge-version: latest
use-mamba: true
environment-file: conda-environments/docbuild.yml
python-version: 3.9
activate-environment: docbuild
auto-activate-base: false
auto-update-conda: false
- name: Install activitysim
run: |
python -m pip install .
- name: Conda checkup
run: |
conda info -a
conda list
echo REPOSITORY ${{ github.repository }}
echo REF ${{ github.ref }}
echo REF_NAME ${{ github.ref_name }}
- name: Build the docs
run: |
cd docs
make clean
make html
- name: Push to GitHub Pages
uses: peaceiris/actions-gh-pages@v3.8.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
# Token is created automatically by Github Actions, no other config needed
publish_dir: ./docs/_build/html
destination_dir: ${{ github.ref_name }}
50 changes: 50 additions & 0 deletions .github/workflows/config-testpypi-version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import argparse
import copy
import pathlib

import tomli
import tomli_w


def split_path(path, sep="/"):
if isinstance(path, str):
return [part for part in path.split(sep) if part]
else:
return path


def extract(mapping, path, sep="/"):
parts = split_path(path, sep=sep)
cur = mapping
for part in parts:
cur = cur[part]

return cur


def update(mapping, path, value, sep="/"):
new = copy.deepcopy(mapping)

parts = split_path(path, sep=sep)
parent = extract(new, parts[:-1])
parent[parts[-1]] = value

return new


parser = argparse.ArgumentParser()
parser.add_argument("path", type=pathlib.Path)
args = parser.parse_args()

content = args.path.read_text()
decoded = tomli.loads(content)
with_local_scheme = update(
decoded, "tool.setuptools_scm.local_scheme", "no-local-version", sep="."
)
# work around a bug in setuptools / setuptools-scm
with_setuptools_pin = copy.deepcopy(with_local_scheme)
requires = extract(with_setuptools_pin, "build-system.requires", sep=".")
requires[0] = "setuptools>=42,<60"

new_content = tomli_w.dumps(with_setuptools_pin)
args.path.write_text(new_content)
Loading