update

Signed-off-by: Jess Frazelle <github@jessfraz.com>

.github/workflows/build-test.yml

@@ -24,7 +24,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 

.github/workflows/generate-docs.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: 3.x
 

.github/workflows/generate.yml

@@ -7,6 +7,7 @@ on:
       - 'Makefile'
       - .github/workflows/generate.yml
       - 'spec.json'
+      - 'generate/generate.py'
   workflow_dispatch:
     inputs:
 jobs:
@@ -34,5 +35,6 @@ jobs:
           git config --local user.name "github-actions[bot]"
           git remote set-url origin https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
           git fetch origin
+          git add .
           git commit -am "I have generated the latest API!" || true
           git push origin ${{github.event.pull_request.head.ref }} || true

.github/workflows/make-release.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: '3.x'
       # Installation instructions are from: https://python-poetry.org/docs/

.github/workflows/update-spec-for-docs.yml

@@ -16,9 +16,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v2
-        with:
-          go-version: '1.x'
       - name: make generate
         shell: bash
         run: |
@@ -27,7 +24,7 @@ jobs:
       - name: Ensure no files changed
         shell: bash
         run: |
-          if [[ `git status --porcelain` ]]; then
+          if [[ `git status --porcelain kittycad/` ]]; then
             echo "Files changed, exiting";
             exit 1;
           else
@@ -37,14 +34,14 @@ jobs:
       # Checkout the docs repo since we will want to update the files there.
       - uses: actions/checkout@v3
         with:
-          repository: 'kittycad/docs'
+          repository: 'kittycad/website'
           path: 'docs'
           token: ${{secrets.PAT_GITHUB}}
       - name: move spec to docs
         shell: bash
         run: |
-          rm docs/spec.json || true
+          rm docs/kittycad.py.patch.json || true
-          cp spec.json docs/spec.json
+          cp kittycad.py.patch.json docs/kittycad.py.patch.json
       - name: commit the changes in the docs repo
         shell: bash
         run: |
@@ -56,7 +53,7 @@ jobs:
           git commit -am "YOYO NEW SPEC DOCS ${VERSION}!" || exit 0
           git fetch origin
           git rebase origin/main || exit 0
-          export NEW_BRANCH="update-spec-${VERSION}"
+          export NEW_BRANCH="update-spec-python"
           git checkout -b "$NEW_BRANCH"
           git push -f origin "$NEW_BRANCH"
           gh pr create --title "Update lang spec docs for ${VERSION}" \

.gitignore

@@ -23,3 +23,4 @@ dmypy.json
 /.coverage
 
 poetry.lock
+testing

Makefile

@@ -13,14 +13,17 @@ VERSION := $(shell toml get $(CURDIR)/pyproject.toml tool.poetry.version | jq -r
 generate: docker-image ## Generate the api client.
 	docker run --rm -i $(DOCKER_FLAGS) \
 		--name python-generator \
+		--disable-content-trust \
 		-v $(CURDIR):/usr/src \
 		--workdir /usr/src \
-		$(DOCKER_IMAGE_NAME) sh -c 'poetry run python generate/generate.py && poetry run autopep8 --in-place --aggressive --aggressive kittycad/models/*.py && poetry run autopep8 --in-place --aggressive --aggressive kittycad/api/*.py && poetry run autopep8 --in-place --aggressive --aggressive kittycad/*.py && poetry run autopep8 --in-place --aggressive --aggressive generate/*.py'
+		$(DOCKER_IMAGE_NAME) ./generate/run.sh
 
 .PHONY: shell
 shell: docker-image ## Pop into a shell in the docker image.
 	docker run --rm -i $(DOCKER_FLAGS) \
 		--name python-generator-shell \
+		-e KITTYCAD_API_TOKEN \
+		--disable-content-trust \
 		-v $(CURDIR):/usr/src \
 		--workdir /usr/src \
 		$(DOCKER_IMAGE_NAME) /bin/bash

docs/html/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 16fc25f14c46711649e711cda6e9c6fb
+config: b5766e7d008470ef47d7f2589ef1a682
 tags: 645f666f9bcd5a90fca523b33c5a78b7