Merge branch 'main' of https://github.com/TransLinkForecasting/activi…

…tysim

.github/workflows/branch-docs.yml

@@ -1,13 +1,15 @@
 name: ActivitySim Branch Docs
 # This workflow is provided as a service for forks to build branch-specific documentation.
 
-on: push
+on:
+  - push
+  - workflow_dispatch
 
 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
+    name: ubuntu-latest py3.10
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -16,36 +18,49 @@ jobs:
       - 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
+
+      - name: Setup Mambaforge
         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
+          python-version: "3.10"
           activate-environment: docbuild
           auto-activate-base: false
           auto-update-conda: false
+
+      - name: Set cache date for year and month
+        run: echo "DATE=$(date +'%Y%m')" >> $GITHUB_ENV
+
+      - uses: actions/cache@v3
+        with:
+          path: /usr/share/miniconda3/envs/docbuild
+          key: linux-64-conda-${{ hashFiles('conda-environments/docbuild.yml') }}-${{ env.DATE }}-${{ env.CACHE_NUMBER }}
+        id: cache
+
+      - name: Update environment
+        run: mamba env update --verbose -n docbuild -f conda-environments/docbuild.yml
+        if: steps.cache.outputs.cache-hit != 'true'
+
       - 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/workflows/config-testpypi-version.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import argparse
 import copy
 import pathlib
@@ -44,7 +46,7 @@ def update(mapping, path, value, 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"
+# requires[0] = "setuptools>=42,<60"
 
 new_content = tomli_w.dumps(with_setuptools_pin)
 args.path.write_text(new_content)