From 1326b070af9d352f0fb2b96280d38f4938459ee8 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Fri, 6 Jul 2018 11:03:42 -0700 Subject: [PATCH 01/20] Updated Travis encrypted password Followed instructions on https://github.com/travis-ci/travis-ci/issues/7327 - you need to run "travis encrypt", paste in the password, hit enter and THEN hit CTRL+D --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d739efb..0188e09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,8 @@ jobs: user: simonw distributions: bdist_wheel password: - secure: ikY6iF+/2AxFlwcun35iAEz7Wbrnp0Fp7b32Z7uob5RsGpIDCYYDa3T/qNhiyNsg5fecGp01rBf1F+dL357b0rWEeaoONtsDrTKFeBUB6bMnzNtr3QbHq/TeQ1f+Vn6FWpY9360Ihbz0pKPzWWYHJxOjXPM793rGWmPu7siCc4oQZOpwLK28GZeFP803wq/QG81hFRWR8IiMlqljkecEGhaM6ftxzizk1LBoTZCw3DdL2xDwzrLvF3Hg1jXX08pJm9WrLJNS6i+LRhiLv9IJ5KxRDwNHJhrvblRrZn0CKVbiWR/8985r4R7CXaeG68uJ505RcVoXYRsq9D7mAcYAB3U5AzU9TsPQlvUgwJlFpKOsZlCw+5AHFIYUXvlP2Qo5kfXUYC9KKdJwbWjcW7isUqWpzInGfnmRNMJGzmIm2q65ua0FNLV4vK1wl98O60HFSyhXJi84YmCAPgidJ22sEA6sHAdMEFiWglhap12zPc6i7trXKC8aLjW/3qGXhUq3BK8vQcbutGer+Q3z9UM7kthB76FtCUVc8eqljtdAcGt5kXoHIEPwGb50ikOxo/qpXsXVH36Z6plbELbayXb3ocUrMdhWP5+kfnrdLEmx+X4IpUauxGUqLGliYSQpfjp8XyA87ASCjsSqUEjr/4t4YztW5a3mWBYZ+IjjYXW6PQg= + secure: MzK2klzjn+gYgTyDwgjzxsCmOWXTl3r1W9kr3Y2GzdBXFz6PuZSQLpej4WHhm8AVqfqFh6SF+tnVAr8CqQO//NJ5CDow0lSJI8XeRlRiaNds9UX/JbpeBVtlN6WIDaT2ErzadodIY+NB8vcuF3QCqElUCJuepuLb12X+DpPO6I1fXCWX+W61T0Jr2CHQ98EK5AkVpppcuPgqPtl8N5Nt0/7iO0hjHcT2kdr+5nzUIeS1bXcZy+aAeuI1zbq7znh6sSzdu9cE+Uq26DZPNvPs4bhi35aBCS1fZUb43/5IiOyLHp6BBXypRATBV8cpyMJs38YeEqDZP4HFo0jIh7uD+1WShJ5raYcOHU6aotGYTJmp9+9hwQqnXZMDAx21bdNRpptAYJjO3EGU1K8HwLGBu3Kx0KfhIk8yXk7/nazADkiNh8mvnCORwd4h656UhCG0D4Nb+OUYC+iyp/LD4C7l+sFX3/ObQ6G6J0I+QL/l4ElsaNlhOmdtrpoV/dXbaN7MLKDl9OkoY7NiIGC91DIqXjelNRD1bsNJRWqODDEq0uod4LOZR42+814+yv066USQguKIG/UwKkR0aTJ6u0Ul6ngk/tvCStGg2tNaIi2dLok911DL636+kWaf5UIQGANOPMeVtW18nMV2tudti5mhyrpX7LNuayTLk0piMDsQdvQ= + on: branch: master tags: true From dfbf48356ae7accc385012f951643ea6cfb6393b Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Fri, 6 Jul 2018 11:04:07 -0700 Subject: [PATCH 02/20] Removed rogue newline --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0188e09..47ea811 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,6 @@ jobs: distributions: bdist_wheel password: secure: MzK2klzjn+gYgTyDwgjzxsCmOWXTl3r1W9kr3Y2GzdBXFz6PuZSQLpej4WHhm8AVqfqFh6SF+tnVAr8CqQO//NJ5CDow0lSJI8XeRlRiaNds9UX/JbpeBVtlN6WIDaT2ErzadodIY+NB8vcuF3QCqElUCJuepuLb12X+DpPO6I1fXCWX+W61T0Jr2CHQ98EK5AkVpppcuPgqPtl8N5Nt0/7iO0hjHcT2kdr+5nzUIeS1bXcZy+aAeuI1zbq7znh6sSzdu9cE+Uq26DZPNvPs4bhi35aBCS1fZUb43/5IiOyLHp6BBXypRATBV8cpyMJs38YeEqDZP4HFo0jIh7uD+1WShJ5raYcOHU6aotGYTJmp9+9hwQqnXZMDAx21bdNRpptAYJjO3EGU1K8HwLGBu3Kx0KfhIk8yXk7/nazADkiNh8mvnCORwd4h656UhCG0D4Nb+OUYC+iyp/LD4C7l+sFX3/ObQ6G6J0I+QL/l4ElsaNlhOmdtrpoV/dXbaN7MLKDl9OkoY7NiIGC91DIqXjelNRD1bsNJRWqODDEq0uod4LOZR42+814+yv066USQguKIG/UwKkR0aTJ6u0Ul6ngk/tvCStGg2tNaIi2dLok911DL636+kWaf5UIQGANOPMeVtW18nMV2tudti5mhyrpX7LNuayTLk0piMDsQdvQ= - on: branch: master tags: true From 0f86e97d54ec94ba77d22e8d37765380c96c7039 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Fri, 6 Jul 2018 11:09:02 -0700 Subject: [PATCH 03/20] Added LICENSE file plus PyPI/license badge to README --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 3 + setup.py | 2 +- 3 files changed, 205 insertions(+), 1 deletion(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README.md b/README.md index 616aeef..22701ba 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # datasette-vega +[![PyPI](https://img.shields.io/pypi/v/datasette-vega.svg)](https://pypi.org/project/datasette-vega/) +[![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://github.com/simonw/datasette-vega/blob/master/LICENSE) + A [Datasette](https://github.com/simonw/datasette) plugin that provides tools for generating charts using [Vega](https://vega.github.io/). diff --git a/setup.py b/setup.py index faed859..f4e7ded 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from subprocess import check_output from wheel.bdist_wheel import bdist_wheel import os -VERSION = '0.5' +VERSION = '0.5.1' ROOT = os.path.dirname(os.path.abspath(__file__)) From 1d4c5b325486d37c42b1ccc299fc1e12cf5654af Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Fri, 6 Jul 2018 11:24:23 -0700 Subject: [PATCH 04/20] Another attempt at getting Travis PyPI working, refs #8 --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 47ea811..66d9a61 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,9 @@ jobs: user: simonw distributions: bdist_wheel password: - secure: MzK2klzjn+gYgTyDwgjzxsCmOWXTl3r1W9kr3Y2GzdBXFz6PuZSQLpej4WHhm8AVqfqFh6SF+tnVAr8CqQO//NJ5CDow0lSJI8XeRlRiaNds9UX/JbpeBVtlN6WIDaT2ErzadodIY+NB8vcuF3QCqElUCJuepuLb12X+DpPO6I1fXCWX+W61T0Jr2CHQ98EK5AkVpppcuPgqPtl8N5Nt0/7iO0hjHcT2kdr+5nzUIeS1bXcZy+aAeuI1zbq7znh6sSzdu9cE+Uq26DZPNvPs4bhi35aBCS1fZUb43/5IiOyLHp6BBXypRATBV8cpyMJs38YeEqDZP4HFo0jIh7uD+1WShJ5raYcOHU6aotGYTJmp9+9hwQqnXZMDAx21bdNRpptAYJjO3EGU1K8HwLGBu3Kx0KfhIk8yXk7/nazADkiNh8mvnCORwd4h656UhCG0D4Nb+OUYC+iyp/LD4C7l+sFX3/ObQ6G6J0I+QL/l4ElsaNlhOmdtrpoV/dXbaN7MLKDl9OkoY7NiIGC91DIqXjelNRD1bsNJRWqODDEq0uod4LOZR42+814+yv066USQguKIG/UwKkR0aTJ6u0Ul6ngk/tvCStGg2tNaIi2dLok911DL636+kWaf5UIQGANOPMeVtW18nMV2tudti5mhyrpX7LNuayTLk0piMDsQdvQ= + secure: dTKntPxKe9MXksoMT3RuCnFrxyI1eDmlKm6D0zWgiNcK1SHDgDzqc8/qV1iaBYaGetXaVzUFd2/Qp3wsSl/PTCKxN1XrHW5xapyqY0+S0qbNczAzRZkiWFK88I3VOg4KwxKbOYZUwya0mUH/PgH1NG9eRnF8cxYiFRo8YUc+7oAoP3jF7PMQxSazR2o9c3+pfhJT+x+edCUyX6qdXN+xos92ssRF3mAAMR2aKoa82i8fFyj10e+atjx39+93tVXbZqTULptDuZb1au0r9B40IDU2vhy7OEcht7W8CnqvZ93V2sJLBcibdiyDIe6aL+6OA3blaBlE2tiYPSijcSfGzCbzExRTbNE0wrc4MM169akGFmdA9HRYrLdvmzKykkopf9ep1cmpHQwdR/iepqtLryQZtSpjCtzunLWx47sY/wCY+CQsKzGNwhZYsC/mjg/XNZRHeIqv9gbPFOEmUA5JTZ/0r5rAtl5DPdyZN/M5WJ+UvGxIiaB/xileoVnivsfqvIm0Hx81rbMZOi9J4gDTYxvrq/pmarDI87wsQ/Sosp8UYsAz+9+aggYr4rdeQOxWVb9jU0qSma+ROw0whEqKZ9gar8PXXeRYVZd/MU5u2CYiTTqzqkGTX4sUeS/rtDVd3melGvOq6yY8REtvo9XP8S0kUtJjuSUV5KHjFB7ihjA= on: branch: master tags: true + repo: simonw/datasette-vega + From 8b650feca39c91c6befbe7d91e292479262b0664 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Fri, 6 Jul 2018 17:45:04 -0700 Subject: [PATCH 05/20] Preserve cache-busting URL prefix on js/css - closes #11 Also ensure we ship the .map files for better browser debugging. --- datasette_vega/__init__.py | 22 ++++++++++++++++++++-- setup.py | 9 +++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/datasette_vega/__init__.py b/datasette_vega/__init__.py index ea03f63..4173ee0 100644 --- a/datasette_vega/__init__.py +++ b/datasette_vega/__init__.py @@ -1,11 +1,29 @@ from datasette import hookimpl +import glob +import os + +cache = {} +static_dir = os.path.join( + os.path.dirname(__file__), 'static' +) + +def cached_filepaths_for_extension(extension): + pattern = os.path.join(static_dir, '*.{}'.format(extension)) + if pattern not in cache: + cache[pattern] = [ + "/-/static-plugins/datasette_vega/{}".format( + os.path.basename(g) + ) + for g in glob.glob(pattern) + ] + return cache[pattern] @hookimpl def extra_css_urls(): - return ["/-/static-plugins/datasette_vega/datasette-vega.css"] + return cached_filepaths_for_extension('css') @hookimpl def extra_js_urls(): - return ["/-/static-plugins/datasette_vega/datasette-vega.js"] + return cached_filepaths_for_extension('js') diff --git a/setup.py b/setup.py index f4e7ded..e2bb267 100644 --- a/setup.py +++ b/setup.py @@ -34,8 +34,8 @@ class BuildStatic(Command): check_output(['npm', 'install'], cwd=ROOT) check_output(['npm', 'run', 'build'], cwd=ROOT) check_output(['mkdir', '-p', 'datasette_vega/static'], cwd=ROOT) - check_output("mv build/static/js/*.js datasette_vega/static/datasette-vega.js", shell=True, cwd=ROOT) - check_output("mv build/static/css/*.css datasette_vega/static/datasette-vega.css", shell=True, cwd=ROOT) + check_output("mv build/static/js/* datasette_vega/static/", shell=True, cwd=ROOT) + check_output("mv build/static/css/* datasette_vega/static/", shell=True, cwd=ROOT) setup( @@ -55,8 +55,9 @@ setup( }, package_data={ 'datasette_vega': [ - 'static/datasette-vega.js', - 'static/datasette-vega.css', + 'static/*.js', + 'static/*.css', + 'static/*.map', ], }, cmdclass={ From 6d46cfd9710d7988ee487af148cdf255a7029c37 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Fri, 6 Jul 2018 17:47:28 -0700 Subject: [PATCH 06/20] Implemented tooltips, refs #10 Also switched to using React.createRef() --- src/DatasetteVega.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/DatasetteVega.js b/src/DatasetteVega.js index b2cf979..bb425c5 100644 --- a/src/DatasetteVega.js +++ b/src/DatasetteVega.js @@ -21,6 +21,8 @@ const unserialize = (s, prefix) => { return obj; }; +const escapeString = s => (s || '').replace(/"/g, '\\x22').replace(/'/g, '\\x27'); + class DatasetteVega extends Component { state = { show: false, @@ -33,6 +35,10 @@ class DatasetteVega extends Component { color_column: "", size_column: "" } + constructor(props) { + super(props); + this.chartRef = React.createRef(); + } markOptions = [ {"value": "bar", "name": "Bar"}, {"value": "line", "name": "Line"}, @@ -132,7 +138,8 @@ class DatasetteVega extends Component { const y_bin = !!/-bin$/.exec(this.state.y_type); let encoding = { x: {field: this.state.x_column, type: x_type, bin: x_bin}, - y: {field: this.state.y_column, type: y_type, bin: y_bin} + y: {field: this.state.y_column, type: y_type, bin: y_bin}, + tooltip: {field: "_tooltip_summary", type: "ordinal"}, } if (this.state.color_column) { encoding.color = {field: this.state.color_column, type: "nominal"}; @@ -144,11 +151,15 @@ class DatasetteVega extends Component { data: { url: this.jsonUrl() }, + transform: [{ + calculate: `'${escapeString(this.state.x_column)}: ' + datum['${escapeString(this.state.x_column)}'] + ', ${escapeString(this.state.y_column)}: ' + datum['${escapeString(this.state.y_column)}']`, + as: "_tooltip_summary" + }], mark: this.state.mark, encoding: encoding } if (spec.mark && spec.encoding.x.field && spec.encoding.y.field) { - vegaEmbed(this.chart, spec, {theme: 'quartz', tooltip: true}); + vegaEmbed(this.chartRef.current, spec, {theme: 'quartz', tooltip: true}); document.location.hash = '#' + this.serializeState(); this.props.onFragmentChange && this.props.onFragmentChange(); // Add to state so react debug tools can see it (for debugging): @@ -220,7 +231,7 @@ class DatasetteVega extends Component {
-
{ this.chart = c; }}>
+
: null ); From f4134b88ae71eda0ea2251210f75945a82516369 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Fri, 6 Jul 2018 17:48:12 -0700 Subject: [PATCH 07/20] Releasing 0.6 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e2bb267..a449532 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from subprocess import check_output from wheel.bdist_wheel import bdist_wheel import os -VERSION = '0.5.1' +VERSION = '0.6' ROOT = os.path.dirname(os.path.abspath(__file__)) From 4668dce287e1b033b3cf45048b6c9c41ffaf16fd Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Sat, 7 Jul 2018 08:45:19 -0700 Subject: [PATCH 08/20] Another attempt to get PyPI deploy working - #8 This time I generated the secure field like this: $ travis encrypt -r simonw/datasette-vega Reading from stdin, press Ctrl+D when done PASTED-PASSWORD-HERE - then hit enter Please add the following to your .travis.yml file: secure: "n..." --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 66d9a61..237ee0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ jobs: user: simonw distributions: bdist_wheel password: - secure: dTKntPxKe9MXksoMT3RuCnFrxyI1eDmlKm6D0zWgiNcK1SHDgDzqc8/qV1iaBYaGetXaVzUFd2/Qp3wsSl/PTCKxN1XrHW5xapyqY0+S0qbNczAzRZkiWFK88I3VOg4KwxKbOYZUwya0mUH/PgH1NG9eRnF8cxYiFRo8YUc+7oAoP3jF7PMQxSazR2o9c3+pfhJT+x+edCUyX6qdXN+xos92ssRF3mAAMR2aKoa82i8fFyj10e+atjx39+93tVXbZqTULptDuZb1au0r9B40IDU2vhy7OEcht7W8CnqvZ93V2sJLBcibdiyDIe6aL+6OA3blaBlE2tiYPSijcSfGzCbzExRTbNE0wrc4MM169akGFmdA9HRYrLdvmzKykkopf9ep1cmpHQwdR/iepqtLryQZtSpjCtzunLWx47sY/wCY+CQsKzGNwhZYsC/mjg/XNZRHeIqv9gbPFOEmUA5JTZ/0r5rAtl5DPdyZN/M5WJ+UvGxIiaB/xileoVnivsfqvIm0Hx81rbMZOi9J4gDTYxvrq/pmarDI87wsQ/Sosp8UYsAz+9+aggYr4rdeQOxWVb9jU0qSma+ROw0whEqKZ9gar8PXXeRYVZd/MU5u2CYiTTqzqkGTX4sUeS/rtDVd3melGvOq6yY8REtvo9XP8S0kUtJjuSUV5KHjFB7ihjA= + secure: "n05R72PmilqomYlw25ssAJhmAtG8x/FMQsZVLfZc8tIjQ9DJOqm1GsmDzaBL2BoqyHWUW8ByuCjen+9Tr2Brx02P8YpyGihvdPcf7V7WLVHHWb6dtLDDnmtOqKd7JrbaufO5u7dLf+UzqueRqsTJl58ZgHM6/9QES8GfzQsf6gz+inO7tyg4Ik5imAPVAcmW8y7lSVXrEjamtqgN41+Z07G204hQCE8BdH8unmz6vbhSZ0UdYef6BoCsstby+fx9+l6z6xMzjxPvZkx7LK71ODBLhtLdU+fj0uAZwHNzneV9Zkc+OpINjmc/c1vntZQMdGVqzvbM3QLq8aLjU3c7VhwRNKuhw5I7G60mZ6dg10Mt/zSXKRwrxxPRgReCV2KwzEhT9jmxbFYhkKHNGnlxTwkUYuNS2okFBMC/UQm+VxAqE/pA0aHFAZtsfo+S13ZlqJ5ZYMENHRVL/x8P+v57eQArgZfizsWkDhpV9coKyJXTveOYJ1M7B7CAYnYe/NqmIzItFk3s1wpgXGqITQ9b4QmvyaeQI0m6G0SJqazFWQOnNaF5Oacp+aoNfdGrqUDpTgq6AeYlDmlOgOqV0/2Z4OZmUlN45CDLUyNMFMGFdqjcNJqZBiskZOjbzxqWboxmDwlIneIM6UuwQ5k58KgUXB9iIDPRLDhCJu9roqi8Et0=" on: branch: master tags: true From ff0ab28c26b4dd3c8a7d61d129b882ff8c4d88f8 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Mon, 9 Jul 2018 19:37:15 -0700 Subject: [PATCH 09/20] Include size/color in tooltip if specified, refs #10 --- src/DatasetteVega.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/DatasetteVega.js b/src/DatasetteVega.js index bb425c5..b617a01 100644 --- a/src/DatasetteVega.js +++ b/src/DatasetteVega.js @@ -152,7 +152,12 @@ class DatasetteVega extends Component { url: this.jsonUrl() }, transform: [{ - calculate: `'${escapeString(this.state.x_column)}: ' + datum['${escapeString(this.state.x_column)}'] + ', ${escapeString(this.state.y_column)}: ' + datum['${escapeString(this.state.y_column)}']`, + calculate: ` + '${escapeString(this.state.x_column)}: ' + datum['${escapeString(this.state.x_column)}'] + + ', ${escapeString(this.state.y_column)}: ' + datum['${escapeString(this.state.y_column)}'] + + (${!!this.state.color_column} ? ', ${escapeString(this.state.color_column)}: ' + datum['${escapeString(this.state.color_column)}'] : '') + + (${!!this.state.size_column} ? ', ${escapeString(this.state.size_column)}: ' + datum['${escapeString(this.state.size_column)}'] : '') + `, as: "_tooltip_summary" }], mark: this.state.mark, From 17645264cd32a7ec7ed10907adf8c442518283b2 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Mon, 9 Jul 2018 19:45:05 -0700 Subject: [PATCH 10/20] Release version 0.6.1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a449532..ad467a5 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from subprocess import check_output from wheel.bdist_wheel import bdist_wheel import os -VERSION = '0.6' +VERSION = '0.6.1' ROOT = os.path.dirname(os.path.abspath(__file__)) From bad9715ae5d52f51e97ccfb6a159940bed01ee1e Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Mon, 9 Jul 2018 20:02:01 -0700 Subject: [PATCH 11/20] Another attempt at setting PyPI password secret This time using recipe from https://github.com/travis-ci/travis-ci/issues/8339#issuecomment-327633364 echo -n "" | travis encrypt --add deploy.password -r simonw/datasette-vega --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 237ee0e..953ac19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,9 +31,8 @@ jobs: user: simonw distributions: bdist_wheel password: - secure: "n05R72PmilqomYlw25ssAJhmAtG8x/FMQsZVLfZc8tIjQ9DJOqm1GsmDzaBL2BoqyHWUW8ByuCjen+9Tr2Brx02P8YpyGihvdPcf7V7WLVHHWb6dtLDDnmtOqKd7JrbaufO5u7dLf+UzqueRqsTJl58ZgHM6/9QES8GfzQsf6gz+inO7tyg4Ik5imAPVAcmW8y7lSVXrEjamtqgN41+Z07G204hQCE8BdH8unmz6vbhSZ0UdYef6BoCsstby+fx9+l6z6xMzjxPvZkx7LK71ODBLhtLdU+fj0uAZwHNzneV9Zkc+OpINjmc/c1vntZQMdGVqzvbM3QLq8aLjU3c7VhwRNKuhw5I7G60mZ6dg10Mt/zSXKRwrxxPRgReCV2KwzEhT9jmxbFYhkKHNGnlxTwkUYuNS2okFBMC/UQm+VxAqE/pA0aHFAZtsfo+S13ZlqJ5ZYMENHRVL/x8P+v57eQArgZfizsWkDhpV9coKyJXTveOYJ1M7B7CAYnYe/NqmIzItFk3s1wpgXGqITQ9b4QmvyaeQI0m6G0SJqazFWQOnNaF5Oacp+aoNfdGrqUDpTgq6AeYlDmlOgOqV0/2Z4OZmUlN45CDLUyNMFMGFdqjcNJqZBiskZOjbzxqWboxmDwlIneIM6UuwQ5k58KgUXB9iIDPRLDhCJu9roqi8Et0=" + secure: Sl2jbgIhnr2IMHh3Hqg4yO0UsAOS/GYyJf3KdqfCHRHVTiHZaIKqMzcy/ErNzj11vqZcKHDdKEXWtqRLhKL6ZUlHxDeFa3wrfIe8QXwCnn1gmQddvl06ydr2WXjUKyL6f+q6pfON5O6R40NUqXxDr78YIE+uOu4FFJLODfSNRZxf6BP0qLU2wiDf86wxJf95kG3DPGNx2JRGQJqI2jSY30BL0QUCBpwHfF1wpzEp7+nX1vCnEEz2LsP8xGPDzFwNuj8px5HDjK6rRw9M8LP6CKsa65IK2pFwrOmLF0DnperwmgKBzF+atke/NQUlfHAaLjVKvA2w4Ff2xuH8v5ZGGg/gTi283CfFNhWHs2TGAZevAmsrRFKDhG6lTIUhCMSqcleL0moHZXoW0M5Xuwe3qQgJ8jw7OFJTJ3iGRzQnThp70F4XiHLeu+u0gvJOaNmG/xA/fVf6fFZbvCciIaqMrrdC0s/RLmsSOAMz8I767Pnby55Srlk8aYjlKma8lX37UlwYiF+xKgmHuXNtX0x1eQtFedFSgGLpXSsI6MyFcMbghmaTIPS6if8UfX1notbk6lb++nZiZ3ci4/Htl0t4zGBc1WAuBIlfYeS67JuiDXORP/XJRf+k6I4qsZJfInX5R1Nl2JiCNvc51o5fERu3RQpt8rob/46mOZx8UMcH9JY= on: branch: master tags: true repo: simonw/datasette-vega - From 5cc4e521ea163fe0e93b7345e9e207c411efe46b Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Mon, 9 Jul 2018 20:25:32 -0700 Subject: [PATCH 12/20] Let's try using PYPI_PASSWORD as a secret setting instead, refs #10 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 953ac19..200d19f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,8 +30,7 @@ jobs: - provider: pypi user: simonw distributions: bdist_wheel - password: - secure: Sl2jbgIhnr2IMHh3Hqg4yO0UsAOS/GYyJf3KdqfCHRHVTiHZaIKqMzcy/ErNzj11vqZcKHDdKEXWtqRLhKL6ZUlHxDeFa3wrfIe8QXwCnn1gmQddvl06ydr2WXjUKyL6f+q6pfON5O6R40NUqXxDr78YIE+uOu4FFJLODfSNRZxf6BP0qLU2wiDf86wxJf95kG3DPGNx2JRGQJqI2jSY30BL0QUCBpwHfF1wpzEp7+nX1vCnEEz2LsP8xGPDzFwNuj8px5HDjK6rRw9M8LP6CKsa65IK2pFwrOmLF0DnperwmgKBzF+atke/NQUlfHAaLjVKvA2w4Ff2xuH8v5ZGGg/gTi283CfFNhWHs2TGAZevAmsrRFKDhG6lTIUhCMSqcleL0moHZXoW0M5Xuwe3qQgJ8jw7OFJTJ3iGRzQnThp70F4XiHLeu+u0gvJOaNmG/xA/fVf6fFZbvCciIaqMrrdC0s/RLmsSOAMz8I767Pnby55Srlk8aYjlKma8lX37UlwYiF+xKgmHuXNtX0x1eQtFedFSgGLpXSsI6MyFcMbghmaTIPS6if8UfX1notbk6lb++nZiZ3ci4/Htl0t4zGBc1WAuBIlfYeS67JuiDXORP/XJRf+k6I4qsZJfInX5R1Nl2JiCNvc51o5fERu3RQpt8rob/46mOZx8UMcH9JY= + password: ${PYPI_PASSWORD} on: branch: master tags: true From b05dd7792eb624d702a12dc3ebb91308016ac25d Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Sat, 28 Jul 2018 17:13:14 -0700 Subject: [PATCH 13/20] Fix leaking CSS bug (fix #15) and release 0.6.2 --- public/index.html | 2 +- setup.py | 2 +- src/index.css | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/index.html b/public/index.html index 0b14e70..2df60a7 100644 --- a/public/index.html +++ b/public/index.html @@ -7,7 +7,7 @@ Datasette Vega - +

