Merge pull request #11171 from archesproject/dev/7.6.x

Update with latest from 7.6

.git-blame-ignore-revs

@@ -1,3 +1,12 @@
+# Normalize line endings
+3fe93f1e11e517e06884c7a10591fa99074cb0fe
+# Reformat python code with black (2024)
+6d519d00e752448362b880b73c3641a562ee9ee3
+eea27d316c5ff975556e15ccd4c11d7c393dd95c
+8de09526329685ee4d80c816c3475a66b19d46e9
+9740c846eda0cc067f49d7abffdcb1a93fe3e0a9
+eff6710e8b44faef5a628b0ea1373cd99cb47e9e
+# Relevant subset of git log --grep black
 9b7e30d4499cb02dec6d17c7c99f9a7087fcdd47
 b959f1139a1d789e6c116d43d8be7daa0baa6075
 9a0a8789635af909dbef7edc4bb3f7e1b6d68bc4
@@ -26,6 +35,7 @@ a6027f6485abf8da610ffa6b41e890da361f359a
 389d8c846b011a04a22a000f1cc914c4e8987a90
 6ed0767170ff67764a2e676971541ef1e83010d6
 c7d4eb120f13eee2d9f9708e203387a875663110
+# git log --grep 'Fixing style errors.'
 5df93c451e4123b96b1e32b79e60b97db9d6fad1
 60d32a3f795e5e3eff67979c3239c84d7c0c7eaa
 0af36402f86f2b6d6a70238d85ae290c5201ba17

.gitattributes

@@ -0,0 +1,11 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Known binary formats
+*.png binary
+*.jpg binary
+*.ico binary
+*.gif binary
+*.ttf binary
+*.woff binary
+*.woff2 binary

.github/workflows/main.yml

@@ -42,9 +42,7 @@ jobs:
       - name: Install Python packages
         run: |
           python -m pip install --upgrade pip
-          pip install .
-          pip install -r ${{ github.event.repository.name }}/install/requirements.txt
-          pip install -r ${{ github.event.repository.name }}/install/requirements_dev.txt
+          pip install '.[dev]'
           echo Python packages installed
 
       - uses: ankane/setup-elasticsearch@v1
@@ -61,6 +59,18 @@ jobs:
             echo "package.json not found, skipping npm commands."
           fi
 
+      - name: Check frontend formatting with prettier
+        run: |
+          npm run prettier:check
+
+      - name: Check backend formatting with black
+        run: |
+          black . --check --exclude=node_modules
+
+      - name: Check line endings
+        run: |
+          ! git ls-files --eol | grep 'w/crlf\|w/mixed'
+
       - name: Run frontend tests
         run: |
           npm run vitest
@@ -136,9 +146,7 @@ jobs:
       - name: Install Python packages
         run: |
           python -m pip install --upgrade pip
-          pip install .
-          pip install -r ${{ github.event.repository.name }}/install/requirements.txt
-          pip install -r ${{ github.event.repository.name }}/install/requirements_dev.txt
+          pip install '.[dev]'
           echo Python packages installed
 
       - uses: ankane/setup-elasticsearch@v1

.pre-commit-config.yaml

@@ -0,0 +1,30 @@
+---
+repos:
+
+  - repo: https://github.com/psf/black
+    rev: 24.4.2
+    hooks:
+      - id: black
+        args: [--quiet]
+        exclude: node_modules
+
+  - repo: local
+    hooks:
+      - id: prettier
+        name: prettier
+        entry: npm run prettier:fix
+        language: system
+        files: arches/app/src
+      - id: eslint
+        name: eslint
+        entry: npm run eslint:fix
+        language: system
+        files: arches/app/src
+      - id: typescript
+        name: typescript
+        entry: npm run ts:check
+        language: system
+        types: [
+          "ts",
+          "vue",
+        ]

.prettierrc

@@ -0,0 +1,3 @@
+{
+    "singleAttributePerLine": true
+}

Dockerfile

@@ -14,10 +14,6 @@ FROM base as wheelbuilder
 
 WORKDIR ${WHEELS}
 
-# Install pip requirements files
-COPY ./arches/install/requirements.txt ${WHEELS}/requirements.txt
-COPY ./arches/install/requirements_dev.txt ${WHEELS}/requirements_dev.txt
-
 # Install packages required to build the python libs, then remove them
 RUN set -ex \
     && BUILD_DEPS=" \
@@ -42,9 +38,7 @@ RUN set -ex \
     && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
     && python3.8 get-pip.py
 
