Merge branch 'develop' into selection

mathesar-foundation · Nov 6, 2023 · 5117eb2 · 5117eb2
2 parents 24b4521 + ce4a82d
commit 5117eb2
Show file tree

Hide file tree

Showing 166 changed files with 18,167 additions and 24,715 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,6 +1,5 @@
 **/node_modules
 **/dist
-**/storybook-static
 **/.vscode
 **/npm-debug.log
 **/Dockerfile
diff --git a/.github/sync.yml b/.github/sync.yml
@@ -28,7 +28,7 @@ centerofci/mathesar-design:
   - .github/workflows/update-project-on-issue-label.yml
   - .github/workflows/update-project-on-pr-edit.yml
   - .github/workflows/update-project-on-pr-label.yml
-centerofci/mathesar-private-notes:
+centerofci/mathesar-internal-crm:
   - .github/actions/project_update/
   - .github/workflows/add-to-project.yml
   - .github/workflows/toc.yml
@@ -38,7 +38,7 @@ centerofci/mathesar-private-notes:
   - .github/workflows/update-project-on-issue-label.yml
   - .github/workflows/update-project-on-pr-edit.yml
   - .github/workflows/update-project-on-pr-label.yml
-centerofci/mathesar-scripts:
+centerofci/mathesar-private-notes:
   - .github/actions/project_update/
   - .github/workflows/add-to-project.yml
   - .github/workflows/toc.yml
@@ -48,7 +48,7 @@ centerofci/mathesar-scripts:
   - .github/workflows/update-project-on-issue-label.yml
   - .github/workflows/update-project-on-pr-edit.yml
   - .github/workflows/update-project-on-pr-label.yml
-centerofci/mathesar-update-companion:
+centerofci/mathesar-scripts:
   - .github/actions/project_update/
   - .github/workflows/add-to-project.yml
   - .github/workflows/toc.yml

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.x
+          python-version: 3.11
       - run: pip install -r ./docs/requirements.txt
       - working-directory: ./docs
         run: mkdocs gh-deploy --strict --force
diff --git a/.github/workflows/handle-required-checks.yml b/.github/workflows/handle-required-checks.yml
diff --git a/.github/workflows/run-flake8.yml b/.github/workflows/run-flake8.yml
diff --git a/.github/workflows/run-lint-audit-tests-ui.yml b/.github/workflows/run-lint-audit-tests-ui.yml
diff --git a/.github/workflows/run-pytest.yml b/.github/workflows/run-pytest.yml
diff --git a/.github/workflows/run-sql-tests.yml b/.github/workflows/run-sql-tests.yml
diff --git a/.github/workflows/run-vulture.yml b/.github/workflows/run-vulture.yml
diff --git a/.github/workflows/sync-github-labels-milestones.yml b/.github/workflows/sync-github-labels-milestones.yml
@@ -16,16 +16,16 @@ jobs:
     - run: /home/runner/.composer/vendor/bin/github-sync labels -f centerofci/mathesar -t centerofci/mathesar-ansible -d
     - run: /home/runner/.composer/vendor/bin/github-sync labels -f centerofci/mathesar -t centerofci/mathesar-data-playground -d
     - run: /home/runner/.composer/vendor/bin/github-sync labels -f centerofci/mathesar -t centerofci/mathesar-design -d
+    - run: /home/runner/.composer/vendor/bin/github-sync labels -f centerofci/mathesar -t centerofci/mathesar-internal-crm -d
     - run: /home/runner/.composer/vendor/bin/github-sync labels -f centerofci/mathesar -t centerofci/mathesar-private-notes -d
     - run: /home/runner/.composer/vendor/bin/github-sync labels -f centerofci/mathesar -t centerofci/mathesar-scripts -d
-    - run: /home/runner/.composer/vendor/bin/github-sync labels -f centerofci/mathesar -t centerofci/mathesar-update-companion -d
     - run: /home/runner/.composer/vendor/bin/github-sync labels -f centerofci/mathesar -t centerofci/mathesar-website -d
     - run: /home/runner/.composer/vendor/bin/github-sync labels -f centerofci/mathesar -t centerofci/mathesar-wiki -d
     - run: /home/runner/.composer/vendor/bin/github-sync milestones -f centerofci/mathesar -t centerofci/mathesar-ansible -s open
     - run: /home/runner/.composer/vendor/bin/github-sync milestones -f centerofci/mathesar -t centerofci/mathesar-data-playground -s open
     - run: /home/runner/.composer/vendor/bin/github-sync milestones -f centerofci/mathesar -t centerofci/mathesar-design -s open
+    - run: /home/runner/.composer/vendor/bin/github-sync milestones -f centerofci/mathesar -t centerofci/mathesar-internal-crm -s open
     - run: /home/runner/.composer/vendor/bin/github-sync milestones -f centerofci/mathesar -t centerofci/mathesar-private-notes -s open
     - run: /home/runner/.composer/vendor/bin/github-sync milestones -f centerofci/mathesar -t centerofci/mathesar-scripts -s open
-    - run: /home/runner/.composer/vendor/bin/github-sync milestones -f centerofci/mathesar -t centerofci/mathesar-update-companion -s open
     - run: /home/runner/.composer/vendor/bin/github-sync milestones -f centerofci/mathesar -t centerofci/mathesar-website -s open
     - run: /home/runner/.composer/vendor/bin/github-sync milestones -f centerofci/mathesar -t centerofci/mathesar-wiki -s open
diff --git a/.github/workflows/sync-workflows.yml b/.github/workflows/sync-workflows.yml
@@ -2,7 +2,7 @@ name: Sync GitHub workflows to other repos
 on:
   push:
     branches:
-      - master
+      - develop
   workflow_dispatch:
 jobs:
   sync_workflows:
@@ -13,4 +13,4 @@ jobs:
       - name: Run GitHub file sync
         uses: BetaHuhn/repo-file-sync-action@v1
         with:
-          GH_PAT: ${{secrets.MATHESAR_ORG_GITHUB_TOKEN}}
+          GH_PAT: ${{secrets.MATHESAR_ORG_GITHUB_TOKEN}}