diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 07e41ced3f..9f39a394cf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -699,7 +699,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 index ff3824a6ab..06f97fd607 100644 --- 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 index 31e6786421..2f2d68adeb 160000 --- a/docs/examples/quickstart/go +++ b/docs/examples/quickstart/go @@ -1 +1 @@ -Subproject commit 31e6786421c6d737958cb2c8f1a5f6eea1b0268d +Subproject commit 2f2d68adeb543385d1b24af520ec3eebc46246dc diff --git a/docs/examples/quickstart/java b/docs/examples/quickstart/java index 2ed954399c..20404c6198 160000 --- a/docs/examples/quickstart/java +++ b/docs/examples/quickstart/java @@ -1 +1 @@ -Subproject commit 2ed954399cf4172755fd82f709a7de73470b8da7 +Subproject commit 20404c6198a119f4107b42db1074ff3327ae736c diff --git a/docs/examples/quickstart/nodejs b/docs/examples/quickstart/nodejs index 111a4a2026..02cf928bdb 160000 --- a/docs/examples/quickstart/nodejs +++ b/docs/examples/quickstart/nodejs @@ -1 +1 @@ -Subproject commit 111a4a202641ee9eec6e678528377fb377dbd892 +Subproject commit 02cf928bdb4dbb1b9160b4b24b3e016998900af4 diff --git a/docs/examples/quickstart/python b/docs/examples/quickstart/python index 098880f68e..3872a45d40 160000 --- a/docs/examples/quickstart/python +++ b/docs/examples/quickstart/python @@ -1 +1 @@ -Subproject commit 098880f68e923374acde4e622284d9445cf888cd +Subproject commit 3872a45d408f6890bb6d363f42e74d1bc819b7a5 diff --git a/docs/examples/quickstart/ruby b/docs/examples/quickstart/ruby index 71ab7db39b..a016aaf143 160000 --- a/docs/examples/quickstart/ruby +++ b/docs/examples/quickstart/ruby @@ -1 +1 @@ -Subproject commit 71ab7db39b9cc99d32d6ab152f8b6880c0c0bb6c +Subproject commit a016aaf143b88cee8c2b8a330dc26e8e3df241c4 diff --git a/docs/examples/quickstart/rust b/docs/examples/quickstart/rust index f11ac403cc..0a1e687c59 160000 --- a/docs/examples/quickstart/rust +++ b/docs/examples/quickstart/rust @@ -1 +1 @@ -Subproject commit f11ac403ccd3e591858aea19d0f31e2584920c1c +Subproject commit 0a1e687c59e5f7b6e8d7f0ae905676b744bee13d diff --git a/docs/examples/quickstart/test_quickstarts.rb b/docs/examples/quickstart/test_quickstarts.rb index b46e2a23cb..a0fcfdda88 100644 --- 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 index b5665acace..941f14bf28 100644 --- 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