Merge pull request #4574 from voxel51/merging-main

Merge main
voxel51 · Jul 17, 2024 · 6dfe7d0 · 6dfe7d0
2 parents fa823f5 + a19fc30
commit 6dfe7d0
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 27 deletions.
diff --git a/.github/workflows/build-db.yml b/.github/workflows/build-db.yml
@@ -65,10 +65,17 @@ jobs:
           cd package/db
           python -Im build --sdist
       - name: Upload
+        uses: actions/upload-artifact@v4
+        if: ${{ matrix.platform == 'sdist' }}
+        with:
+          name: dist-${{ matrix.platform }}
+          path: package/db/dist/*.tar.gz
+      - name: Upload wheel
+        if: ${{ matrix.platform != 'sdist' }}
         uses: actions/upload-artifact@v4
         with:
           name: dist-${{ matrix.platform }}
-          path: package/db/dist/*
+          path: package/db/dist/*.whl
 
   test:
     runs-on: ubuntu-20.04

diff --git a/docs/source/_templates/layout.html b/docs/source/_templates/layout.html
@@ -1,8 +1,5 @@
 {% extends "!layout.html" %} {% block extrahead %}
-<meta
-  property="og:image"
-  content="{{og_image}}"
-/>
+<meta property="og:image" content="{{og_image}}" />
 
 <link
   href="https://fonts.googleapis.com/css?family=Palanquin:400,600,700,800"
@@ -12,9 +9,9 @@
   href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.0/css/all.min.css"
   rel="stylesheet"
 />
+<script src="https://tag.clearbitscripts.com/v1/pk_b9ed71c8234edd4f77326bcbfab5a4ca/tags.js" />
 {% endblock %} {% block custom_header %}
 <div class="container-fluid header-holder tutorials-header" id="header-holder">
-
   <nav id="nav__main" class="nav__main">
     <div class="nav__main__logo">
       <a href="{{link_home}}">
@@ -39,16 +36,15 @@
     </div>
 
     <div id="nav__main__items">
-
       <div class="nav__item nav__dropdown">
         <div class="nav__dropdown__trigger">Products</div>
         <div class="nav__item nav__dropdown__menu has-arrows">
           <div class="arrow-up--light-primary arrow-left20"></div>
           <ul>
-            <li><a href="{{link_fiftyone}}">Open Source</a>
-            <li><a href="{{link_fiftyone_teams}}">FiftyOne Teams</a>
-            <li><a href="{{link_usecases}}">Use Cases</a>
-            <li><a href="{{link_success_stories}}">Success Stories</a>
+            <li><a href="{{link_fiftyone}}">Open Source</a></li>
+            <li><a href="{{link_fiftyone_teams}}">FiftyOne Teams</a></li>
+            <li><a href="{{link_usecases}}">Use Cases</a></li>
+            <li><a href="{{link_success_stories}}">Success Stories</a></li>
           </ul>
         </div>
       </div>
@@ -58,9 +54,9 @@
         <div class="nav__item nav__dropdown__menu has-arrows">
           <div class="arrow-up--light-primary arrow-left20"></div>
           <ul>
-            <li><a href="{{link_voxel51_slack}}">Community Slack</a>
-            <li><a href="{{link_voxel51_blog}}">Blog</a>
-            <li><a href="{{link_events}}">Events</a>
+            <li><a href="{{link_voxel51_slack}}">Community Slack</a></li>
+            <li><a href="{{link_voxel51_blog}}">Blog</a></li>
+            <li><a href="{{link_events}}">Events</a></li>
           </ul>
         </div>
       </div>
@@ -74,9 +70,9 @@
         <div class="nav__item nav__dropdown__menu has-arrows">
           <div class="arrow-up--light-primary arrow-left20"></div>
           <ul>
-            <li><a href="{{link_ourstory}}">About Us</a>
-            <li><a href="{{link_voxel51_jobs}}">Careers</a>
-            <li><a href="{{link_talk_to_sales}}">Talk to Sales</a>
+            <li><a href="{{link_ourstory}}">About Us</a></li>
+            <li><a href="{{link_voxel51_jobs}}">Careers</a></li>
+            <li><a href="{{link_talk_to_sales}}">Talk to Sales</a></li>
           </ul>
         </div>
       </div>
@@ -94,18 +90,15 @@
           data-size="large"
           data-show-count="true"
           aria-label="Star voxel51/fiftyone on GitHub"
-        >Star</a>
+          >Star</a
+        >
       </div>
 
       <div class="nav__item full_nav_only">
-        <a
-          class="button-primary"
-          href="{{link_workshop}}"
-          target="_blank"
+        <a class="button-primary" href="{{link_workshop}}" target="_blank"
           >Schedule a workshop</a
         >
       </div>
-
     </div>
   </nav>
 </div>
@@ -196,13 +189,15 @@
 </footer>
 
 <!-- https://buttons.github.io -->
-<script async defer src="https://buttons.github.io/buttons.js"></script>
+<script async defer src="https://buttons.github.io/buttons.js" />
 
 <!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=G-XD15NFRY3M"></script>
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-XD15NFRY3M" />
 <script>
   window.dataLayer = window.dataLayer || [];
-  function gtag() {dataLayer.push(arguments);}
+  function gtag() {
+    dataLayer.push(arguments);
+  }
   gtag("js", new Date());
   gtag("config", "G-XD15NFRY3M");
 </script>

diff --git a/package/db/setup.py b/package/db/setup.py
@@ -95,6 +95,10 @@
             "aarch64": "https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2204-7.0.4.tgz",
             "x86_64": "https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2204-7.0.4.tgz",
         },
+        "24": {
+            "aarch64": "https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2204-7.0.4.tgz",
+            "x86_64": "https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2204-7.0.4.tgz",
+        },
     },
 }
 
@@ -139,7 +143,7 @@ def _get_download():
 MONGODB_BINARIES = ["mongod"]
 
 
-VERSION = "1.1.3"
+VERSION = "1.1.4"
 
 
 def get_version():