Merge pull request #57 from rapidsai/branch-0.6

raydouglass · web-flow · commit a0a4dfba27e9 · 2022-07-19T13:34:22.000-04:00
[RELEASE] v0.6.1 frigate
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,10 @@
+requirements.lock
+simple-0.1.0.tgz
+
+
+
+# Below are entries from Python.gitignore
+#
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
diff --git a/environment.yml b/environment.yml
@@ -5,6 +5,8 @@
 # also explicitly install frigate itself within this repo.
 #
 name: pre-commit-hook-environment
+channels:
+  - conda-forge
 dependencies:
   - python
   - kubernetes-helm
diff --git a/frigate/tests/mockcharts/deps/Chart.yaml b/frigate/tests/mockcharts/deps/Chart.yaml
@@ -4,6 +4,6 @@ description: A Helm chart for Kubernetes
 name: simple
 version: 0.1.0
 dependencies:
-  - name: simple  # The simple chart but packaged and already pulled
+  - name: simple
     version: "0.1.0"
-    repository: 'https://example.com/frigate'
+    repository: "file://../simple"
diff --git a/frigate/tests/mockcharts/deps/charts/simple-0.1.0.tgz b/frigate/tests/mockcharts/deps/charts/simple-0.1.0.tgz

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`# also explicitly install frigate itself within this repo.`
`6`	`6`	`#`
`7`	`7`	`name: pre-commit-hook-environment`
	`8`	`+channels:`
	`9`	`+ - conda-forge`
`8`	`10`	`dependencies:`
`9`	`11`	`- python`
`10`	`12`	`- kubernetes-helm`