Merge branch 'production' into issue-5365

.dockerignore

@@ -10,4 +10,4 @@ specifyweb/frontend/js_src/node_modules
 specifyweb/frontend/testBuild
 specifyweb/frontend/static/js
 # Prevent *.env files from being included in a container (for security)
-*.env
+*.env

.github/DISCUSSION_TEMPLATE/feature_requests.yml

@@ -0,0 +1,43 @@
+title: ""
+labels: ["1 - Request"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for your interest in improving this project! Please fill out the following sections to help us understand your feature request better.
+  - type: textarea
+    id: problem-description
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      description: "A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]"
+      value: |
+        ...
+    validations:
+      required: true
+  - type: textarea
+    id: solution-description
+    attributes:
+      label: Describe the solution you'd like
+      description: "A clear and concise description of what you want to happen."
+      value: |
+        ...
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives-considered
+    attributes:
+      label: Describe alternatives you've considered
+      description: "A clear and concise description of any alternative solutions or features you've considered."
+      value: |
+        ...
+  - type: input
+    id: reported-by
+    attributes:
+      label: Reported By
+      description: "Name of institution"
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for your feedback! We appreciate your suggestions and will review them as soon as possible.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,10 +1,9 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Report an issue to help us improve
 title: ''
-labels: 1 - Bug
 assignees: ''
-
+type: bug
 ---
 
 **Describe the bug**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: 1 - Request
+type: feature
 assignees: ''
 
 ---

.github/pull-request-template.md

@@ -1,13 +1,18 @@
 Fixes #
 
-
+<!--
+> [!WARNING]  
+> This PR affects database migrations. See [migration testing instructions](https://specify.github.io/testing/pull_requests.html#prs-tagged-with-label-migration).
+-->
 
 ### Checklist
 
-- [ ] Self-review the PR after opening it to make sure the changes look good
-      and self-explanatory (or properly documented)
+- [ ] Self-review the PR after opening it to make sure the changes look good and
+      self-explanatory (or properly documented)
 - [ ] Add automated tests
 - [ ] Add relevant issue to release milestone
+- [ ] Add relevant documentation (Tester - Dev)
+- [ ] Add a reverse migration if a migration is present in the PR
 
 ### Testing instructions
 

.github/workflows/docker.yml

@@ -58,39 +58,43 @@ jobs:
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
           echo "tags=${TAGS}" >> $GITHUB_OUTPUT
           echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
-      
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY_IMAGE }}
-      
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
-      
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      
+
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      
+
       - name: Build and push by digest
         id: build
         uses: docker/build-push-action@v6
         with:
           platforms: ${{ matrix.platform }}
+          build-args: |
+            BUILD_VERSION=${{ steps.prep.outputs.version }}
+            GIT_SHA=${{ github.sha }}
           tags: ${{ steps.prep.outputs.tags }}
           push: true
+          retries: 3
 
       - name: Export digest
         run: |
           mkdir -p /tmp/digests
           digest="${{ steps.build.outputs.digest }}"
           touch "/tmp/digests/${digest#sha256:}"
-      
+
       - name: Upload digest
         uses: actions/upload-artifact@v4
         with:
@@ -110,28 +114,28 @@ jobs:
           path: /tmp/digests
           pattern: digests-*
           merge-multiple: true
-      
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY_IMAGE }}
-      
+
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      
+
       - name: Create manifest list and push
         working-directory: /tmp/digests
         run: |
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
-      
+
       - name: Inspect image
         run: |
           docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}

.gitignore

@@ -10,17 +10,12 @@ venv/
 ve/
 seed-database
 *.env
-
 /specifyweb/settings/local_settings.py
 /specifyweb/settings/local_specify_settings.py
 /specifyweb/settings/local_logging_settings.py
 /specifyweb/settings/debug.py
 /specifyweb/settings/secret_key.py
 /specifyweb/settings/ldap_settings.py
-
-
-
-# Build artifacts:
 /.mypy_cache
 /specifyweb/frontend/locale/**/*.mo
 /specifyweb/settings/build_version.py
@@ -33,4 +28,6 @@ node_modules
 /specifyweb/frontend/js_src/coverage
 /local_specifyweb_apache.conf
 /specifyweb/frontend/js_src/stats.json
-/specifyweb/frontend/js_src/dist
+/specifyweb/frontend/js_src/dist
+.env
+docker-compose.yml

.pre-commit-config.yaml

@@ -32,7 +32,9 @@ repos:
       - id: mypy
         name: mypy
         description: Python mypy typechecker
-        entry: /bin/bash -c "docker exec --tty specify7_specify7_1 bash -c 'VIRTUAL_ENV=./ve make typecheck'"
+        entry:
+          /bin/bash -c "docker exec --tty specify7_specify7_1 bash -c
+          'VIRTUAL_ENV=./ve make typecheck'"
         language: script
         types: [python]
         pass_filenames: false
@@ -115,7 +117,7 @@ repos:
       - id: prettier
         additional_dependencies:
           - [email protected]
-          - "@prettier/plugin-xml@^0.13.1"
+          - '@prettier/plugin-xml@^0.13.1'
           - prettier-plugin-package@^1.3.0
           - prettier-plugin-sh@^0.8.1
           - prettier-plugin-tailwind-css@^1.5.0

CITATION.cff

@@ -1,5 +1,5 @@
 cff-version: 1.2.0
-message: "If you use this software in your research, please cite it as:"
+message: 'If you use this software in your research, please cite it as:'
 authors:
   - name: Specify Collections Consortium & Contributors
     email: [email protected]
@@ -12,12 +12,8 @@ identifiers:
     value: 'https://www.specifysoftware.org/'
     description: Specify Collections Consortium
 abstract: >-
-  The Specify Collections Consortium research repositories
-  produce software platforms that process species and
-  specimen data.
-keywords:
-  - collections management software
-  - open source
+  The Specify Collections Consortium research repositories produce software
+  platforms that process species and specimen data.
 license: GPL-2.0-only
 repository-code: specify/specify7
-repository: "https://github.com/specify/specify7"
+repository: 'https://github.com/specify/specify7'