Resolved merge conflicts after merging in master branch

.git-blame-ignore-revs

@@ -0,0 +1,32 @@
+# Fix I002 Missing required import
+7b6d4753c4b1783f796e93e6321cce7eb5ed0eea
+# Fix I001 Import block is un-sorted or un-formatted
+ca96bf1b4fe15abeb87981e10e374fdbc8de68e9
+# Apply new `ruff` rules to decorators
+9ad11899b4aee440e4a0fd19516c46f21435443e
+# Run Black and fix linting
+6928d2595b58bd15fc33f6561404a34c3f3c6446
+# Automatically reformat with Black
+7fc449c0665e696f5022294e31351b615bfe38fb
+# Add format changes from ruff update
+b74c3d28223d131ed92d466903995d099e8eb7e4
+# Apply "ruff format"
+3a4eac4c44875d7260dd14de84b12ca8bd7c9b3c
+# Run `pyupgrade` to update to latest python syntax
+b285a06a9c0b7e1d4057c560a38ef6e4b783f5bb
+# Merge pull request #1748 from dandi/ruff-fixes
+366a9a3e82d42935806ed5d4cdc2692e120b68ae
+# Format using black
+01683c677bc78a5a0418c1073e58743b70cd13bf
+# Merge remote-tracking branch 'origin/master' into ruff-fixes
+ddc64a9010fceeb1dfdaf2f53b6a89d94b4ec2d6
+# Ruff compliance for DandisetStar model and admin integration
+9d11b34f2b24fd15497ac3af19e5dee5e0619223
+# Format with `ruff`
+172c2c52c9c448cf02d51e39710e9546485e4eb7
+# Suppress ruff warnings for complexity and number of arguments
+fcd288cc5df05a1c861e291e90ab676586cabe63
+# Run "pyupgrade --py311-plus --keep-runtime-typing" over all code
+3475e00370422f0db23586b3a24e1b9099dbf203
+# Run `pyupgrade` to update to latest python syntax
+b285a06a9c0b7e1d4057c560a38ef6e4b783f5bb

.github/workflows/cli-integration.yml

@@ -19,7 +19,11 @@ jobs:
 
       - name: Build Docker image
         run: |
-          docker login -u "$DOCKER_LOGIN" --password-stdin <<<"$DOCKER_TOKEN"
+          if [ -n "$DOCKER_LOGIN$DOCKER_TOKEN" ]; then
+              docker login -u "$DOCKER_LOGIN" --password-stdin <<<"$DOCKER_TOKEN"
+          else
+              echo "Not logging in to docker since no credentials were provided, might hit limits below"
+          fi
           docker build \
             -t dandiarchive/dandiarchive-api \
             -f dev/django-public.Dockerfile \

.pre-commit-config.yaml

@@ -19,5 +19,18 @@ repos:
   hooks:
   # Run the linter.
   - id: ruff
+
   # Run the formatter.
   - id: ruff-format
+
+  # Run the linter in fix-only mode.
+  - id: ruff
+    alias: ruff-fix-only
+    stages: [manual]
+    args: [--fix-only]
+
+  # Run the formatter in check mode.
+  - id: ruff-format
+    alias: ruff-format-check
+    stages: [manual]
+    args: [--check]

CHANGELOG.md