Datasette Vega

Enter the URL of the JSON version of any Datasette table:

diff --git a/setup.py b/setup.py index ad467a5..ee5e7e1 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from subprocess import check_output from wheel.bdist_wheel import bdist_wheel import os -VERSION = '0.6.1' +VERSION = '0.6.2' ROOT = os.path.dirname(os.path.abspath(__file__)) diff --git a/src/index.css b/src/index.css index cbabe2a..983aee4 100644 --- a/src/index.css +++ b/src/index.css @@ -1,14 +1,14 @@ -body { +body.datasette-vega-demo { margin: 0; padding: 1em; font-family: sans-serif; } -form div { +body.datasette-vega-demo form div { margin-bottom: 0.5em } -label { +body.datasette-vega-demo label { padding-right: 0.5em; } From 1db45bd8f1c3c17f8b05aba7159542bcaffffad8 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Tue, 16 Jun 2020 12:11:25 -0700 Subject: [PATCH 14/20] Removed link to the now-departed Datasette Publish site --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 22701ba..b634a87 100644 --- a/README.md +++ b/README.md @@ -20,5 +20,3 @@ If you are publishing data using the `datasette publish` command, you can include this plugin like so: datasette publish now mydatabase.db --install=datasette-vega - -If you don't want to install any software at all, you can publish your CSV files with Datasette and activate this plugin using the web application at https://publish.datasettes.com/ From 8b54a0f175679b6ad634a6a107c779223bfb1885 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Thu, 3 Sep 2020 19:34:27 -0700 Subject: [PATCH 15/20] Added a test --- setup.py | 3 ++- tests/test_vega.py | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 tests/test_vega.py diff --git a/setup.py b/setup.py index ee5e7e1..149a92e 100644 --- a/setup.py +++ b/setup.py @@ -64,5 +64,6 @@ setup( 'bdist_wheel': BdistWheelWithBuildStatic, 'build_static': BuildStatic, }, - install_requires=['datasette'] + install_requires=['datasette'], + extras_require={"test": ["pytest", "pytest-asyncio", "httpx"]} ) diff --git a/tests/test_vega.py b/tests/test_vega.py new file mode 100644 index 0000000..72aef02 --- /dev/null +++ b/tests/test_vega.py @@ -0,0 +1,13 @@ +from datasette.app import Datasette +import pytest +import httpx + + +@pytest.mark.asyncio +async def test_plugin_is_installed(): + app = Datasette([], memory=True).app() + async with httpx.AsyncClient(app=app) as client: + response = await client.get("http://localhost/-/plugins.json") + assert response.status_code == 200 + installed_plugins = {p["name"] for p in response.json()} + assert "datasette-vega" in installed_plugins From 04b904add3ec1dc8b4cadf531204d38d209085fa Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Thu, 3 Sep 2020 19:34:40 -0700 Subject: [PATCH 16/20] Only inject assets on table page --- datasette_vega/__init__.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/datasette_vega/__init__.py b/datasette_vega/__init__.py index 4173ee0..585e26c 100644 --- a/datasette_vega/__init__.py +++ b/datasette_vega/__init__.py @@ -20,10 +20,12 @@ def cached_filepaths_for_extension(extension): @hookimpl -def extra_css_urls(): - return cached_filepaths_for_extension('css') +def extra_css_urls(view_name): + if view_name == "table": + return cached_filepaths_for_extension('css') @hookimpl -def extra_js_urls(): - return cached_filepaths_for_extension('js') +def extra_js_urls(view_name): + if view_name == "table": + return cached_filepaths_for_extension('js') From 033ee204bb8df067b1333d5a06acf2af79de065e Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Thu, 3 Sep 2020 19:34:52 -0700 Subject: [PATCH 17/20] Applied Black --- datasette_vega/__init__.py | 15 ++++------ setup.py | 59 ++++++++++++++++++++------------------ 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/datasette_vega/__init__.py b/datasette_vega/__init__.py index 585e26c..ac80b52 100644 --- a/datasette_vega/__init__.py +++ b/datasette_vega/__init__.py @@ -3,17 +3,14 @@ import glob import os cache = {} -static_dir = os.path.join( - os.path.dirname(__file__), 'static' -) +static_dir = os.path.join(os.path.dirname(__file__), "static") + def cached_filepaths_for_extension(extension): - pattern = os.path.join(static_dir, '*.{}'.format(extension)) + pattern = os.path.join(static_dir, "*.{}".format(extension)) if pattern not in cache: cache[pattern] = [ - "/-/static-plugins/datasette_vega/{}".format( - os.path.basename(g) - ) + "/-/static-plugins/datasette_vega/{}".format(os.path.basename(g)) for g in glob.glob(pattern) ] return cache[pattern] @@ -22,10 +19,10 @@ def cached_filepaths_for_extension(extension): @hookimpl def extra_css_urls(view_name): if view_name == "table": - return cached_filepaths_for_extension('css') + return cached_filepaths_for_extension("css") @hookimpl def extra_js_urls(view_name): if view_name == "table": - return cached_filepaths_for_extension('js') + return cached_filepaths_for_extension("js") diff --git a/setup.py b/setup.py index 149a92e..a2753f6 100644 --- a/setup.py +++ b/setup.py @@ -4,20 +4,21 @@ from subprocess import check_output from wheel.bdist_wheel import bdist_wheel import os -VERSION = '0.6.2' +VERSION = "0.6.2" ROOT = os.path.dirname(os.path.abspath(__file__)) def get_long_description(): - with open(os.path.join( - os.path.dirname(os.path.abspath(__file__)), 'README.md' - ), encoding='utf8') as fp: + with open( + os.path.join(os.path.dirname(os.path.abspath(__file__)), "README.md"), + encoding="utf8", + ) as fp: return fp.read() class BdistWheelWithBuildStatic(bdist_wheel): def run(self): - self.run_command('build_static') + self.run_command("build_static") return bdist_wheel.run(self) @@ -31,39 +32,41 @@ class BuildStatic(Command): pass def run(self): - check_output(['npm', 'install'], cwd=ROOT) - check_output(['npm', 'run', 'build'], cwd=ROOT) - check_output(['mkdir', '-p', 'datasette_vega/static'], cwd=ROOT) - check_output("mv build/static/js/* datasette_vega/static/", shell=True, cwd=ROOT) - check_output("mv build/static/css/* datasette_vega/static/", shell=True, cwd=ROOT) + check_output(["npm", "install"], cwd=ROOT) + check_output(["npm", "run", "build"], cwd=ROOT) + check_output(["mkdir", "-p", "datasette_vega/static"], cwd=ROOT) + check_output( + "mv build/static/js/* datasette_vega/static/", shell=True, cwd=ROOT + ) + check_output( + "mv build/static/css/* datasette_vega/static/", shell=True, cwd=ROOT + ) setup( - name='datasette-vega', - description='A Datasette plugin that provides tools for generating charts using Vega', + name="datasette-vega", + description="A Datasette plugin that provides tools for generating charts using Vega", long_description=get_long_description(), - long_description_content_type='text/markdown', - author='Simon Willison', - url='https://github.com/simonw/datasette-vega', - license='Apache License, Version 2.0', + long_description_content_type="text/markdown", + author="Simon Willison", + url="https://github.com/simonw/datasette-vega", + license="Apache License, Version 2.0", version=VERSION, - packages=['datasette_vega'], + packages=["datasette_vega"], entry_points={ - 'datasette': [ - 'vega = datasette_vega' - ], + "datasette": ["vega = datasette_vega"], }, package_data={ - 'datasette_vega': [ - 'static/*.js', - 'static/*.css', - 'static/*.map', + "datasette_vega": [ + "static/*.js", + "static/*.css", + "static/*.map", ], }, cmdclass={ - 'bdist_wheel': BdistWheelWithBuildStatic, - 'build_static': BuildStatic, + "bdist_wheel": BdistWheelWithBuildStatic, + "build_static": BuildStatic, }, - install_requires=['datasette'], - extras_require={"test": ["pytest", "pytest-asyncio", "httpx"]} + install_requires=["datasette"], + extras_require={"test": ["pytest", "pytest-asyncio", "httpx"]}, ) From 8cea6b438831b74367393af1cd29e9eb153ba00f Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Thu, 3 Sep 2020 19:35:40 -0700 Subject: [PATCH 18/20] Release 0.7a0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a2753f6..8dc8722 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from subprocess import check_output from wheel.bdist_wheel import bdist_wheel import os -VERSION = "0.6.2" +VERSION = "0.7a0" ROOT = os.path.dirname(os.path.abspath(__file__)) From 00de059ab1ef77394ba9f9547abfacf966c479c4 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Fri, 10 Dec 2021 14:20:41 -0800 Subject: [PATCH 19/20] Upgrade to latest Vega/React, refs #29 --- package.json | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index fdab351..969c2a2 100644 --- a/package.json +++ b/package.json @@ -3,17 +3,28 @@ "version": "0.1.0", "private": true, "dependencies": { - "react": "^16.4.1", - "react-dom": "^16.4.1", - "react-scripts": "1.1.4", - "source-map-explorer": "^1.5.0", - "vega-embed": "^3.15.0", - "vega-lib": "^4.0.0-rc.3" + "react": "^17.0.2", + "react-dom": "^17.0.2", + "react-scripts": "^4.0.3", + "vega-embed": "^6.20.5", + "vega-lib": "^4.4.0" }, "scripts": { "start": "REACT_APP_STAGE=dev react-scripts start", "build": "react-scripts build", "test": "react-scripts test --env=jsdom", "eject": "react-scripts eject" + }, + "browserslist": { + "production": [ + ">0.2%", + "not dead", + "not op_mini all" + ], + "development": [ + "last 1 chrome version", + "last 1 firefox version", + "last 1 safari version" + ] } } From 6fe66c4c9d0dba0a6eb636583914d2ed7d3d72a9 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Sun, 2 Nov 2025 10:26:58 -0800 Subject: [PATCH 20/20] Fix for httpx.AsyncClient(app=app) Refs https://github.com/simonw/datasette/issues/2549 --- tests/test_vega.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/test_vega.py b/tests/test_vega.py index 72aef02..a77cd7f 100644 --- a/tests/test_vega.py +++ b/tests/test_vega.py @@ -1,13 +1,11 @@ -from datasette.app import Datasette import pytest -import httpx +from datasette.app import Datasette @pytest.mark.asyncio async def test_plugin_is_installed(): - app = Datasette([], memory=True).app() - async with httpx.AsyncClient(app=app) as client: - response = await client.get("http://localhost/-/plugins.json") - assert response.status_code == 200 - installed_plugins = {p["name"] for p in response.json()} - assert "datasette-vega" in installed_plugins + ds = Datasette([], memory=True) + response = await ds.client.get("/-/plugins.json") + assert response.status_code == 200 + installed_plugins = {p["name"] for p in response.json()} + assert "datasette-vega" in installed_plugins