-RUN pip3 wheel --no-cache-dir -b /tmp -r ${WHEELS}/requirements.txt  \
-    && pip3 wheel --no-cache-dir -b /tmp -r ${WHEELS}/requirements_dev.txt  \
-    && pip3 wheel --no-cache-dir -b /tmp gunicorn \
+RUN pip3 wheel --no-cache-dir -b /tmp gunicorn \
     && pip3 wheel --no-cache-dir -b /tmp django-auth-ldap
 
 # Add Docker-related files
@@ -100,10 +94,6 @@ RUN python3.8 -m venv ENV \
     && pip install requests \
     && pip install -f ${WHEELS} django-auth-ldap \
     && pip install -f ${WHEELS} gunicorn \
-    && pip install -r ${WHEELS}/requirements.txt \
-                   -f ${WHEELS} \
-    && pip install -r ${WHEELS}/requirements_dev.txt \
-                   -f ${WHEELS} \
     && rm -rf ${WHEELS} \
     && rm -rf /root/.cache/pip/*
 
@@ -115,7 +105,7 @@ COPY . ${ARCHES_ROOT}
 WORKDIR ${ARCHES_ROOT}
 
 RUN . ../ENV/bin/activate \
-    && pip install -e . --no-binary :all:
+    && pip install -e '.[dev]' --no-binary :all:
 
 # Set default workdir
 WORKDIR ${ARCHES_ROOT}

MANIFEST.in

@@ -1,24 +1,28 @@
-recursive-include arches *
-include README.md
-exclude Dockerfile
-exclude arches/logs/*.txt
-exclude arches/settings_local.py
-exclude .*
-exclude *.yml
-recursive-exclude .eggs *
-recursive-exclude .github *
-recursive-exclude .idea *
-recursive-exclude docker *
-recursive-exclude tests *
-recursive-exclude docs *
-recursive-exclude virtualenv *
-recursive-exclude arches/elasticsearch *
-recursive-exclude arches/uploadedfiles *
-recursive-exclude arches/tileserver *
-recursive-exclude arches/app/media/packages *
-recursive-exclude arches/app/media/js/docs *
-global-exclude *.log
-global-exclude *.pyc
-global-exclude *.zip
-global-exclude *.DS_Store
-global-exclude *.orig
+recursive-include arches *
+include README.md
+exclude Dockerfile
+exclude manage.py
+exclude arches/logs/*.txt
+exclude arches/settings_local.py
+exclude .*
+exclude *.yml
+recursive-exclude .eggs *
+recursive-exclude .github *
+recursive-exclude .idea *
+recursive-exclude contributing *
+recursive-exclude cypress *
+recursive-exclude docker *
+recursive-exclude node_modules *
+recursive-exclude releases *
+recursive-exclude tests *
+recursive-exclude docs *
+recursive-exclude virtualenv *
+recursive-exclude webpack *
+recursive-exclude arches/uploadedfiles *
+recursive-exclude arches/staticfiles *
+recursive-exclude arches/app/media/build *
+global-exclude *.log
+global-exclude *.pyc
+global-exclude *.zip
+global-exclude *.DS_Store
+global-exclude *.orig

arches/__init__.py

@@ -1,5 +1,5 @@
 from __future__ import absolute_import
-from arches.setup import get_version
+from arches.version import get_version
 
 try:
     # This will make sure the app is always imported when
@@ -10,6 +10,7 @@
 except Exception as e:
     pass
 
-VERSION = (7, 6, 0, "alpha", 1)  # VERSION[3] options = "alpha", "beta", "rc", or "final"
+# VERSION[3] options = "alpha", "beta", "rc", or "final"
+VERSION = (7, 6, 0, "alpha", 1)
 
 __version__ = get_version(VERSION)

arches/app/const.py

@@ -6,6 +6,7 @@
     1012: "Node Groups without matching nodes",
 }
 
+
 @unique
 class IntegrityCheck(Enum):
     NODE_HAS_ONTOLOGY_GRAPH_DOES_NOT = 1005
@@ -20,3 +21,4 @@ class ExtensionType(Enum):
     ETL_MODULES = "etl_modules"
     FUNCTIONS = "functions"
     SEARCH_COMPONENTS = "search_components"
+    PERMISSIONS_FRAMEWORKS = "permissions"