@@ -1,3 +1,283 @@
+# v0.4.18 (Fri Feb 07 2025)
+
+#### 🐛 Bug Fix
+
+- Fix dandiset ordering icons, default to descending [#2175](https://github.com/dandi/dandi-archive/pull/2175) ([@jjnesbitt](https://github.com/jjnesbitt))
+- Add .git-blame-ignore-revs to improve blame view [#2173](https://github.com/dandi/dandi-archive/pull/2173) ([@danlamanna](https://github.com/danlamanna))
+
+#### Authors: 2
+
+- Dan LaManna ([@danlamanna](https://github.com/danlamanna))
+- Jacob Nesbitt ([@jjnesbitt](https://github.com/jjnesbitt))
+
+---
+
+# v0.4.17 (Wed Feb 05 2025)
+
+#### 🐛 Bug Fix
+
+- Check if dandiset contains zarr assets using asset list endpoint [#2170](https://github.com/dandi/dandi-archive/pull/2170) ([@jjnesbitt](https://github.com/jjnesbitt))
+
+#### Authors: 1
+
+- Jacob Nesbitt ([@jjnesbitt](https://github.com/jjnesbitt))
+
+---
+
+# v0.4.16 (Wed Feb 05 2025)
+
+#### 🐛 Bug Fix
+
+- Add Dandiset star functionality with UI components [#2123](https://github.com/dandi/dandi-archive/pull/2123) ([@bendichter](https://github.com/bendichter) [@jjnesbitt](https://github.com/jjnesbitt))
+- Design document for "atpath" endpoint [#2155](https://github.com/dandi/dandi-archive/pull/2155) ([@jwodder](https://github.com/jwodder))
+
+#### Authors: 3
+
+- Ben Dichter ([@bendichter](https://github.com/bendichter))
+- Jacob Nesbitt ([@jjnesbitt](https://github.com/jjnesbitt))
+- John T. Wodder II ([@jwodder](https://github.com/jwodder))
+
+---
+
+# v0.4.15 (Mon Feb 03 2025)
+
+#### 🐛 Bug Fix
+
+- Update support links in the footer [#2134](https://github.com/dandi/dandi-archive/pull/2134) ([@kabilar](https://github.com/kabilar) [@waxlamp](https://github.com/waxlamp))
+- Update code of conduct contact information [#2157](https://github.com/dandi/dandi-archive/pull/2157) ([@kabilar](https://github.com/kabilar))
+
+#### Authors: 2
+
+- Kabilar Gunalan ([@kabilar](https://github.com/kabilar))
+- Roni Choudhury ([@waxlamp](https://github.com/waxlamp))
+
+---
+
+# v0.4.14 (Tue Jan 28 2025)
+
+#### 🐛 Bug Fix
+
+- Use `Unaccent` with dandiset search filter [#2142](https://github.com/dandi/dandi-archive/pull/2142) ([@jjnesbitt](https://github.com/jjnesbitt))
+- `Upload` and `AssetBlob` garbage collection implementation [#2087](https://github.com/dandi/dandi-archive/pull/2087) ([@mvandenburgh](https://github.com/mvandenburgh))
+
+#### Authors: 2
+
+- Jacob Nesbitt ([@jjnesbitt](https://github.com/jjnesbitt))
+- Mike VanDenburgh ([@mvandenburgh](https://github.com/mvandenburgh))
+
+---
+
+# v0.4.13 (Thu Jan 23 2025)
+
+#### 🐛 Bug Fix
+
+- Empty commit to trigger a release [#2152](https://github.com/dandi/dandi-archive/pull/2152) ([@waxlamp](https://github.com/waxlamp))
+- Add `/handbook` redirect to `docs.dandiarchive.org` [#2151](https://github.com/dandi/dandi-archive/pull/2151) ([@kabilar](https://github.com/kabilar) [@waxlamp](https://github.com/waxlamp))
+
+#### Authors: 2
+
+- Kabilar Gunalan ([@kabilar](https://github.com/kabilar))
+- Roni Choudhury ([@waxlamp](https://github.com/waxlamp))
+
+---
+
+# v0.4.12 (Wed Jan 22 2025)
+
+#### 🐛 Bug Fix
+
+- Move Google analytics tag to environment variable to prevent DANDI clones using by accident [#2126](https://github.com/dandi/dandi-archive/pull/2126) ([email protected] [@aaronkanzer](https://github.com/aaronkanzer))
+
+#### Authors: 2
+
+- [@aaronkanzer](https://github.com/aaronkanzer)
+- Aaron Kanzer ([email protected])
+
+---
+
+# v0.4.11 (Wed Jan 22 2025)
+
+#### 🐛 Bug Fix
+
+- Upgrade `dandischema` version to 0.11.0 [#2132](https://github.com/dandi/dandi-archive/pull/2132) ([@kabilar](https://github.com/kabilar))
+- Add Netlify link to footer [#2133](https://github.com/dandi/dandi-archive/pull/2133) ([@kabilar](https://github.com/kabilar))
+- Add Terms, Policies, and Code of Conduct to footer [#2135](https://github.com/dandi/dandi-archive/pull/2135) ([@kabilar](https://github.com/kabilar) [@waxlamp](https://github.com/waxlamp))
+- Add Code of Conduct [#2130](https://github.com/dandi/dandi-archive/pull/2130) ([@kabilar](https://github.com/kabilar) [@waxlamp](https://github.com/waxlamp))
+
+#### Authors: 2
+
+- Kabilar Gunalan ([@kabilar](https://github.com/kabilar))
+- Roni Choudhury ([@waxlamp](https://github.com/waxlamp))
+
+---
+
+# v0.4.10 (Wed Jan 22 2025)
+
+#### 🐛 Bug Fix
+
+- Update URL for DANDI Docs [#2137](https://github.com/dandi/dandi-archive/pull/2137) ([@kabilar](https://github.com/kabilar) [@waxlamp](https://github.com/waxlamp))
+
+#### Authors: 2
+
+- Kabilar Gunalan ([@kabilar](https://github.com/kabilar))
+- Roni Choudhury ([@waxlamp](https://github.com/waxlamp))
+
+---
+
+# v0.4.9 (Wed Jan 22 2025)
+
+#### 🐛 Bug Fix
+
+- Update URL for DANDI About site [#2138](https://github.com/dandi/dandi-archive/pull/2138) ([@kabilar](https://github.com/kabilar))
+
+#### Authors: 1
+
+- Kabilar Gunalan ([@kabilar](https://github.com/kabilar))
+
+---
+
+# v0.4.8 (Tue Jan 21 2025)
+
+#### 🐛 Bug Fix
+
+- Move to 2025 from 2024 in the footer [#2144](https://github.com/dandi/dandi-archive/pull/2144) ([@yarikoptic](https://github.com/yarikoptic))
+
+#### Authors: 1
+
+- Yaroslav Halchenko ([@yarikoptic](https://github.com/yarikoptic))
+
+---
+
+# v0.4.7 (Wed Jan 08 2025)
+
+#### 🐛 Bug Fix
+
+- Prevent duplicate serialization of dandiset in detail view [#2125](https://github.com/dandi/dandi-archive/pull/2125) ([@jjnesbitt](https://github.com/jjnesbitt))
+- Fix reactivity bug in meditor [#2127](https://github.com/dandi/dandi-archive/pull/2127) ([@mvandenburgh](https://github.com/mvandenburgh))
+
+#### Authors: 2
+
+- Jacob Nesbitt ([@jjnesbitt](https://github.com/jjnesbitt))
+- Mike VanDenburgh ([@mvandenburgh](https://github.com/mvandenburgh))
+
+---
+
+# v0.4.6 (Wed Jan 08 2025)
+
+#### 🐛 Bug Fix
+
+- Create permissions service layer [#2115](https://github.com/dandi/dandi-archive/pull/2115) ([@jjnesbitt](https://github.com/jjnesbitt))
+- Design doc for Upload/AssetBlob garbage collection [#2068](https://github.com/dandi/dandi-archive/pull/2068) ([@mvandenburgh](https://github.com/mvandenburgh))
+
+#### Authors: 2
+
+- Jacob Nesbitt ([@jjnesbitt](https://github.com/jjnesbitt))
+- Mike VanDenburgh ([@mvandenburgh](https://github.com/mvandenburgh))
+
+---
+
+# v0.4.5 (Fri Jan 03 2025)
+
+#### 🐛 Bug Fix
+
+- Display validation errors on DLP for embargoed dandisets [#2122](https://github.com/dandi/dandi-archive/pull/2122) ([@mvandenburgh](https://github.com/mvandenburgh))
+
+#### 🏠 Internal
+
+- Make logging level of the django app configurable [#2078](https://github.com/dandi/dandi-archive/pull/2078) ([@yarikoptic](https://github.com/yarikoptic) [@waxlamp](https://github.com/waxlamp))
+
+#### Authors: 3
+
+- Mike VanDenburgh ([@mvandenburgh](https://github.com/mvandenburgh))
+- Roni Choudhury ([@waxlamp](https://github.com/waxlamp))
+- Yaroslav Halchenko ([@yarikoptic](https://github.com/yarikoptic))
+
+---
+
+# v0.4.4 (Thu Jan 02 2025)
+
+#### 🐛 Bug Fix
+
+- Set assets to pending during unembargo [#2117](https://github.com/dandi/dandi-archive/pull/2117) ([@jjnesbitt](https://github.com/jjnesbitt))
+
+#### Authors: 1
+
+- Jacob Nesbitt ([@jjnesbitt](https://github.com/jjnesbitt))
+
+---
+
+# v0.4.3 (Fri Dec 27 2024)
+
+#### 🐛 Bug Fix
+
+- Enhance OverviewTab.vue to display Resource Type information for DLP items [#2124](https://github.com/dandi/dandi-archive/pull/2124) ([@bendichter](https://github.com/bendichter))
+
+#### Authors: 1
+
+- Ben Dichter ([@bendichter](https://github.com/bendichter))
+
+---
+
+# v0.4.2 (Thu Dec 19 2024)
+
+#### 🐛 Bug Fix
+
+- Empty commit to trigger release [#2120](https://github.com/dandi/dandi-archive/pull/2120) ([@waxlamp](https://github.com/waxlamp))
+- Enable User search by GitHub username [#2119](https://github.com/dandi/dandi-archive/pull/2119) ([@waxlamp](https://github.com/waxlamp))
+- DLP: Add "Protocols" card [#2103](https://github.com/dandi/dandi-archive/pull/2103) ([@yarikoptic](https://github.com/yarikoptic) [@waxlamp](https://github.com/waxlamp) [@mvandenburgh](https://github.com/mvandenburgh))
+- Login to docker hub only if credentials were provided [#2118](https://github.com/dandi/dandi-archive/pull/2118) ([@yarikoptic](https://github.com/yarikoptic))
+- Capitalize `Archive` when it follows `DANDI` [#2114](https://github.com/dandi/dandi-archive/pull/2114) ([@kabilar](https://github.com/kabilar))
+- Format template [#2112](https://github.com/dandi/dandi-archive/pull/2112) ([@mvandenburgh](https://github.com/mvandenburgh))
+
+#### Authors: 4
+
+- Kabilar Gunalan ([@kabilar](https://github.com/kabilar))
+- Mike VanDenburgh ([@mvandenburgh](https://github.com/mvandenburgh))
+- Roni Choudhury ([@waxlamp](https://github.com/waxlamp))
+- Yaroslav Halchenko ([@yarikoptic](https://github.com/yarikoptic))
+
+---
+
+# v0.4.1 (Tue Dec 17 2024)
+
+#### 🐛 Bug Fix
+
+- Set version status to PENDING in ingest_zarr_archive [#2111](https://github.com/dandi/dandi-archive/pull/2111) ([@jjnesbitt](https://github.com/jjnesbitt))
+
+#### Authors: 1
+
+- Jacob Nesbitt ([@jjnesbitt](https://github.com/jjnesbitt))
+
+---
+
+# v0.4.0 (Mon Dec 16 2024)
+
+#### 🚀 Enhancement
+
+- Add some .debug level messages in tasks upon no action to be performed [#2079](https://github.com/dandi/dandi-archive/pull/2079) ([@yarikoptic](https://github.com/yarikoptic))
+
+#### 🐛 Bug Fix
+
+- Update shareable link to reflect window.location.origin [#2108](https://github.com/dandi/dandi-archive/pull/2108) ([email protected] [@aaronkanzer](https://github.com/aaronkanzer))
+- Update instructions for serving the web app through a development server [#2095](https://github.com/dandi/dandi-archive/pull/2095) ([@candleindark](https://github.com/candleindark))
+- Use pre-commit hooks in tox configuration [#2057](https://github.com/dandi/dandi-archive/pull/2057) ([@waxlamp](https://github.com/waxlamp))
+- doc: update instruction to natively(locally) run Celery service [#2106](https://github.com/dandi/dandi-archive/pull/2106) ([@candleindark](https://github.com/candleindark) [@mvandenburgh](https://github.com/mvandenburgh))
+- DLP: Have "Cite as" only for OPEN (non embargoed) dandisets [#2102](https://github.com/dandi/dandi-archive/pull/2102) ([@yarikoptic](https://github.com/yarikoptic))
+
+#### 🧪 Tests
+
+- ENH: run pytest  against dandi-cli with -v to see which tests ran [#2076](https://github.com/dandi/dandi-archive/pull/2076) ([@yarikoptic](https://github.com/yarikoptic))
+
+#### Authors: 6
+
+- [@aaronkanzer](https://github.com/aaronkanzer)
+- Aaron Kanzer ([email protected])
+- Isaac To ([@candleindark](https://github.com/candleindark))
+- Mike VanDenburgh ([@mvandenburgh](https://github.com/mvandenburgh))
+- Roni Choudhury ([@waxlamp](https://github.com/waxlamp))
+- Yaroslav Halchenko ([@yarikoptic](https://github.com/yarikoptic))
+
+---
+
 # v0.3.115 (Mon Dec 09 2024)
 
 #### 🐛 Bug Fix