Merge branch 'activeloopai:master' into master

m-star18 · Sep 24, 2021 · 30cf5ba · 30cf5ba
2 parents 1aacac4 + 3bc7671
commit 30cf5ba
Show file tree

Hide file tree

Showing 69 changed files with 1,535 additions and 808 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -90,11 +90,17 @@ commands:
   get-python:
     steps:
       - run:
-          name: "Install Python"
+          name: "Install Python & ffmpeg"
           command: |
             brew update
             brew install python@3.7
             brew link --overwrite python@3.7
+            brew install ffmpeg
+  get-linux-ffmpeg:
+    steps:
+      - run:
+          name: "Install ffmpeg"
+          command: sudo apt-get update && sudo apt-get install ffmpeg
   info:
     steps:
       - run:
@@ -168,6 +174,7 @@ commands:
                   pytest --cov-report=xml --cov=./
       - when:
           condition: << parameters.unix-like >>
+          resource_class: medium+
           steps:
             - run:
                 name: "Running tests - Unix"
@@ -244,6 +251,7 @@ jobs:
         type: boolean
         default: false
     executor: << parameters.e >>
+    resource_class: medium+
     steps:
       - checkout
       - unless:
@@ -254,6 +262,14 @@ jobs:
           condition: << parameters.mac-like >>
           steps:
             - get-python
+      - when:
+          condition:
+            and:
+              - not: << parameters.mac-like >>
+              - << parameters.unix-like >>
+              - << parameters.optional >>
+          steps:
+            - get-linux-ffmpeg
       - info
       - google-creds:
           unix-like: << parameters.unix-like >>
@@ -272,6 +288,7 @@ jobs:
     executor: linux
     environment:
       IMAGE_NAME: snarkai/hub
+    resource_class: medium+
     steps:
       - setup_remote_docker
       - checkout

diff --git a/.github/PULL_REQUEST_TEMPLATE/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,16 @@
+## 🚀 🚀 Pull Request
+
+### Checklist:
+
+- [ ]  [My code follows the style guidelines of this project](https://www.notion.so/activeloop/Engineering-Guidelines-d6e502306d0e4133a8ca507516d1baab) and the [Contributing document](https://github.com/activeloopai/Hub/blob/release/2.0/CONTRIBUTING.md)
+- [ ]  I have commented my code, particularly in hard-to-understand areas
+- [ ]  I have kept the `coverage-rate` up
+- [ ]  I have performed a self-review of my own code and resolved any problems
+- [ ]  I have checked to ensure there aren't any other open [Pull Requests](https://github.com/activeloopai/Hub/pulls) for the same change
+- [ ]  I have described and made corresponding changes to the relevant documentation
+- [ ]  New and existing unit tests pass locally with my changes
+
+
+### Changes
+
+<!-- Describe your changes! Describe the scope of this PR's responsibilities. -->
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -3,10 +3,10 @@ name: package
 on:
   push:
     branches:
-      - '**'
+      - "**"
   pull_request:
     branches:
-      - '**'
+      - "**"
 
 jobs:
   test:
@@ -16,10 +16,9 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - 3.6
           - 3.7
           - 3.8
-#          - 3.9
+        #          - 3.9
         os:
           - ubuntu-latest
           - macOS-latest
@@ -45,12 +44,11 @@ jobs:
         run: |
           black --version
           black --check .
-#      - name: Test with pytest and generate coverage report
-#        run: |
-#          pytest --cov=hub --cov-report=html hub
-#      - name: Codecov
-#        uses: codecov/codecov-action@v1.0.15
-
+      - name: Test with pytest and generate coverage report
+        run: |
+          pytest --cov=hub --cov-report=html hub
+      - name: Codecov
+        uses: codecov/codecov-action@v1
 
   test_with_optional:
     name: Python ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} (with optional dependencies)
@@ -60,10 +58,9 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - 3.6
           - 3.7
           - 3.8
-#          - 3.9
+        #          - 3.9
         os:
           - ubuntu-latest
           - macOS-latest
@@ -90,8 +87,8 @@ jobs:
         run: |
           black --version
           black --check .
-#      - name: Test with pytest and generate coverage report
-#        run: |
-#          pytest --cov=hub --cov-report=html hub
-#      - name: Codecov
-#        uses: codecov/codecov-action@v1.0.15
+      - name: Test with pytest and generate coverage report
+        run: |
+          pytest --cov=hub --cov-report=html hub
+      - name: Codecov
+        uses: codecov/codecov-action@v1
diff --git a/.gitignore b/.gitignore
@@ -48,6 +48,7 @@ data/
 
 # OS generated files #
 ######################
+.dccache
 .DS_Store?
 ehthumbs.db
 Icon?