[Django] Use name of variable instead of Python variable repr. (osohq…

…#1568) * [Django] Use name of variable instead of Python variable repr. * Run `go mod tidy` before testing * Drop tests for Python 3.6 on Windows No longer supported by action actions/setup-python#355 (comment) * Update submodules.
bbatchelder · May 16, 2022 · 4339c20 · 4339c20
1 parent c12a268
commit 4339c20
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -736,7 +736,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
     steps:
       - uses: actions/checkout@v2
       - name: Set version env

diff --git a/docs/examples/add-to-your-application/go/Makefile b/docs/examples/add-to-your-application/go/Makefile
@@ -2,4 +2,5 @@
 
 test:
 	make -C ../../../../languages/go copy_lib
+	go mod tidy
 	go test
diff --git a/docs/examples/quickstart/go b/docs/examples/quickstart/go
diff --git a/docs/examples/quickstart/java b/docs/examples/quickstart/java
diff --git a/docs/examples/quickstart/nodejs b/docs/examples/quickstart/nodejs
diff --git a/docs/examples/quickstart/python b/docs/examples/quickstart/python
diff --git a/docs/examples/quickstart/ruby b/docs/examples/quickstart/ruby
diff --git a/docs/examples/quickstart/rust b/docs/examples/quickstart/rust
diff --git a/docs/examples/quickstart/test_quickstarts.rb b/docs/examples/quickstart/test_quickstarts.rb
@@ -11,7 +11,7 @@
 
 
 quickstarts = {
-  go: { setup: 'go build', server: './oso-go-quickstart' },
+  go: { setup: 'go mod tidy && go build', server: './oso-go-quickstart' },
   # TODO: add local_setup that tests against local Oso install for java
   java: { setup: 'make install', server: 'make run' },
   # TODO: add local_setup that tests against local Oso install for nodejs
@@ -22,7 +22,7 @@
 }
 
 if ARGV.include? "local"
-  quickstarts[:go][:setup] = "make -C ../../../../languages/go copy_lib && go mod edit -replace github.com/osohq/go-oso=../../../../languages/go && go build"
+  quickstarts[:go][:setup] = "make -C ../../../../languages/go copy_lib && go mod edit -replace github.com/osohq/go-oso=../../../../languages/go && go mod tidy && go build"
   quickstarts[:python][:setup] = "pip install -e ../../../../languages/python/oso && pip install --upgrade -r requirements.txt"
   quickstarts[:ruby][:setup] = "BUNDLE_GEMFILE=../Gemfile-local bundle"
   quickstarts[:ruby][:server] = "BUNDLE_GEMFILE=../Gemfile-local bundle exec ruby server.rb"

diff --git a/languages/python/django-oso/django_oso/partial.py b/languages/python/django-oso/django_oso/partial.py
@@ -57,7 +57,9 @@ def get_model_by_path(
 
 class FilterBuilder:
     def __init__(self, model: Model, name="_this", parent=None):
-        self.name = name
+        self.name = (
+            super(Variable, name).__str__() if isinstance(name, Variable) else name
+        )
         self.model = model
         self.filter = TRUE_FILTER
         # Map variables to subquery
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,5 @@ @@
     test:
     	make -C ../../../../languages/go copy_lib
+    	go mod tidy
     	go test