Split (1)

train · 69.7k rows

Subsets and Splits

No community queries yet

The top public SQL queries from the community will appear here once available.

in_source_id stringlengths 13 58	issue stringlengths 3 241k	before_files listlengths 0 3	after_files listlengths 0 3	pr_diff stringlengths 109 107M ⌀
huggingface__transformers-9427	Improve coverage of the documentation Currently, some public classes are not documented anywhere because we didn't create the corresponding doc pages. Those missing pages are: - Benchmark classes - Bert Japanese - Data collators If someone feels like working on one of those, please tag yourself with a comment on this issue. Once the objects are properly documented, they can be removed from the `SHOULD_BE_DOCUMENTED` constant in [this file](https://github.com/huggingface/transformers/blob/1310e1a758edc8e89ec363db76863c771fbeb1de/utils/check_repo.py#L374).	[ { "content": "# coding=utf-8\n# Copyright 2020 The HuggingFace Inc. team.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#...	[ { "content": "# coding=utf-8\n# Copyright 2020 The HuggingFace Inc. team.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#...	diff --git a/docs/source/index.rst b/docs/source/index.rst index 43b73efcb446..35b801278a61 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -388,6 +388,7 @@ TensorFlow and/or Flax. model_doc/gpt model_doc/gpt2 model_doc/pegasus + model_doc/phobert model_doc/prophetnet model_doc/rag model_doc/reformer diff --git a/docs/source/model_doc/phobert.rst b/docs/source/model_doc/phobert.rst new file mode 100644 index 000000000000..5ef99b40801d --- /dev/null +++ b/docs/source/model_doc/phobert.rst @@ -0,0 +1,59 @@ +.. + Copyright 2020 The HuggingFace Team. All rights reserved. + + 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. + +PhoBERT +----------------------------------------------------------------------------------------------------------------------- + +Overview +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The PhoBERT model was proposed in `PhoBERT: Pre-trained language models for Vietnamese +<https://www.aclweb.org/anthology/2020.findings-emnlp.92.pdf>`__ by Dat Quoc Nguyen, Anh Tuan Nguyen. + +The abstract from the paper is the following: + +We present PhoBERT with two versions, PhoBERT-base and PhoBERT-large, the first public large-scale monolingual +language models pre-trained for Vietnamese. Experimental results show that PhoBERT consistently outperforms the recent +best pre-trained multilingual model XLM-R (Conneau et al., 2020) and improves the state-of-the-art in multiple +Vietnamese-specific NLP tasks including Part-of-speech tagging, Dependency parsing, Named-entity recognition and +Natural language inference. + +Example of use: + +.. code-block:: + + import torch + from transformers import AutoModel, AutoTokenizer + + phobert = AutoModel.from_pretrained("vinai/phobert-base") + tokenizer = AutoTokenizer.from_pretrained("vinai/phobert-base") + + # INPUT TEXT MUST BE ALREADY WORD-SEGMENTED! + line = "Tôi là sinh_viên trường đại_học Công_nghệ ." + + input_ids = torch.tensor([tokenizer.encode(line)]) + + with torch.no_grad(): + features = phobert(input_ids) # Models outputs are now tuples + + ## With TensorFlow 2.0+: + # from transformers import TFAutoModel + # phobert = TFAutoModel.from_pretrained("vinai/phobert-base") + + +The original code can be found `here <https://github.com/VinAIResearch/PhoBERT>`__. + +PhobertTokenizer +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. autoclass:: transformers.PhobertTokenizer + :members: diff --git a/utils/check_repo.py b/utils/check_repo.py index 0f6f9db8aa24..aefac35684a4 100644 --- a/utils/check_repo.py +++ b/utils/check_repo.py @@ -402,8 +402,6 @@ def find_all_documented_objects(): "BertJapaneseTokenizer", "CharacterTokenizer", "MecabTokenizer", - # Phoebus - "PhobertTokenizer", # Benchmarks "PyTorchBenchmark", "PyTorchBenchmarkArguments",
mozilla__bugbug-3334	Use information on how a bug is filed as a feature This could be especially useful for the Spam model. https://bugzilla.mozilla.org/show_bug.cgi?id=1565403	[ { "content": "# -- coding: utf-8 --\n# This Source Code Form is subject to the terms of the Mozilla Public\n# License, v. 2.0. If a copy of the MPL was not distributed with this file,\n# You can obtain one at http://mozilla.org/MPL/2.0/.\n\nimport xgboost\nfrom imblearn.over_sampling import BorderlineSMOTE\nf...	[ { "content": "# -- coding: utf-8 --\n# This Source Code Form is subject to the terms of the Mozilla Public\n# License, v. 2.0. If a copy of the MPL was not distributed with this file,\n# You can obtain one at http://mozilla.org/MPL/2.0/.\n\nimport xgboost\nfrom imblearn.over_sampling import BorderlineSMOTE\nf...	diff --git a/bugbug/models/spambug.py b/bugbug/models/spambug.py index f37362028e..9c10a614b3 100644 --- a/bugbug/models/spambug.py +++ b/bugbug/models/spambug.py @@ -41,6 +41,7 @@ def __init__(self, lemmatization=False): bug_features.has_attachment(), bug_features.platform(), bug_features.op_sys(), + bug_features.filed_via(), ] cleanup_functions = [
sopel-irc__sopel-1325	[Bugzilla] Error calling shutdown method for module bugzilla:None Noticed this in my logs. Bugzilla shutdown throwing none. On Sopel 6.5.3, Python 3.5.3. ``` Ping timeout reached after 120 seconds, closing connection Calling shutdown for 2 modules. calling reddit.shutdown calling bugzilla.shutdown Error calling shutdown method for module bugzilla:None Closed! Warning: Disconnected. Reconnecting in 20 seconds... Welcome to Sopel. Loading modules... ```	[ { "content": "# coding=utf-8\n\"\"\"Bugzilla issue reporting module\n\nCopyright 2013-2015, Embolalia, embolalia.com\nLicensed under the Eiffel Forum License 2.\n\"\"\"\nfrom __future__ import unicode_literals, absolute_import, print_function, division\n\nimport re\n\nimport xmltodict\n\nfrom sopel import web, ...	[ { "content": "# coding=utf-8\n\"\"\"Bugzilla issue reporting module\n\nCopyright 2013-2015, Embolalia, embolalia.com\nLicensed under the Eiffel Forum License 2.\n\"\"\"\nfrom __future__ import unicode_literals, absolute_import, print_function, division\n\nimport re\n\nimport xmltodict\n\nfrom sopel import web, ...	diff --git a/sopel/modules/bugzilla.py b/sopel/modules/bugzilla.py index c87ff08e09..bb054bc68b 100644 --- a/sopel/modules/bugzilla.py +++ b/sopel/modules/bugzilla.py @@ -52,7 +52,12 @@ def setup(bot): def shutdown(bot): - del bot.memory['url_callbacks'][regex] + try: + del bot.memory['url_callbacks'][regex] + except KeyError: + # bot.config.bugzilla.domains was probably just empty on startup + # everything's daijoubu + pass @rule(r'.*https?://(\S+?)'
beetbox__beets-3774	FetchArt crashes with TypeError for particular album I've imported hundreds of albums just fine using `fetchart` in `auto` mode, and then this one came along and crashed the import. The issue in short: ``` File "/usr/local/lib/python3.7/dist-packages/beetsplug/fetchart.py", line 416, in get self.API_ALBUMS + album.mb_releasegroupid, TypeError: can only concatenate str (not "int") to str ``` So it seems `album.mb_releasegroupid` is an `int`. This seems like a bug. ### Problem Running this command in verbose (`-vv`) mode: ```sh $ beet -vv im --set=genre=Vaporwave Vektroid\ -\ Color\ Ocean\ Road/ ``` Led to this problem: ``` user configuration: /media/droppie/libraries/music/.meta/beets/config.yaml data directory: /media/droppie/libraries/music/.meta/beets plugin paths: /opt/whatlastgenre/plugin/beets/beetsplug Sending event: pluginload library database: /media/droppie/libraries/music/.meta/beets/library.db library directory: /media/droppie/libraries/music Sending event: library_opened Sending event: import_begin Sending event: import_task_created Sending event: import_task_start Looking up: /media/droppie/data/music/Vektroid - Color Ocean Road Tagging Vektroid - Color Ocean Road No album ID found. Search terms: Vektroid - Color Ocean Road Album might be VA: False Searching for MusicBrainz releases with: {'release': 'color ocean road', 'artist': 'vektroid', 'tracks': '6'} Requesting MusicBrainz release acfcb884-a136-44d3-a537-65194f07bf59 primary MB release type: album Sending event: albuminfo_received Candidate: Vektroid - Color Ocean Road (acfcb884-a136-44d3-a537-65194f07bf59) Computing track assignment... ...done. Success. Distance: 0.19 Requesting MusicBrainz release 42fa86c0-c28c-4850-ba6a-b2696808dabf primary MB release type: album Sending event: albuminfo_received Candidate: Vektroid - RE•SET (42fa86c0-c28c-4850-ba6a-b2696808dabf) Computing track assignment... ...done. Success. Distance: 0.65 Requesting MusicBrainz release 6a832aac-a80b-4db2-a1d7-dc65d92a982d primary MB release type: album Sending event: albuminfo_received Candidate: Vektroid - Telnet Complete (6a832aac-a80b-4db2-a1d7-dc65d92a982d) Computing track assignment... ...done. Success. Distance: 0.76 Requesting MusicBrainz release 043e9481-f864-4676-9888-924f026fa3dd primary MB release type: album Sending event: albuminfo_received Candidate: Vektroid - Seed & Synthetic Earth (043e9481-f864-4676-9888-924f026fa3dd) Computing track assignment... ...done. Success. Distance: 0.67 Requesting MusicBrainz release 12ec78f1-169a-408c-9d9e-a699901d133c primary MB release type: broadcast secondary MB release type(s): dj-mix Sending event: albuminfo_received Candidate: Vektroid - FACT Mix 619: Vektroid (Sept '17) (12ec78f1-169a-408c-9d9e-a699901d133c) Computing track assignment... ...done. Success. Distance: 0.65 discogs: Searching for master release 1520897 discogs: hit rate limit, waiting for 0.9732460975646973 seconds discogs: Searching for master release 1520897 discogs: hit rate limit, waiting for 0.9869840145111084 seconds discogs: Searching for master release 1520897 discogs: hit rate limit, waiting for 0.9847149848937988 seconds Sending event: albuminfo_received Candidate: Vektroid - Color Ocean Road (4820006) Computing track assignment... ...done. Success. Distance: 0.22 Sending event: albuminfo_received Candidate: Vektroid - Color Ocean Road (13385176) Computing track assignment... ...done. Success. Distance: 0.05 Sending event: albuminfo_received Candidate: Vektroid - Color Ocean Road (13395427) Computing track assignment... ...done. Success. Distance: 0.22 Evaluating 8 candidates. /media/droppie/data/music/Vektroid - Color Ocean Road (6 items) Sending event: before_choose_candidate Tagging: Vektroid - Color Ocean Road URL: https://www.discogs.com/Vektroid-Color-Ocean-Road/release/13385176 (Similarity: 95.2%) (source) (Discogs, File, 2012, US, PrismCorp) [A]pply, More candidates, Skip, Use as-is, as Tracks, Group albums, Enter search, enter Id, aBort, eDit, edit Candidates? Sending event: import_task_choice Sending event: import_task_apply Replacing item 2040: /media/droppie/data/music/Vektroid - Color Ocean Road/01 Shalom.mp3 Sending event: database_change Sending event: item_removed Replacing item 2041: /media/droppie/data/music/Vektroid - Color Ocean Road/02 Color Ocean.mp3 Sending event: database_change Sending event: item_removed Replacing item 2042: /media/droppie/data/music/Vektroid - Color Ocean Road/03 Seafoam Island.mp3 Sending event: database_change Sending event: item_removed Replacing item 2043: /media/droppie/data/music/Vektroid - Color Ocean Road/04 Sushi Plaza.mp3 Sending event: database_change Sending event: item_removed Replacing item 2044: /media/droppie/data/music/Vektroid - Color Ocean Road/05 Mango _ Fuji.mp3 Sending event: database_change Sending event: item_removed Replacing item 2045: /media/droppie/data/music/Vektroid - Color Ocean Road/06 Om Namo Ocean Road.mp3 Sending event: database_change Sending event: database_change Sending event: item_removed 6 of 6 items replaced Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Reimported album: added 1602800480.7681532, flexible attributes [] from album 185 for /media/droppie/data/music/Vektroid - Color Ocean Road Reimported item added 1602800480.7766094 from item 2040 for /media/droppie/data/music/Vektroid - Color Ocean Road/01 Shalom.mp3 Reimported item flexible attributes ['track_alt', 'data_source', 'track_alt', 'data_source'] from item 2040 for /media/droppie/data/music/Vektroid - Color Ocean Road/01 Shalom.mp3 Sending event: database_change Reimported item added 1602800480.7842014 from item 2041 for /media/droppie/data/music/Vektroid - Color Ocean Road/02 Color Ocean.mp3 Reimported item flexible attributes ['track_alt', 'data_source', 'track_alt', 'data_source'] from item 2041 for /media/droppie/data/music/Vektroid - Color Ocean Road/02 Color Ocean.mp3 Sending event: database_change Reimported item added 1602800480.7913542 from item 2042 for /media/droppie/data/music/Vektroid - Color Ocean Road/03 Seafoam Island.mp3 Reimported item flexible attributes ['track_alt', 'data_source', 'track_alt', 'data_source'] from item 2042 for /media/droppie/data/music/Vektroid - Color Ocean Road/03 Seafoam Island.mp3 Sending event: database_change Reimported item added 1602800480.7984622 from item 2043 for /media/droppie/data/music/Vektroid - Color Ocean Road/04 Sushi Plaza.mp3 Reimported item flexible attributes ['track_alt', 'data_source', 'track_alt', 'data_source'] from item 2043 for /media/droppie/data/music/Vektroid - Color Ocean Road/04 Sushi Plaza.mp3 Sending event: database_change Reimported item added 1602800480.8071747 from item 2044 for /media/droppie/data/music/Vektroid - Color Ocean Road/05 Mango _ Fuji.mp3 Reimported item flexible attributes ['track_alt', 'data_source', 'track_alt', 'data_source'] from item 2044 for /media/droppie/data/music/Vektroid - Color Ocean Road/05 Mango _ Fuji.mp3 Sending event: database_change Reimported item added 1602800480.8171701 from item 2045 for /media/droppie/data/music/Vektroid - Color Ocean Road/06 Om Namo Ocean Road.mp3 Reimported item flexible attributes ['track_alt', 'data_source', 'track_alt', 'data_source'] from item 2045 for /media/droppie/data/music/Vektroid - Color Ocean Road/06 Om Namo Ocean Road.mp3 Sending event: database_change Set field genre=Vaporwave for /media/droppie/data/music/Vektroid - Color Ocean Road Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change Sending event: database_change fetchart: trying source filesystem for album Vektroid - Color Ocean Road fetchart: trying source coverart for album Vektroid - Color Ocean Road fetchart: downloading image: https://coverartarchive.org/release/13385176/front fetchart: not a supported image: image/x-None fetchart: trying source coverart for album Vektroid - Color Ocean Road fetchart: downloading image: https://coverartarchive.org/release-group/1520897/front fetchart: not a supported image: image/x-None fetchart: trying source itunes for album Vektroid - Color Ocean Road fetchart: getting URL: https://itunes.apple.com/search?term=Vektroid+Color+Ocean+Road&entity=album&media=music&limit=200 fetchart: iTunes search for 'Vektroid Color Ocean Road' got no results fetchart: trying source amazon for album Vektroid - Color Ocean Road fetchart: trying source albumart for album Vektroid - Color Ocean Road fetchart: trying source wikipedia for album Vektroid - Color Ocean Road fetchart: getting URL: https://dbpedia.org/sparql?format=application%2Fsparql-results%2Bjson&timeout=2500&query=PREFIX+rdf%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F1999%2F02%2F22-rdf-syntax-ns%23%3E%0A+++++++++++++++++PREFIX+dbpprop%3A+%3Chttp%3A%2F%2Fdbpedia.org%2Fproperty%2F%3E%0A+++++++++++++++++PREFIX+owl%3A+%3Chttp%3A%2F%2Fdbpedia.org%2Fontology%2F%3E%0A+++++++++++++++++PREFIX+rdfs%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2000%2F01%2Frdf-schema%23%3E%0A+++++++++++++++++PREFIX+foaf%3A+%3Chttp%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2F%3E%0A%0A+++++++++++++++++SELECT+DISTINCT+%3FpageId+%3FcoverFilename+WHERE+%7B%0A+++++++++++++++++++%3Fsubject+owl%3AwikiPageID+%3FpageId+.%0A+++++++++++++++++++%3Fsubject+dbpprop%3Aname+%3Fname+.%0A+++++++++++++++++++%3Fsubject+rdfs%3Alabel+%3Flabel+.%0A+++++++++++++++++++%7B+%3Fsubject+dbpprop%3Aartist+%3Fartist+%7D%0A+++++++++++++++++++++UNION%0A+++++++++++++++++++%7B+%3Fsubject+owl%3Aartist+%3Fartist+%7D%0A+++++++++++++++++++%7B+%3Fartist+foaf%3Aname+%22Vektroid%22%40en+%7D%0A+++++++++++++++++++++UNION%0A+++++++++++++++++++%7B+%3Fartist+dbpprop%3Aname+%22Vektroid%22%40en+%7D%0A+++++++++++++++++++%3Fsubject+rdf%3Atype+%3Chttp%3A%2F%2Fdbpedia.org%2Fontology%2FAlbum%3E+.%0A+++++++++++++++++++%3Fsubject+dbpprop%3Acover+%3FcoverFilename+.%0A+++++++++++++++++++FILTER+%28+regex%28%3Fname%2C+%22Color+Ocean+Road%22%2C+%22i%22%29+%29%0A++++++++++++++++++%7D%0A+++++++++++++++++Limit+1 fetchart: wikipedia: album not found on dbpedia fetchart: trying source fanarttv for album Vektroid - Color Ocean Road Traceback (most recent call last): File "/usr/local/bin/beet", line 10, in <module> sys.exit(main()) File "/usr/local/lib/python3.7/dist-packages/beets/ui/__init__.py", line 1266, in main _raw_main(args) File "/usr/local/lib/python3.7/dist-packages/beets/ui/__init__.py", line 1253, in _raw_main subcommand.func(lib, suboptions, subargs) File "/usr/local/lib/python3.7/dist-packages/beets/ui/commands.py", line 955, in import_func import_files(lib, paths, query) File "/usr/local/lib/python3.7/dist-packages/beets/ui/commands.py", line 925, in import_files session.run() File "/usr/local/lib/python3.7/dist-packages/beets/importer.py", line 329, in run pl.run_parallel(QUEUE_SIZE) File "/usr/local/lib/python3.7/dist-packages/beets/util/pipeline.py", line 445, in run_parallel six.reraise(exc_info[0], exc_info[1], exc_info[2]) File "/usr/lib/python3/dist-packages/six.py", line 693, in reraise raise value File "/usr/local/lib/python3.7/dist-packages/beets/util/pipeline.py", line 312, in run out = self.coro.send(msg) File "/usr/local/lib/python3.7/dist-packages/beets/util/pipeline.py", line 194, in coro func((args + (task,))) File "/usr/local/lib/python3.7/dist-packages/beets/importer.py", line 1511, in plugin_stage func(session, task) File "/usr/local/lib/python3.7/dist-packages/beets/plugins.py", line 143, in wrapper return func(args, *kwargs) File "/usr/local/lib/python3.7/dist-packages/beetsplug/fetchart.py", line 854, in fetch_art candidate = self.art_for_album(task.album, task.paths, local) File "/usr/local/lib/python3.7/dist-packages/beetsplug/fetchart.py", line 920, in art_for_album for candidate in source.get(album, self, paths): File "/usr/local/lib/python3.7/dist-packages/beetsplug/fetchart.py", line 416, in get self.API_ALBUMS + album.mb_releasegroupid, TypeError: can only concatenate str (not "int") to str ``` ### Setup OS: Raspbian Buster * Python version: 3.7.3 * beets version: 1.4.9 * Turning off plugins made problem go away (yes/no): n/a My configuration (output of `beet config`) is: ```yaml library: /media/droppie/libraries/music/.meta/beets/library.db directory: /media/droppie/libraries/music original_date: yes per_disc_numbering: no va_name: "\U0001F465 Various Artists" import: write: no copy: no move: no link: yes resume: ask incremental: yes quiet_fallback: skip none_rec_action: ask timid: yes default_action: apply log: /var/log/beets/import.log languages: - en detail: no group_albums: no autotag: yes duplicate_action: ask incremental_skip_later: no set_fields: genre: "\U0001F3A7 New" pluginpath: /opt/whatlastgenre/plugin/beets/beetsplug plugins: discogs edit fetchart bucket replaygain info follow wlg types types: rating: int edit: itemfields: track artist title genre albumartist albumfields: albumartist album genre rating fetchart: sources: - filesystem - coverart: release releasegroup - itunes - '' auto: yes art_filename: cover.jpg store_source: yes bucket: bucket_year: ['1930s', '1940s', '1950s', '1960s', '1970s', '1980s', '1990s', '2000s', '2010s', '2020s'] paths: default: %bucket{$year}/$year - $albumartist - $album/$track - $title comp: %bucket{$year}/$year - $albumartist - $album/$track - $artist - $title replaygain: backend: gstreamer auto: no overwrite: no targetlevel: 89 follow: auto: no email: me@something.ext password: XXX userid: XXX wlg: auto: no force: no count: 3 separator: ', ' web: host: 0.0.0.0 cors: '' discogs: user_token: XXX ```	[ { "content": "# -- coding: utf-8 --\n# This file is part of beets.\n# Copyright 2016, Adrian Sampson.\n#\n# Permission is hereby granted, free of charge, to any person obtaining\n# a copy of this software and associated documentation files (the\n# \"Software\"), to deal in the Software without restriction, in...	[ { "content": "# -- coding: utf-8 --\n# This file is part of beets.\n# Copyright 2016, Adrian Sampson.\n#\n# Permission is hereby granted, free of charge, to any person obtaining\n# a copy of this software and associated documentation files (the\n# \"Software\"), to deal in the Software without restriction, in...	diff --git a/beets/dbcore/types.py b/beets/dbcore/types.py index 5aa2b98127..c85eb1a50f 100644 --- a/beets/dbcore/types.py +++ b/beets/dbcore/types.py @@ -207,6 +207,12 @@ class String(Type): sql = u'TEXT' query = query.SubstringQuery + def normalize(self, value): + if value is None: + return self.null + else: + return self.model_type(value) + class Boolean(Type): """A boolean type. diff --git a/docs/changelog.rst b/docs/changelog.rst index a530cbac13..528707fe08 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -266,6 +266,10 @@ Fixes: the current track in the queue. Thanks to :user:`aereaux`. :bug:`3722` +* String-typed fields are now normalized to string values, avoiding an + occasional crash when using both the :doc:`/plugins/fetchart` and the + :doc:`/plugins/discogs` together. + :bug:`3773` :bug:`3774` * Fix a bug causing PIL to generate poor quality JPEGs when resizing artwork. :bug:`3743` diff --git a/test/test_lyrics.py b/test/test_lyrics.py index 833b86b3ad..95b094e98e 100644 --- a/test/test_lyrics.py +++ b/test/test_lyrics.py @@ -48,71 +48,72 @@ def setUp(self): lyrics.LyricsPlugin() def test_search_artist(self): - item = Item(artist='Alice ft. Bob', title='song') - self.assertIn(('Alice ft. Bob', ['song']), + item = Item(artist=u'Alice ft. Bob', title=u'song') + self.assertIn((u'Alice ft. Bob', [u'song']), lyrics.search_pairs(item)) - self.assertIn(('Alice', ['song']), + self.assertIn((u'Alice', [u'song']), lyrics.search_pairs(item)) - item = Item(artist='Alice feat Bob', title='song') - self.assertIn(('Alice feat Bob', ['song']), + item = Item(artist=u'Alice feat Bob', title=u'song') + self.assertIn((u'Alice feat Bob', [u'song']), lyrics.search_pairs(item)) - self.assertIn(('Alice', ['song']), + self.assertIn((u'Alice', [u'song']), lyrics.search_pairs(item)) - item = Item(artist='Alice feat. Bob', title='song') - self.assertIn(('Alice feat. Bob', ['song']), + item = Item(artist=u'Alice feat. Bob', title=u'song') + self.assertIn((u'Alice feat. Bob', [u'song']), lyrics.search_pairs(item)) - self.assertIn(('Alice', ['song']), + self.assertIn((u'Alice', [u'song']), lyrics.search_pairs(item)) - item = Item(artist='Alice feats Bob', title='song') - self.assertIn(('Alice feats Bob', ['song']), + item = Item(artist=u'Alice feats Bob', title=u'song') + self.assertIn((u'Alice feats Bob', [u'song']), lyrics.search_pairs(item)) - self.assertNotIn(('Alice', ['song']), + self.assertNotIn((u'Alice', [u'song']), lyrics.search_pairs(item)) - item = Item(artist='Alice featuring Bob', title='song') - self.assertIn(('Alice featuring Bob', ['song']), + item = Item(artist=u'Alice featuring Bob', title=u'song') + self.assertIn((u'Alice featuring Bob', [u'song']), lyrics.search_pairs(item)) - self.assertIn(('Alice', ['song']), + self.assertIn((u'Alice', [u'song']), lyrics.search_pairs(item)) - item = Item(artist='Alice & Bob', title='song') - self.assertIn(('Alice & Bob', ['song']), + item = Item(artist=u'Alice & Bob', title=u'song') + self.assertIn((u'Alice & Bob', [u'song']), lyrics.search_pairs(item)) - self.assertIn(('Alice', ['song']), + self.assertIn((u'Alice', [u'song']), lyrics.search_pairs(item)) - item = Item(artist='Alice and Bob', title='song') - self.assertIn(('Alice and Bob', ['song']), + item = Item(artist=u'Alice and Bob', title=u'song') + self.assertIn((u'Alice and Bob', [u'song']), lyrics.search_pairs(item)) - self.assertIn(('Alice', ['song']), + self.assertIn((u'Alice', [u'song']), lyrics.search_pairs(item)) - item = Item(artist='Alice and Bob', title='song') - self.assertEqual(('Alice and Bob', ['song']), + item = Item(artist=u'Alice and Bob', title=u'song') + self.assertEqual((u'Alice and Bob', [u'song']), list(lyrics.search_pairs(item))[0]) def test_search_artist_sort(self): - item = Item(artist='CHVRCHΞS', title='song', artist_sort='CHVRCHES') - self.assertIn(('CHVRCHΞS', ['song']), + item = Item(artist=u'CHVRCHΞS', title=u'song', artist_sort=u'CHVRCHES') + self.assertIn((u'CHVRCHΞS', [u'song']), lyrics.search_pairs(item)) - self.assertIn(('CHVRCHES', ['song']), + self.assertIn((u'CHVRCHES', [u'song']), lyrics.search_pairs(item)) # Make sure that the original artist name is still the first entry - self.assertEqual(('CHVRCHΞS', ['song']), + self.assertEqual((u'CHVRCHΞS', [u'song']), list(lyrics.search_pairs(item))[0]) - item = Item(artist='横山克', title='song', artist_sort='Masaru Yokoyama') - self.assertIn(('横山克', ['song']), + item = Item(artist=u'横山克', title=u'song', + artist_sort=u'Masaru Yokoyama') + self.assertIn((u'横山克', [u'song']), lyrics.search_pairs(item)) - self.assertIn(('Masaru Yokoyama', ['song']), + self.assertIn((u'Masaru Yokoyama', [u'song']), lyrics.search_pairs(item)) # Make sure that the original artist name is still the first entry - self.assertEqual(('横山克', ['song']), + self.assertEqual((u'横山克', [u'song']), list(lyrics.search_pairs(item))[0]) def test_search_pairs_multi_titles(self):
zenml-io__zenml-2271	Update `sklearn` Integration to Support Versions >1.3.0 and Resolve MLflow Autologging Issues ## Open Source Contributors Welcomed! Please comment below if you would like to work on this issue! ### Contact Details [Optional] support@zenml.io ### What happened? The current ZenML Sklearn integration is restricted to versions of Sklearn <1.3.0, as defined in `src/zenml/integrations/sklearn/__init__.py`. However, the release of Sklearn 1.3.0 necessitates an update to this constraint. Additionally, this Sklearn version upgrade appears to cause issues with MLflow autologging, likely due to compatibility conflicts. ### Task Description Update the Sklearn integration in ZenML to support Sklearn versions >1.3.0. Additionally, identify and resolve any issues arising in MLflow autologging due to this version update. ### Expected Outcome - The Sklearn integration in ZenML should allow for the use of Sklearn versions >1.3.0. - Any compatibility issues, especially with MLflow autologging, should be identified and resolved. - Ensure that all tests, including CI pipelines, pass with the updated Sklearn version. ### Steps to Implement - Modify the Sklearn version constraint in src/zenml/integrations/sklearn/__init__.py to allow for versions >1.3.0. - Investigate and identify the root cause of the issues with MLflow autologging when using Sklearn 1.3.0. - Implement necessary fixes or updates to ensure compatibility with the new Sklearn version. - Thoroughly test the changes, especially focusing on MLflow autologging functionality. - Update documentation and examples as necessary to reflect the support for the new Sklearn version. ### Additional Context This update is crucial for keeping ZenML compatible with the latest machine learning tools and libraries, ensuring that users can leverage the newest features and improvements in Sklearn. ### Code of Conduct - [ ] I agree to follow this project's Code of Conduct	[ { "content": "# Copyright (c) ZenML GmbH 2021. All Rights Reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at:\n#\n# https://www.apache.org/licenses/LICENSE-2.0\...	[ { "content": "# Copyright (c) ZenML GmbH 2021. All Rights Reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at:\n#\n# https://www.apache.org/licenses/LICENSE-2.0\...	diff --git a/docs/book/user-guide/starter-guide/create-an-ml-pipeline.md b/docs/book/user-guide/starter-guide/create-an-ml-pipeline.md index 2b898d45565..882c5334f36 100644 --- a/docs/book/user-guide/starter-guide/create-an-ml-pipeline.md +++ b/docs/book/user-guide/starter-guide/create-an-ml-pipeline.md @@ -127,7 +127,7 @@ zenml integration install sklearn -y In this case, ZenML has an integration with `sklearn` so you can use the ZenML CLI to install the right version directly. {% hint style="info" %} -The `zenml integration install sklearn` command is simply doing a `pip install sklearn<1.3` behind the scenes. If something goes wrong, one can always use `zenml integration requirements sklearn` to see which requirements are compatible and install using pip (or any other tool) directly. +The `zenml integration install sklearn` command is simply doing a `pip install sklearn>1.3` behind the scenes. If something goes wrong, one can always use `zenml integration requirements sklearn` to see which requirements are compatible and install using pip (or any other tool) directly. {% endhint %} ### Define a data loader with multiple outputs diff --git a/src/zenml/integrations/sklearn/__init__.py b/src/zenml/integrations/sklearn/__init__.py index 9a9b1fed77e..3245e301367 100644 --- a/src/zenml/integrations/sklearn/__init__.py +++ b/src/zenml/integrations/sklearn/__init__.py @@ -21,7 +21,7 @@ class SklearnIntegration(Integration): """Definition of sklearn integration for ZenML.""" NAME = SKLEARN - REQUIREMENTS = ["scikit-learn<1.3"] + REQUIREMENTS = ["scikit-learn>1.3"] @classmethod def activate(cls) -> None: diff --git a/tests/conftest.py b/tests/conftest.py index e35ad22a452..b6f90f58f05 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -20,7 +20,7 @@ from uuid import uuid4 import pytest -from py._builtin import execfile +from pytest import File from pytest_mock import MockerFixture from tests.harness.environment import TestEnvironment @@ -325,9 +325,7 @@ def virtualenv( "tests" ) - execfile( - str(activate_this_file), dict(__file__=str(activate_this_file)) - ) + File(str(activate_this_file), dict(__file__=str(activate_this_file))) # Set new system executable sys.executable = tmp_path / env_bin_dir / "python" @@ -346,7 +344,7 @@ def virtualenv( "your virtual environment to run integration " "tests" ) - execfile(str(activate_this_f), dict(__file__=str(activate_this_f))) + File(str(activate_this_f), dict(__file__=str(activate_this_f))) else: yield ""
conda__conda-5124	export toposort for conda-build export toposort for conda-build	[ { "content": "# -- coding: utf-8 --\nfrom __future__ import absolute_import, division, print_function, unicode_literals\n\nfrom functools import partial\nfrom logging import getLogger\nfrom warnings import warn\n\nlog = getLogger(__name__)\n\nfrom . import CondaError # NOQA\nCondaError = CondaError\n\nfrom ....	[ { "content": "# -- coding: utf-8 --\nfrom __future__ import absolute_import, division, print_function, unicode_literals\n\nfrom functools import partial\nfrom logging import getLogger\nfrom warnings import warn\n\nlog = getLogger(__name__)\n\nfrom . import CondaError # NOQA\nCondaError = CondaError\n\nfrom ....	diff --git a/conda/exports.py b/conda/exports.py index 803ec103916..c14f048ec90 100644 --- a/conda/exports.py +++ b/conda/exports.py @@ -30,6 +30,9 @@ from .gateways.connection import CondaSession # NOQA CondaSession = CondaSession +from .common.toposort import _toposort +_toposort = _toposort + from .gateways.disk.link import lchmod # NOQA lchmod = lchmod
pyodide__pyodide-717	Calling yaml.load() without Loader=... is deprecated For each built packages there is now the following deprecation warning , ``` pyodide_build/common.py:27: YAMLLoadWarning: calling yaml.load() without Loader=... is deprecated, as the default Loader is unsafe. Please read https://msg.pyyaml.org/load for full details. return yaml.load(fd) ``` it would be nice to fix this.	[ { "content": "from pathlib import Path\nfrom typing import Optional, Set\n\n\nROOTDIR = Path(__file__).parents[1].resolve() / \"tools\"\nHOSTPYTHON = ROOTDIR / \"..\" / \"cpython\" / \"build\" / \"3.8.2\" / \"host\"\nTARGETPYTHON = ROOTDIR / \"..\" / \"cpython\" / \"installs\" / \"python-3.8.2\"\nDEFAULTCFLAGS ...	[ { "content": "from pathlib import Path\nfrom typing import Optional, Set\n\n\nROOTDIR = Path(__file__).parents[1].resolve() / \"tools\"\nHOSTPYTHON = ROOTDIR / \"..\" / \"cpython\" / \"build\" / \"3.8.2\" / \"host\"\nTARGETPYTHON = ROOTDIR / \"..\" / \"cpython\" / \"installs\" / \"python-3.8.2\"\nDEFAULTCFLAGS ...	diff --git a/pyodide_build/common.py b/pyodide_build/common.py index 7d6752c94ac..de955a32beb 100644 --- a/pyodide_build/common.py +++ b/pyodide_build/common.py @@ -33,7 +33,7 @@ def parse_package(package): # TODO: Validate against a schema with open(package) as fd: - return yaml.load(fd) + return yaml.safe_load(fd) def _parse_package_subset(query: Optional[str]) -> Optional[Set[str]]:
pretix__pretix-1777	log level I'm probably missing something, so please bear with me. I followed the "small-scale manual" deployment guide. `python -m pretix runperiodic` logs celery success messages at the info level: `INFO 2019-01-03 20:49:47,479 celery.app.trace trace Task pretix.base.services.quotas.refresh_quota_caches[817c903c-ea12-491f-aa65-23b89e59075a] succeeded in 0.006468222010880709s: None INFO 2019-01-03 20:49:47,606 celery.app.trace trace Task pretix.base.services.waitinglist.assign_automatically[db93ed55-5e42-4278-8647-3deefa0ea8dc] succeeded in 0.08206735923886299s: 0 ` This means I get a useless email from the cron job twice an hour, unless I set `loglevel` in `pretix/settings.py` to `WARNING`. Is there a way to override the log level in pretix.cfg that I'm overlooking? log level I'm probably missing something, so please bear with me. I followed the "small-scale manual" deployment guide. `python -m pretix runperiodic` logs celery success messages at the info level: `INFO 2019-01-03 20:49:47,479 celery.app.trace trace Task pretix.base.services.quotas.refresh_quota_caches[817c903c-ea12-491f-aa65-23b89e59075a] succeeded in 0.006468222010880709s: None INFO 2019-01-03 20:49:47,606 celery.app.trace trace Task pretix.base.services.waitinglist.assign_automatically[db93ed55-5e42-4278-8647-3deefa0ea8dc] succeeded in 0.08206735923886299s: 0 ` This means I get a useless email from the cron job twice an hour, unless I set `loglevel` in `pretix/settings.py` to `WARNING`. Is there a way to override the log level in pretix.cfg that I'm overlooking?	[ { "content": "import configparser\nimport logging\nimport os\nimport sys\nfrom urllib.parse import urlparse\n\nimport django.conf.locale\nfrom django.utils.crypto import get_random_string\nfrom kombu import Queue\nfrom pkg_resources import iter_entry_points\nfrom pycountry import currencies\n\nfrom . import __v...	[ { "content": "import configparser\nimport logging\nimport os\nimport sys\nfrom urllib.parse import urlparse\n\nimport django.conf.locale\nfrom django.utils.crypto import get_random_string\nfrom kombu import Queue\nfrom pkg_resources import iter_entry_points\nfrom pycountry import currencies\n\nfrom . import __v...	diff --git a/doc/admin/config.rst b/doc/admin/config.rst index 7cf43b540d4..c6de356efe5 100644 --- a/doc/admin/config.rst +++ b/doc/admin/config.rst @@ -97,6 +97,9 @@ Example:: ``csp_log`` Log violations of the Content Security Policy (CSP). Defaults to ``on``. + +``loglevel`` + Set console and file loglevel (``DEBUG``, ``INFO``, ``WARNING``, ``ERROR`` or ``CRITICAL``). Defaults to ``INFO``. Locale settings --------------- diff --git a/src/pretix/settings.py b/src/pretix/settings.py index 8fff1d0ea7f..0bf158c4937 100644 --- a/src/pretix/settings.py +++ b/src/pretix/settings.py @@ -561,7 +561,7 @@ } MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage' -loglevel = 'DEBUG' if DEBUG else 'INFO' +loglevel = 'DEBUG' if DEBUG else config.get('pretix', 'loglevel', fallback='INFO') LOGGING = { 'version': 1,
ivy-llc__ivy-22920	eigvals	[ { "content": "# local\nimport ivy\nfrom ivy.functional.frontends.numpy.func_wrapper import (\n to_ivy_arrays_and_back,\n from_zero_dim_arrays_to_scalar,\n)\n\n\n@to_ivy_arrays_and_back\ndef eig(a):\n return ivy.eig(a)\n\n\n@to_ivy_arrays_and_back\n@from_zero_dim_arrays_to_scalar\ndef eigh(a, /, UPLO=\"...	[ { "content": "# local\nimport ivy\nfrom ivy.functional.frontends.numpy.func_wrapper import (\n to_ivy_arrays_and_back,\n from_zero_dim_arrays_to_scalar,\n)\n\n\n@to_ivy_arrays_and_back\ndef eig(a):\n return ivy.eig(a)\n\n\n@to_ivy_arrays_and_back\n@from_zero_dim_arrays_to_scalar\ndef eigh(a, /, UPLO=\"...	diff --git a/ivy/functional/frontends/numpy/linalg/matrix_eigenvalues.py b/ivy/functional/frontends/numpy/linalg/matrix_eigenvalues.py index d0b98b00264c7..6c3a6e61f1265 100644 --- a/ivy/functional/frontends/numpy/linalg/matrix_eigenvalues.py +++ b/ivy/functional/frontends/numpy/linalg/matrix_eigenvalues.py @@ -17,6 +17,11 @@ def eigh(a, /, UPLO="L"): return ivy.eigh(a, UPLO=UPLO) +@to_ivy_arrays_and_back +def eigvals(a): + return ivy.eig(a)[0] + + @to_ivy_arrays_and_back @from_zero_dim_arrays_to_scalar def eigvalsh(a, /, UPLO="L"): diff --git a/ivy_tests/test_ivy/test_frontends/test_numpy/test_linalg/test_matrix_eigenvalues.py b/ivy_tests/test_ivy/test_frontends/test_numpy/test_linalg/test_matrix_eigenvalues.py index d240cef1dc48b..b76655cf0897d 100644 --- a/ivy_tests/test_ivy/test_frontends/test_numpy/test_linalg/test_matrix_eigenvalues.py +++ b/ivy_tests/test_ivy/test_frontends/test_numpy/test_linalg/test_matrix_eigenvalues.py @@ -130,6 +130,55 @@ def test_numpy_eigh( ) +@handle_frontend_test( + fn_tree="numpy.linalg.eigvals", + dtype_and_x=helpers.dtype_and_values( + available_dtypes=helpers.get_dtypes("float"), + min_value=0, + max_value=10, + shape=helpers.ints(min_value=2, max_value=4).map(lambda x: tuple([x, x])), + ).filter( + lambda x: "float16" not in x[0] + and "bfloat16" not in x[0] + and np.linalg.cond(x[1][0]) < 1 / sys.float_info.epsilon + and np.linalg.det(np.asarray(x[1][0])) != 0 + ), + test_with_out=st.just(False), +) +def test_numpy_eigvals( + dtype_and_x, + on_device, + fn_tree, + frontend, + test_flags, + backend_fw, +): + dtype, x = dtype_and_x + ret, frontend_ret = helpers.test_frontend_function( + input_dtypes=dtype, + backend_to_test=backend_fw, + frontend=frontend, + test_flags=test_flags, + fn_tree=fn_tree, + on_device=on_device, + test_values=False, + a=x, + ) + with BackendHandler.update_backend(backend_fw) as ivy_backend: + ret = np.sort( + np.array([ivy_backend.to_numpy(x).astype(np.float128) for x in ret]) + ) + frontend_ret = np.sort(np.array([x.astype(np.float128) for x in frontend_ret])) + assert_all_close( + ret_np=ret, + ret_from_gt_np=frontend_ret, + backend=backend_fw, + ground_truth_backend=frontend, + atol=1e-2, + rtol=1e-2, + ) + + # eigvalsh @handle_frontend_test( fn_tree="numpy.linalg.eigvalsh",
meltano__meltano-6609	bug: `meltano state list` with pattern - no such option ### Meltano Version 2.3.0 ### Python Version 3.8 ### Bug scope CLI (options, error messages, logging, etc.) ### Operating System Mac ### Description It looks like the `--pattern` argument thats in the docs https://docs.meltano.com/reference/command-line-interface#list isnt available on the CLI. ``` (meltano) Patricks-MBP:data pnadolny$ meltano --version meltano, version 2.3.0 (meltano) Patricks-MBP:data pnadolny$ meltano state list --pattern 'tap-gitlab' 2022-07-25T21:31:25.438941Z [info ] Environment 'userdev' is active Usage: meltano state list [OPTIONS] [PATTERN] Try 'meltano state list --help' for help. Error: No such option: --pattern ``` ### Code _No response_	[ { "content": "\"\"\"State management in CLI.\"\"\"\nfrom __future__ import annotations\n\nimport json\nimport re\nfrom datetime import datetime as dt\nfrom functools import partial, reduce, wraps\nfrom operator import xor\n\nimport click\nimport structlog\n\nfrom meltano.cli.params import pass_project\nfrom mel...	[ { "content": "\"\"\"State management in CLI.\"\"\"\nfrom __future__ import annotations\n\nimport json\nimport re\nfrom datetime import datetime as dt\nfrom functools import partial, reduce, wraps\nfrom operator import xor\n\nimport click\nimport structlog\n\nfrom meltano.cli.params import pass_project\nfrom mel...	diff --git a/src/meltano/cli/state.py b/src/meltano/cli/state.py index 04e22bf147..30e7a7fcd1 100644 --- a/src/meltano/cli/state.py +++ b/src/meltano/cli/state.py @@ -111,7 +111,7 @@ def meltano_state(project: Project, ctx: click.Context): @meltano_state.command(cls=InstrumentedCmd, name="list") -@click.argument("pattern", required=False) +@click.option("--pattern", type=str, help="Filter state IDs by pattern.") @click.pass_context @pass_project() def list_state( diff --git a/tests/meltano/cli/test_state.py b/tests/meltano/cli/test_state.py index af0403d5e0..c0b2f4c170 100644 --- a/tests/meltano/cli/test_state.py +++ b/tests/meltano/cli/test_state.py @@ -87,7 +87,7 @@ def test_list_pattern( ): with mock.patch("meltano.cli.state.StateService", return_value=state_service): for (pattern, expected_result) in patterns_with_expected_results: - result = cli_runner.invoke(cli, ["state", "list", pattern]) + result = cli_runner.invoke(cli, ["state", "list", "--pattern", pattern]) assert_cli_runner(result) assert self.get_result_set(result) == expected_result
pypa__setuptools-3307	[Docs] Clarify that "Keywords" page is an API reference for `setuptools.setup` ### Summary https://setuptools.readthedocs.io/en/latest/references/keywords.html has no indicators what those keywords are for. It also doesn't show up if you search for "setuptools.setup" in the sidebar search, and is generally innaccessible via search engines as well. It also has poor formatting, likely due to mismanaged indentation on the page. ### OS / Environment _No response_ ### Additional Information It would be good to: - have an introductory section in the page, describing what it is for -- explicitly mention "setuptools.setup" in this as well. - provide anchors for each of the keyword arguments. - fix the indentation for the list of various arguments. ### Code of Conduct - [X] I agree to follow the PSF Code of Conduct	[ { "content": "extensions = ['sphinx.ext.autodoc', 'jaraco.packaging.sphinx', 'rst.linker']\n\nmaster_doc = \"index\"\n\nlink_files = {\n '../CHANGES.rst': dict(\n using=dict(\n BB='https://bitbucket.org',\n GH='https://github.com',\n ),\n replace=[\n dict...	[ { "content": "extensions = ['sphinx.ext.autodoc', 'jaraco.packaging.sphinx', 'rst.linker']\n\nmaster_doc = \"index\"\n\nlink_files = {\n '../CHANGES.rst': dict(\n using=dict(\n BB='https://bitbucket.org',\n GH='https://github.com',\n ),\n replace=[\n dict...	diff --git a/changelog.d/3307.doc.rst b/changelog.d/3307.doc.rst new file mode 100644 index 0000000000..cdab873785 --- /dev/null +++ b/changelog.d/3307.doc.rst @@ -0,0 +1,4 @@ +Added introduction to references/keywords +Added deprecation tags to test kwargs +Moved userguide/keywords to deprecated section +Clarified in deprecated doc what keywords came from distutils and which were added or changed by setuptools diff --git a/docs/conf.py b/docs/conf.py index 4ebb521cf6..1023539c62 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -129,6 +129,12 @@ }, } +# Redirect old docs so links and references in the ecosystem don't break +extensions += ['sphinx_reredirects'] +redirects = { + "userguide/keywords": "/deprecated/changed_keywords.html", +} + # Add support for inline tabs extensions += ['sphinx_inline_tabs'] diff --git a/docs/deprecated/changed_keywords.rst b/docs/deprecated/changed_keywords.rst new file mode 100644 index 0000000000..7db372f2fe --- /dev/null +++ b/docs/deprecated/changed_keywords.rst @@ -0,0 +1,112 @@ +New and Changed ``setup()`` Keywords +==================================== + +This document tracks historical differences between ``setuptools`` and +``distutils``. + +Since ``distutils`` was scheduled for removal from the standard library in +Python 3.12, and ``setuptools`` started its adoption, these differences became less +relevant. +Please check :doc:`/references/keywords` for a complete list of keyword +arguments that can be passed to the ``setuptools.setup()`` function and +a their full description. + +.. tab:: Supported by both ``distutils`` and ``setuptoools`` + + ``name`` string + + ``version`` string + + ``description`` string + + ``long_description`` string + + ``long_description_content_type`` string + + ``author`` string + + ``author_email`` string + + ``maintainer`` string + + ``maintainer_email`` string + + ``url`` string + + ``download_url`` string + + ``packages`` list + + ``py_modules`` list + + ``scripts`` list + + ``ext_package`` string + + ``ext_modules`` list + + ``classifiers`` list + + ``distclass`` Distribution subclass + + ``script_name`` string + + ``script_args`` list + + ``options`` dictionary + + ``license`` string + + ``license_file`` string deprecated + + ``license_files`` list + + ``keywords`` string or list + + ``platforms`` list + + ``cmdclass`` dictionary + + ``data_files`` list deprecated + + ``package_dir`` dictionary + + ``requires`` string or list deprecated + + ``obsoletes`` list deprecated + + ``provides`` list + +.. tab:: Added or changed by ``setuptoools`` + + ``include_package_data`` bool + + ``exclude_package_data`` dictionary + + ``package_data`` dictionary + + ``zip_safe`` bool + + ``install_requires`` string or list + + ``entry_points`` dictionary + + ``extras_require`` dictionary + + ``python_requires`` string + + ``setup_requires`` string or list deprecated + + ``dependency_links`` list deprecated + + ``namespace_packages`` list + + ``test_suite`` string or function deprecated + + ``tests_require`` string or list deprecated + + ``test_loader`` class deprecated + + ``eager_resources`` list + + ``project_urls`` dictionary diff --git a/docs/deprecated/index.rst b/docs/deprecated/index.rst index 59fc7befd0..8169b3b70c 100644 --- a/docs/deprecated/index.rst +++ b/docs/deprecated/index.rst @@ -13,6 +13,7 @@ objectives. .. toctree:: :maxdepth: 1 + changed_keywords python_eggs easy_install distutils/index diff --git a/docs/references/keywords.rst b/docs/references/keywords.rst index c26b9d497d..f231b2b8ee 100644 --- a/docs/references/keywords.rst +++ b/docs/references/keywords.rst @@ -2,123 +2,210 @@ Keywords ======== +The following are keywords ``setuptools.setup()`` accepts. +They allow configuring the build process for a Python distribution or adding +metadata via a ``setup.py`` script placed at the root of your project. +All of them are optional; you do not have to supply them unless you need the +associated ``setuptools`` feature. + +Metadata and configuration supplied via ``setup()`` is complementary to (and +may be overwritten by) the information present in ``setup.cfg`` and ``pyproject.toml``. +Some important metadata, such as ``name`` and ``version``, may assume +a default degenerate value if not specified. + +Users are strongly encouraged to use a declarative config either via +:doc:`setup.cfg </userguide/declarative_config>` or :doc:`pyproject.toml +</userguide/pyproject_config>` and only rely on ``setup.py`` if they need to +tap into special behaviour that requires scripting (such as building C +extensions). + +.. note:: + When using declarative configs via ``pyproject.toml`` users can still keep a + very simple ``setup.py`` just to ensure editable installs are supported, for + example:: + + from setuptools import setup + + setup() + + Future versions of ``setuptools`` may support editable installs even + without ``setup.py``. + + +.. _keyword/name: + ``name`` A string specifying the name of the package. +.. _keyword/version: + ``version`` A string specifying the version number of the package. +.. _keyword/description: + ``description`` A string describing the package in a single line. +.. _keyword/long_description: + ``long_description`` A string providing a longer description of the package. +.. _keyword/long_description_content_type: + ``long_description_content_type`` A string specifying the content type is used for the ``long_description`` (e.g. ``text/markdown``) +.. _keyword/author: + ``author`` A string specifying the author of the package. +.. _keyword/author_email: + ``author_email`` A string specifying the email address of the package author. +.. _keyword/maintainer: + ``maintainer`` A string specifying the name of the current maintainer, if different from the author. Note that if the maintainer is provided, setuptools will use it as the author in ``PKG-INFO``. +.. _keyword/maintainer_email: + ``maintainer_email`` A string specifying the email address of the current maintainer, if different from the author. +.. _keyword/url: + ``url`` A string specifying the URL for the package homepage. +.. _keyword/download_url: + ``download_url`` A string specifying the URL to download the package. +.. _keyword/packages: + ``packages`` A list of strings specifying the packages that setuptools will manipulate. +.. _keyword/py_modules: + ``py_modules`` A list of strings specifying the modules that setuptools will manipulate. +.. _keyword/scripts: + ``scripts`` A list of strings specifying the standalone script files to be built and installed. +.. _keyword/ext_package: + ``ext_package`` A string specifying the base package name for the extensions provided by this package. +.. _keyword/ext_modules: + ``ext_modules`` A list of instances of ``setuptools.Extension`` providing the list of Python extensions to be built. +.. _keyword/classifiers: + ``classifiers`` A list of strings describing the categories for the package. +.. _keyword/distclass: + ``distclass`` A subclass of ``Distribution`` to use. +.. _keyword/script_name: + ``script_name`` A string specifying the name of the setup.py script -- defaults to ``sys.argv[0]`` +.. _keyword/script_args: + ``script_args`` A list of strings defining the arguments to supply to the setup script. +.. _keyword/options: + ``options`` A dictionary providing the default options for the setup script. +.. _keyword/license: + ``license`` A string specifying the license of the package. -``license_file`` +.. _keyword/license_file: +``license_file`` .. warning:: ``license_file`` is deprecated. Use ``license_files`` instead. -``license_files`` +.. _keyword/license_files: +``license_files`` A list of glob patterns for license related files that should be included. If neither ``license_file`` nor ``license_files`` is specified, this option defaults to ``LICEN[CS]E``, ``COPYING``, ``NOTICE``, and ``AUTHORS``. +.. _keyword/keywords: + ``keywords`` A list of strings or a comma-separated string providing descriptive meta-data. See: `PEP 0314`_. .. _PEP 0314: https://www.python.org/dev/peps/pep-0314/ +.. _keyword/platforms: + ``platforms`` A list of strings or comma-separated string. +.. _keyword/cmdclass: + ``cmdclass`` A dictionary providing a mapping of command names to ``Command`` subclasses. -``data_files`` +.. _keyword/data_files: +``data_files`` .. warning:: ``data_files`` is deprecated. It does not work with wheels, so it should be avoided. A list of strings specifying the data files to install. +.. _keyword/package_dir: + ``package_dir`` A dictionary providing a mapping of package to directory names. -``requires`` +.. _keyword/requires: +``requires`` .. warning:: ``requires`` is superseded by ``install_requires`` and should not be used anymore. -``obsoletes`` +.. _keyword/obsoletes: +``obsoletes`` .. warning:: ``obsoletes`` is currently ignored by ``pip``. @@ -135,8 +222,9 @@ Keywords e.g. Gorgon 2.3 gets subsumed into Torqued Python 1.0. When you install Torqued Python, the Gorgon distribution should be removed. -``provides`` +.. _keyword/provides: +``provides`` .. warning:: ``provides`` is currently ignored by ``pip``. @@ -164,7 +252,7 @@ Keywords Each package may be followed by an environment marker after a semicolon (e.g. ``foo; os_name == "posix"``). -.. Below are setuptools keywords, above are distutils +.. _keyword/include_package_data: ``include_package_data`` If set to ``True``, this tells ``setuptools`` to automatically include any @@ -172,12 +260,16 @@ Keywords your ``MANIFEST.in`` file. For more information, see the section on :ref:`Including Data Files`. +.. _keyword/exclude_package_data: + ``exclude_package_data`` A dictionary mapping package names to lists of glob patterns that should be excluded from your package directories. You can use this to trim back any excess files included by ``include_package_data``. For a complete description and examples, see the section on :ref:`Including Data Files`. +.. _keyword/package_data: + ``package_data`` A dictionary mapping package names to lists of glob patterns. For a complete description and examples, see the section on :ref:`Including Data @@ -187,17 +279,23 @@ Keywords in source control or are files that you don't want to include in your source distribution.) +.. _keyword/zip_safe: + ``zip_safe`` A boolean (True or False) flag specifying whether the project can be safely installed and run from a zip file. If this argument is not supplied, the ``bdist_egg`` command will have to analyze all of your project's contents for possible problems each time it builds an egg. +.. _keyword/install_requires: + ``install_requires`` A string or list of strings specifying what other distributions need to be installed when this one is. See the section on :ref:`Declaring Dependencies` for details and examples of the format of this argument. +.. _keyword/entry_points: + ``entry_points`` A dictionary mapping entry point group names to strings or lists of strings defining the entry points. Entry points are used to support dynamic @@ -206,28 +304,33 @@ Keywords of this argument. In addition, this keyword is used to support :ref:`Automatic Script Creation <entry_points>`. +.. _keyword/extras_require: + ``extras_require`` A dictionary mapping names of "extras" (optional features of your project) to strings or lists of strings specifying what other distributions must be installed to support those features. See the section on :ref:`Declaring Dependencies` for details and examples of the format of this argument. +.. _keyword/python_requires: + ``python_requires`` A string corresponding to a version specifier (as defined in PEP 440) for the Python version, used to specify the Requires-Python defined in PEP 345. -``setup_requires`` +.. _keyword/setup_requires: +``setup_requires`` .. warning:: - Using ``setup_requires`` is discouraged in favor of `PEP-518`_ + Using ``setup_requires`` is discouraged in favor of :pep:`518`. A string or list of strings specifying what other distributions need to be present in order for the setup script to run. ``setuptools`` will - attempt to obtain these (even going so far as to download them using - ``EasyInstall``) before processing the rest of the setup script or commands. - This argument is needed if you are using distutils extensions as part of - your build process; for example, extensions that process setup() arguments - and turn them into EGG-INFO metadata files. + attempt to obtain these before processing the + rest of the setup script or commands. This argument is needed if you + are using distutils extensions as part of your build process; for + example, extensions that process setup() arguments and turn them into + EGG-INFO metadata files. (Note: projects listed in ``setup_requires`` will NOT be automatically installed on the system where the setup script is being run. They are @@ -236,18 +339,18 @@ Keywords when the setup script is run, you should add them to ``install_requires`` and ``setup_requires``.) -.. _PEP-518: http://www.python.org/dev/peps/pep-0518/ +.. _keyword/dependency_links: ``dependency_links`` - .. warning:: ``dependency_links`` is deprecated. It is not supported anymore by pip. A list of strings naming URLs to be searched when satisfying dependencies. These links will be used if needed to install packages specified by ``setup_requires`` or ``tests_require``. They will also be written into - the egg's metadata for use by tools like EasyInstall to use when installing - an ``.egg`` file. + the egg's metadata for use during install by tools that support them. + +.. _keyword/namespace_packages: ``namespace_packages`` A list of strings naming the project's "namespace packages". A namespace @@ -261,6 +364,8 @@ Keywords does not contain any code other than a namespace declaration. See the section on :ref:`Namespace Packages` for more information. +.. _keyword/test_suite: + ``test_suite`` A string naming a ``unittest.TestCase`` subclass (or a package or module containing one or more of them, or a method of such a subclass), or naming @@ -270,27 +375,36 @@ Keywords added to the tests to be run. If the named suite is a package, any submodules and subpackages are recursively added to the overall test suite. - Specifying this argument enables use of the :ref:`test` command to run the + Specifying this argument enables use of the :ref:`test <test>` command to run the specified test suite, e.g. via ``setup.py test``. See the section on the - :ref:`test` command below for more details. + :ref:`test <test>` command below for more details. + + .. warning:: + .. deprecated:: 41.5.0 + The test command will be removed in a future version of ``setuptools``, + alongside any test configuration parameter. - New in 41.5.0: Deprecated the test command. +.. _keyword/tests_require: ``tests_require`` If your project's tests need one or more additional packages besides those needed to install it, you can use this option to specify them. It should be a string or list of strings specifying what other distributions need to be present for the package's tests to run. When you run the ``test`` - command, ``setuptools`` will attempt to obtain these (even going - so far as to download them using ``EasyInstall``). Note that these - required projects will not be installed on the system where the tests - are run, but only downloaded to the project's setup directory if they're - not already installed locally. + command, ``setuptools`` will attempt to obtain these. + Note that these required projects will not be installed on + the system where the tests are run, but only downloaded to the project's setup + directory if they're not already installed locally. - New in 41.5.0: Deprecated the test command. + .. warning:: + .. deprecated:: 41.5.0 + The test command will be removed in a future version of ``setuptools``, + alongside any test configuration parameter. .. _test_loader: +.. _keyword/test_loader: + ``test_loader`` If you would like to use a different way of finding tests to run than what setuptools normally uses, you can specify a module name and class name in @@ -312,7 +426,12 @@ Keywords as long as you use the ``tests_require`` option to ensure that the package containing the loader class is available when the ``test`` command is run. - New in 41.5.0: Deprecated the test command. + .. warning:: + .. deprecated:: 41.5.0 + The test command will be removed in a future version of ``setuptools``, + alongside any test configuration parameter. + +.. _keyword/eager_resources: ``eager_resources`` A list of strings naming resources that should be extracted together, if @@ -330,6 +449,8 @@ Keywords mess with it. For more details on how this argument works, see the section below on :ref:`Automatic Resource Extraction`. +.. _keyword/project_urls: + ``project_urls`` An arbitrary map of URL names to hyperlinks, allowing more extensible documentation of where various resources can be found than the simple diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst index 49655acdd0..74e9b1e4ce 100644 --- a/docs/userguide/index.rst +++ b/docs/userguide/index.rst @@ -32,7 +32,6 @@ quickstart provides an overview of the new workflow. extension declarative_config pyproject_config - keywords commands functionalities_rewrite miscellaneous diff --git a/docs/userguide/keywords.rst b/docs/userguide/keywords.rst deleted file mode 100644 index 5388ffea7f..0000000000 --- a/docs/userguide/keywords.rst +++ /dev/null @@ -1,163 +0,0 @@ -New and Changed ``setup()`` Keywords -==================================== - -The following keyword arguments to ``setup()`` are added or changed by -``setuptools``. All of them are optional; you do not have to supply them -unless you need the associated ``setuptools`` feature. - -``include_package_data`` - If set to ``True``, this tells ``setuptools`` to automatically include any - data files it finds inside your package directories that are specified by - your ``MANIFEST.in`` file. For more information, see the section on - :ref:`Including Data Files`. - -``exclude_package_data`` - A dictionary mapping package names to lists of glob patterns that should - be excluded from your package directories. You can use this to trim back - any excess files included by ``include_package_data``. For a complete - description and examples, see the section on :ref:`Including Data Files`. - -``package_data`` - A dictionary mapping package names to lists of glob patterns. For a - complete description and examples, see the section on :ref:`Including - Data Files`. You do not need to use this option if you are using - ``include_package_data``, unless you need to add e.g. files that are - generated by your setup script and build process. (And are therefore not - in source control or are files that you don't want to include in your - source distribution.) - -``zip_safe`` - A boolean (True or False) flag specifying whether the project can be - safely installed and run from a zip file. If this argument is not - supplied, the ``bdist_egg`` command will have to analyze all of your - project's contents for possible problems each time it builds an egg. - -``install_requires`` - A string or list of strings specifying what other distributions need to - be installed when this one is. See the section on :ref:`Declaring - Dependencies` for details and examples of the format of this argument. - -``entry_points`` - A dictionary mapping entry point group names to strings or lists of strings - defining the entry points. Entry points are used to support dynamic - discovery of services or plugins provided by a project. See :ref:`Dynamic - Discovery of Services and Plugins` for details and examples of the format - of this argument. In addition, this keyword is used to support - :ref:`Automatic Script Creation <entry_points>`. - -``extras_require`` - A dictionary mapping names of "extras" (optional features of your project) - to strings or lists of strings specifying what other distributions must be - installed to support those features. See the section on :ref:`Declaring - Dependencies` for details and examples of the format of this argument. - -``python_requires`` - A string corresponding to a version specifier (as defined in PEP 440) for - the Python version, used to specify the Requires-Python defined in PEP 345. - -``setup_requires`` - A string or list of strings specifying what other distributions need to - be present in order for the setup script to run. ``setuptools`` will - attempt to obtain these (using pip if available) before processing the - rest of the setup script or commands. This argument is needed if you - are using distutils extensions as part of your build process; for - example, extensions that process setup() arguments and turn them into - EGG-INFO metadata files. - - (Note: projects listed in ``setup_requires`` will NOT be automatically - installed on the system where the setup script is being run. They are - simply downloaded to the ./.eggs directory if they're not locally available - already. If you want them to be installed, as well as being available - when the setup script is run, you should add them to ``install_requires`` - and ``setup_requires``.) - -``dependency_links`` - A list of strings naming URLs to be searched when satisfying dependencies. - These links will be used if needed to install packages specified by - ``setup_requires`` or ``tests_require``. They will also be written into - the egg's metadata for use during install by tools that support them. - -``namespace_packages`` - A list of strings naming the project's "namespace packages". A namespace - package is a package that may be split across multiple project - distributions. For example, Zope 3's ``zope`` package is a namespace - package, because subpackages like ``zope.interface`` and ``zope.publisher`` - may be distributed separately. The egg runtime system can automatically - merge such subpackages into a single parent package at runtime, as long - as you declare them in each project that contains any subpackages of the - namespace package, and as long as the namespace package's ``__init__.py`` - does not contain any code other than a namespace declaration. See the - section below on :ref:`Namespace Packages` for more information. - -``test_suite`` - A string naming a ``unittest.TestCase`` subclass (or a package or module - containing one or more of them, or a method of such a subclass), or naming - a function that can be called with no arguments and returns a - ``unittest.TestSuite``. If the named suite is a module, and the module - has an ``additional_tests()`` function, it is called and the results are - added to the tests to be run. If the named suite is a package, any - submodules and subpackages are recursively added to the overall test suite. - - Specifying this argument enables use of the :ref:`test <test>` command to run the - specified test suite, e.g. via ``setup.py test``. See the section on the - :ref:`test <test>` command below for more details. - - New in 41.5.0: Deprecated the test command. - -``tests_require`` - If your project's tests need one or more additional packages besides those - needed to install it, you can use this option to specify them. It should - be a string or list of strings specifying what other distributions need to - be present for the package's tests to run. When you run the ``test`` - command, ``setuptools`` will attempt to obtain these (using pip if - available). Note that these required projects will not be installed on - the system where the tests are run, but only downloaded to the project's setup - directory if they're not already installed locally. - - New in 41.5.0: Deprecated the test command. - -.. _test_loader: - -``test_loader`` - If you would like to use a different way of finding tests to run than what - setuptools normally uses, you can specify a module name and class name in - this argument. The named class must be instantiable with no arguments, and - its instances must support the ``loadTestsFromNames()`` method as defined - in the Python ``unittest`` module's ``TestLoader`` class. Setuptools will - pass only one test "name" in the ``names`` argument: the value supplied for - the ``test_suite`` argument. The loader you specify may interpret this - string in any way it likes, as there are no restrictions on what may be - contained in a ``test_suite`` string. - - The module name and class name must be separated by a ``:``. The default - value of this argument is ``"setuptools.command.test:ScanningLoader"``. If - you want to use the default ``unittest`` behavior, you can specify - ``"unittest:TestLoader"`` as your ``test_loader`` argument instead. This - will prevent automatic scanning of submodules and subpackages. - - The module and class you specify here may be contained in another package, - as long as you use the ``tests_require`` option to ensure that the package - containing the loader class is available when the ``test`` command is run. - - New in 41.5.0: Deprecated the test command. - -``eager_resources`` - A list of strings naming resources that should be extracted together, if - any of them is needed, or if any C extensions included in the project are - imported. This argument is only useful if the project will be installed as - a zipfile, and there is a need to have all of the listed resources be - extracted to the filesystem as a unit. Resources listed here - should be "/"-separated paths, relative to the source root, so to list a - resource ``foo.png`` in package ``bar.baz``, you would include the string - ``bar/baz/foo.png`` in this argument. - - If you only need to obtain resources one at a time, or you don't have any C - extensions that access other files in the project (such as data files or - shared libraries), you probably do NOT need this argument and shouldn't - mess with it. For more details on how this argument works, see the section - below on :ref:`Automatic Resource Extraction`. - -``project_urls`` - An arbitrary map of URL names to hyperlinks, allowing more extensible - documentation of where various resources can be found than the simple - ``url`` and ``download_url`` options provide. diff --git a/docs/userguide/package_discovery.rst b/docs/userguide/package_discovery.rst index 38119bc6fa..0854a709b8 100644 --- a/docs/userguide/package_discovery.rst +++ b/docs/userguide/package_discovery.rst @@ -6,7 +6,7 @@ Package Discovery and Namespace Package .. note:: a full specification for the keyword supplied to ``setup.cfg`` or - ``setup.py`` can be found at :doc:`keywords reference <keywords>` + ``setup.py`` can be found at :doc:`keywords reference </references/keywords>` .. note:: the examples provided here are only to demonstrate the functionality diff --git a/setup.cfg b/setup.cfg index 4b386243a4..158919e55c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -93,6 +93,7 @@ docs = pygments-github-lexers==0.0.5 sphinx-favicon sphinx-inline-tabs + sphinx-reredirects sphinxcontrib-towncrier furo
iterative__dvc-1757	typo in docs super minor typo: $dvc repro --help -c CWD, --cwd CWD Directory within your repo to reroduce from. dvc --version 0.30.1	[ { "content": "from __future__ import unicode_literals\n\nimport os\n\nimport dvc.logger as logger\nfrom dvc.command.base import CmdBase\nfrom dvc.command.status import CmdDataStatus\nfrom dvc.exceptions import DvcException\n\n\nclass CmdRepro(CmdBase):\n def run(self):\n recursive = not self.args.sing...	[ { "content": "from __future__ import unicode_literals\n\nimport os\n\nimport dvc.logger as logger\nfrom dvc.command.base import CmdBase\nfrom dvc.command.status import CmdDataStatus\nfrom dvc.exceptions import DvcException\n\n\nclass CmdRepro(CmdBase):\n def run(self):\n recursive = not self.args.sing...	diff --git a/dvc/command/repro.py b/dvc/command/repro.py index 05b82e879f..8e582196fa 100644 --- a/dvc/command/repro.py +++ b/dvc/command/repro.py @@ -80,7 +80,7 @@ def add_parser(subparsers, parent_parser): "-c", "--cwd", default=os.path.curdir, - help="Directory within your repo to reroduce from.", + help="Directory within your repo to reproduce from.", ) repro_parser.add_argument( "-m",
localstack__localstack-4741	question: ENABLE_CONFIG_UPDATES for docker image ### Is there an existing issue for this? - [x] I have searched the existing issues and read the documentation ### Question Seems like ENABLE_CONFIG_UPDATES=1 works only in host mode. Is there way to enable it for docker ? ### Anything else? _No response_	[ { "content": "import json\nimport logging\nimport os\nimport platform\nimport re\nimport socket\nimport subprocess\nimport tempfile\nimport time\nfrom os.path import expanduser\n\nimport six\nfrom boto3 import Session\n\nfrom localstack.constants import (\n AWS_REGION_US_EAST_1,\n DEFAULT_BUCKET_MARKER_LO...	[ { "content": "import json\nimport logging\nimport os\nimport platform\nimport re\nimport socket\nimport subprocess\nimport tempfile\nimport time\nfrom os.path import expanduser\n\nimport six\nfrom boto3 import Session\n\nfrom localstack.constants import (\n AWS_REGION_US_EAST_1,\n DEFAULT_BUCKET_MARKER_LO...	diff --git a/localstack/config.py b/localstack/config.py index 53ac92b18af18..3908046a04ad7 100644 --- a/localstack/config.py +++ b/localstack/config.py @@ -354,6 +354,7 @@ def is_linux(): "EXTRA_CORS_ALLOWED_HEADERS", "EXTRA_CORS_EXPOSE_HEADERS", "EXTRA_CORS_ALLOWED_ORIGINS", + "ENABLE_CONFIG_UPDATES", ] for key, value in six.iteritems(DEFAULT_SERVICE_PORTS):
Lightning-Universe__lightning-flash-666	ImageEmbedder default behavior is not a flattened output ## 🐛 Bug I discovered this issue while testing PR #655. If you run the [Image Embedding README example code](https://github.com/PyTorchLightning/lightning-flash#example-1-image-embedding), it returns a 3D tensor. My understanding from the use of embeddings in general, and how they are used in [Fifty One](https://voxel51.com/docs/fiftyone/tutorials/image_embeddings.html) is they expect the embeddings to be 1D (for each embedding). The reason it returns a 3D tensor is because it depends on the backbone used. The default there is `resnet101`, which returns a `2048x7x7` shape tensor. Others like inception return a flat 1D tensor, i.e. length-X. ### To Reproduce Steps to reproduce the behavior: Run the [README example](https://github.com/PyTorchLightning/lightning-flash#example-1-image-embedding), but remove the `embedding_dim` parameter. See below for example. Note: as-is, this will error on `print(embeddings.shape)`, regardless of configuration, since that is a list. But the question here is around the logic for the ImageEmbedder. #### Code sample ```python from flash.core.data.utils import download_data from flash.image import ImageEmbedder # 1. Download the data download_data("https://pl-flash-data.s3.amazonaws.com/hymenoptera_data.zip", "data/") # 2. Create an ImageEmbedder with resnet50 trained on imagenet. embedder = ImageEmbedder(backbone="resnet50") # 3. Generate an embedding from an image path. embeddings = embedder.predict("data/hymenoptera_data/predict/153783656_85f9c3ac70.jpg") # 4. Print embeddings shape print(embeddings.shape) ``` ### Expected behavior Expect to see a 100352x1 shape tensor as the output, instead of 2048x7x7. ### Environment - PyTorch Version (e.g., 1.0): 1.9 - OS (e.g., Linux): Linux - How you installed PyTorch (`conda`, `pip`, source): pip - Build command you used (if compiling from source): N/A - Python version: 3.8.6 - CUDA/cuDNN version: N/A - GPU models and configuration: N/A - Any other relevant information: N/A ### Additional context I believe the question is around what the logic should be here: https://github.com/PyTorchLightning/lightning-flash/blob/075de3a46d74d9fc0e769401063fede1f12d0518/flash/image/embedding/model.py#L85-L92 If `embedding_dim` is None, then the head is `nn.Identity()`. If we desire a flat 1D embedding, then the question is: should `nn.Identity()` change to `nn.Flatten()`? It could be argued that the user should be left to flatten after on their own, but per the contributing guidelines, I thought this would align with "[Force User Decisions To Best Practices](https://github.com/PyTorchLightning/lightning-flash/blob/ddd942d3dfe3884a97a855446410166c3c9f16d9/.github/CONTRIBUTING.md#force-user-decisions-to-best-practices)" Let me know your thoughts. If that makes sense, then I can update the code, run some tests, and update docs in a PR.	[ { "content": "# Copyright The PyTorch Lightning team.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required ...	[ { "content": "# Copyright The PyTorch Lightning team.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required ...	diff --git a/flash/image/embedding/model.py b/flash/image/embedding/model.py index f5e2c0cca9..a8cab9b90a 100644 --- a/flash/image/embedding/model.py +++ b/flash/image/embedding/model.py @@ -107,7 +107,7 @@ def forward(self, x) -> torch.Tensor: if isinstance(x, tuple): x = x[-1] - if x.dim() == 4 and self.embedding_dim: + if x.dim() == 4 and not self.embedding_dim: x = self.apply_pool(x) x = self.head(x)
buildbot__buildbot-3653	Default value is set wrong when triggerring a forcescheduler by REST API Assume that we have a forcescheduler like below: ```python ForceBuild_Scheduler = ForceScheduler( name="ForceBuild_Scheduler", buttonName=u"Force, label=u"Force", builderNames=["BuildEntry_Builder"], username=util.UserNameParameter(hide=True), reason=util.StringParameter(name="reason", default="force build", hide=True), codebases=[util.CodebaseParameter(codebase='', hide=True)], properties=[util.BooleanParameter(name="DefaultToBeTrue", label=u"", default=True)) ``` And trigger this scheduler by sending a post with body like below which doesn't contain value of `DefaultToBeTrue`. ```json { "jsonrpc": "2.0", "method":"force", "id":843, "params":{ } } ``` And then you can find that `self.getProperty('DefaultToBeTrue')` whose default value is set to `True` returns `False` in your buildstep. Default value is set wrong when triggerring a forcescheduler by REST API Assume that we have a forcescheduler like below: ```python ForceBuild_Scheduler = ForceScheduler( name="ForceBuild_Scheduler", buttonName=u"Force, label=u"Force", builderNames=["BuildEntry_Builder"], username=util.UserNameParameter(hide=True), reason=util.StringParameter(name="reason", default="force build", hide=True), codebases=[util.CodebaseParameter(codebase='', hide=True)], properties=[util.BooleanParameter(name="DefaultToBeTrue", label=u"", default=True)) ``` And trigger this scheduler by sending a post with body like below which doesn't contain value of `DefaultToBeTrue`. ```json { "jsonrpc": "2.0", "method":"force", "id":843, "params":{ } } ``` And then you can find that `self.getProperty('DefaultToBeTrue')` whose default value is set to `True` returns `False` in your buildstep.	[ { "content": "# This file is part of Buildbot. Buildbot is free software: you can\n# redistribute it and/or modify it under the terms of the GNU General Public\n# License as published by the Free Software Foundation, version 2.\n#\n# This program is distributed in the hope that it will be useful, but WITHOUT\n...	[ { "content": "# This file is part of Buildbot. Buildbot is free software: you can\n# redistribute it and/or modify it under the terms of the GNU General Public\n# License as published by the Free Software Foundation, version 2.\n#\n# This program is distributed in the hope that it will be useful, but WITHOUT\n...	diff --git a/master/buildbot/schedulers/forcesched.py b/master/buildbot/schedulers/forcesched.py index 0fbc29b9b057..76d5b5ac52c6 100644 --- a/master/buildbot/schedulers/forcesched.py +++ b/master/buildbot/schedulers/forcesched.py @@ -249,7 +249,7 @@ class BooleanParameter(BaseParameter): type = "bool" def getFromKwargs(self, kwargs): - return kwargs.get(self.fullName, None) == [True] + return kwargs.get(self.fullName, [self.default]) == [True] class UserNameParameter(StringParameter):
internetarchive__openlibrary-8944	No `Cache-Control` headers on IA CDN requests ### Problem These two JS load on every page: https://openlibrary.org/cdn/archive.org/donate.js and. https://openlibrary.org/cdn/archive.org/analytics.js However, they are not cached like the rest of the JS. This causes a lot (2 seconds) delay when on a very slow connection (only a few 100ms on a decent connection). Their headers: ``` Content-Encoding: gzip Content-Type: text/javascript Date: Wed, 20 Mar 2024 11:48:52 GMT Referrer-Policy: no-referrer-when-downgrade Server: nginx/1.18.0 (Ubuntu) Vary: Accept-Encoding X-Ol-Stats: "" ``` Headers for all other requests: ``` Cache-Control: max-age=315360000 Content-Encoding: gzip Content-Type: application/javascript Date: Wed, 20 Mar 2024 11:03:17 GMT Etag: W/"65e78c3f-69215" Expires: Thu, 31 Dec 2037 23:55:55 GMT Last-Modified: Tue, 05 Mar 2024 21:18:55 GMT Referrer-Policy: no-referrer-when-downgrade Server: nginx/1.18.0 (Ubuntu) ``` #### Evidence / Screenshot <img width="1511" alt="image" src="https://github.com/internetarchive/openlibrary/assets/921217/79644e7c-160c-44f4-ac3d-1c795665b1f0"> #### Relevant URL(s) ### Reproducing the bug _No response_ ### Context _No response_ ### Notes from this Issue's Lead #### Proposal & constraints <!-- What is the proposed solution / implementation? Is there a precedent of this approach succeeding elsewhere? --> Add cache control headers. Probably should also add `defer` or `async` to their script tags so they don't block loading when they're not cached but this could be a different issue. https://javascript.info/script-async-defer #### Related files <!-- Files related to this issue; this is super useful for new contributors who might want to help! If you're not sure, leave this blank; a maintainer will add them. --> https://github.com/internetarchive/openlibrary/blob/45ed08186221233c04f1859e3b8a703152b01539/openlibrary/plugins/openlibrary/code.py#L425-L430 https://github.com/internetarchive/openlibrary/blob/45ed08186221233c04f1859e3b8a703152b01539/openlibrary/templates/site/footer.html#L41-L42 https://github.com/internetarchive/openlibrary/blob/45ed08186221233c04f1859e3b8a703152b01539/openlibrary/plugins/upstream/utils.py#L1468-L1469 #### Stakeholders <!-- @ tag stakeholders of this bug --> PS: I don't have bandwidth to take this right now.	[ { "content": "\"\"\"\nOpen Library Plugin.\n\"\"\"\n\nfrom urllib.parse import parse_qs, urlparse, urlencode, urlunparse\nimport requests\nimport web\nimport json\nimport os\nimport socket\nimport random\nimport datetime\nimport logging\nfrom time import time\nimport math\nfrom pathlib import Path\nimport infog...	[ { "content": "\"\"\"\nOpen Library Plugin.\n\"\"\"\n\nfrom urllib.parse import parse_qs, urlparse, urlencode, urlunparse\nimport requests\nimport web\nimport json\nimport os\nimport socket\nimport random\nimport datetime\nimport logging\nfrom time import time\nimport math\nfrom pathlib import Path\nimport infog...	diff --git a/openlibrary/plugins/openlibrary/code.py b/openlibrary/plugins/openlibrary/code.py index 0e6fe909afa..3ab9762dcdd 100644 --- a/openlibrary/plugins/openlibrary/code.py +++ b/openlibrary/plugins/openlibrary/code.py @@ -427,6 +427,7 @@ class ia_js_cdn(delegate.page): def GET(self, filename): web.header('Content-Type', 'text/javascript') + web.header("Cache-Control", "max-age=%d" % (24 * 3600)) return web.ok(fetch_ia_js(filename))
litestar-org__litestar-1773	StaticFilesConfig and virtual directories I'm trying to write a ``FileSystemProtocol`` to load files from the package data using [importlib_resources](https://importlib-resources.readthedocs.io/en/latest/using.html#). But because ``directories`` is defined as ``DirectoryPath``, pydantic checks if the given directories exist in the local filesystem. This is not generally true, especially in any kind of virtual filesystem (e.g. a zipped package). I think this condition should be relaxed to support virtual filesystems. https://github.com/starlite-api/starlite/blob/9bb6dcd57c10a591377cf8e3a537e9292566d5b9/starlite/config/static_files.py#L32	[ { "content": "from __future__ import annotations\n\nfrom litestar.exceptions import ImproperlyConfiguredException\n\n__all__ = (\"DTOException\", \"UnsupportedType\")\n\n\nclass DTOException(ImproperlyConfiguredException):\n \"\"\"Base exception for DTO errors.\"\"\"\n\n\nclass UnsupportedType(DTOException):...	[ { "content": null, "path": "litestar/dto/exceptions.py" } ]	diff --git a/docs/reference/dto/exceptions.rst b/docs/reference/dto/exceptions.rst deleted file mode 100644 index c809fb9510..0000000000 --- a/docs/reference/dto/exceptions.rst +++ /dev/null @@ -1,5 +0,0 @@ -exceptions -========== - -.. automodule:: litestar.dto.exceptions - :members: diff --git a/docs/reference/dto/index.rst b/docs/reference/dto/index.rst index b793fa9f5d..4e80207dc8 100644 --- a/docs/reference/dto/index.rst +++ b/docs/reference/dto/index.rst @@ -5,5 +5,4 @@ dto :titlesonly: interface - exceptions factory/index diff --git a/litestar/dto/exceptions.py b/litestar/dto/exceptions.py deleted file mode 100644 index 6d8ae2a5ce..0000000000 --- a/litestar/dto/exceptions.py +++ /dev/null @@ -1,13 +0,0 @@ -from __future__ import annotations - -from litestar.exceptions import ImproperlyConfiguredException - -__all__ = ("DTOException", "UnsupportedType") - - -class DTOException(ImproperlyConfiguredException): - """Base exception for DTO errors.""" - - -class UnsupportedType(DTOException): - """Raised when a type is not supported by Litestar."""
SeldonIO__MLServer-1064	decode_args with tuple return value I'm confused about how to use `decode_args()` when the model returns a tuple of, let's say, a numpy array. If I have an inference function with the following signature ```python import numpy as np from mlserver.codecs.decorator import decode_args def predict(input: np.ndarray) -> tuple[np.ndarray]: # simple identity model return (input, ) decode_args(predict) ``` I receive a ``` CodecNotFound: Codec not found for output field with type tuple[numpy.ndarray] ``` error message. I think the issue lies in the following line that is used to unwrap the tuple signature and convert it to a list of types. https://github.com/SeldonIO/MLServer/blob/9d7045cc3c50a14201733865ca0c3e8480ebd942/mlserver/codecs/decorator.py#L37 However the line checks if the type hint is a tuple instance, which is not true in the above case: `isinstance(tuple[np.ndarray], tuple) == False)` To make `decode_args` work with a tuple return signature, I have to change the function signature to ```python def predict(input: np.ndarray) -> tuple([np.ndarray]): ``` which is an actual tuple instance and not a type hint. This looks like a bug to me.	[ { "content": "from functools import wraps, partial\nfrom typing import (\n Any,\n Callable,\n Coroutine,\n Dict,\n List,\n Optional,\n Union,\n Type,\n Tuple,\n get_origin,\n get_args,\n get_type_hints,\n TYPE_CHECKING,\n)\n\n\nfrom ..types import InferenceRequest, Inferen...	[ { "content": "from functools import wraps, partial\nfrom typing import (\n Any,\n Callable,\n Coroutine,\n Dict,\n List,\n Optional,\n Union,\n Type,\n Tuple,\n get_origin,\n get_args,\n get_type_hints,\n TYPE_CHECKING,\n)\n\n\nfrom ..types import InferenceRequest, Inferen...	diff --git a/mlserver/codecs/decorator.py b/mlserver/codecs/decorator.py index 89367fcbf..19d2e81e0 100644 --- a/mlserver/codecs/decorator.py +++ b/mlserver/codecs/decorator.py @@ -38,6 +38,10 @@ def _as_list(a: Optional[Union[Any, Tuple[Any]]]) -> List[Any]: # Split into components return list(a) + if get_origin(a) is tuple: + # Convert type arguments into list + return list(get_args(a)) + # Otherwise, assume it's a single element return [a] diff --git a/tests/codecs/test_decorator.py b/tests/codecs/test_decorator.py index 6e949062a..b809cb081 100644 --- a/tests/codecs/test_decorator.py +++ b/tests/codecs/test_decorator.py @@ -2,7 +2,7 @@ import numpy as np import pandas as pd -from typing import Any, Callable, Dict, Optional, List +from typing import Any, Callable, Dict, Optional, List, Tuple from mlserver.types import ( InferenceRequest, @@ -13,7 +13,7 @@ ) from mlserver.codecs.base import InputCodec from mlserver.codecs.utils import Codec -from mlserver.codecs.decorator import SignatureCodec +from mlserver.codecs.decorator import SignatureCodec, _as_list from mlserver.codecs.errors import InputsNotFound, OutputNotFound from mlserver.codecs.numpy import NumpyCodec, NumpyRequestCodec from mlserver.codecs.string import StringCodec @@ -287,3 +287,13 @@ async def test_decode_args( res = NumpyRequestCodec.decode_response(inference_response) assert res == output_value + + +def test_as_list_typing_tuple(): + signature_list = _as_list(Tuple[np.ndarray, np.ndarray]) + assert signature_list == [np.ndarray, np.ndarray] + + +def test_as_list_native_tuple(): + signature_list = _as_list((np.ndarray, np.ndarray)) + assert signature_list == [np.ndarray, np.ndarray]
pypa__virtualenv-2107	site.getsitepackages() doesn't respect --system-site-packages on python2 Issue site.getsitepackages() doesn't respect --system-site-packages being set on python2. System site-package paths are never included. I came across this while working on #2105. In contrast to #2105 this is not specific to debian, which is why I am creating a separate issue for it. ``` python -m virtualenv --system-site-packages -ppython2 testenv . testenv/bin/activate python -c "import site; print(site.getsitepackages())" ['/home/adrian/Documents/dev/uni/bachelor/mypy/testenv/lib/python2.7/site-packages', '/home/adrian/Documents/dev/uni/bachelor/mypy/testenv/lib/site-python'] ``` Environment Provide at least: - OS: Tested on both Ubuntu 18.04.3 LTS and Arch Linux - ``pip list`` of the host python where ``virtualenv`` is installed: Same as #2105 Output of the virtual environment creation Make sure to run the creation with `-vvv --with-traceback`: Same as #2105	[ { "content": "# -- coding: utf-8 --\n\"\"\"\nA simple shim module to fix up things on Python 2 only.\n\nNote: until we setup correctly the paths we can only import built-ins.\n\"\"\"\nimport sys\n\n\ndef main():\n \"\"\"Patch what needed, and invoke the original site.py\"\"\"\n config = read_pyvenv()\n ...	[ { "content": "# -- coding: utf-8 --\n\"\"\"\nA simple shim module to fix up things on Python 2 only.\n\nNote: until we setup correctly the paths we can only import built-ins.\n\"\"\"\nimport sys\n\n\ndef main():\n \"\"\"Patch what needed, and invoke the original site.py\"\"\"\n config = read_pyvenv()\n ...	diff --git a/docs/changelog/2106.bugfix.rst b/docs/changelog/2106.bugfix.rst new file mode 100644 index 000000000..ec68bb584 --- /dev/null +++ b/docs/changelog/2106.bugfix.rst @@ -0,0 +1 @@ +Fix ``site.getsitepackages()`` ignoring ``--system-site-packages`` on python2 - by :user:`freundTech`. diff --git a/src/virtualenv/create/via_global_ref/builtin/python2/site.py b/src/virtualenv/create/via_global_ref/builtin/python2/site.py index 85eee842a..d2ee84fdb 100644 --- a/src/virtualenv/create/via_global_ref/builtin/python2/site.py +++ b/src/virtualenv/create/via_global_ref/builtin/python2/site.py @@ -158,7 +158,7 @@ def add_global_site_package(): site.PREFIXES = [sys.base_prefix, sys.base_exec_prefix] site.main() finally: - site.PREFIXES = orig_prefixes + site.PREFIXES = orig_prefixes + site.PREFIXES main() diff --git a/tests/unit/create/test_creator.py b/tests/unit/create/test_creator.py index 35f3f2493..69c7c96b3 100644 --- a/tests/unit/create/test_creator.py +++ b/tests/unit/create/test_creator.py @@ -1,5 +1,6 @@ from __future__ import absolute_import, unicode_literals +import ast import difflib import gc import json @@ -621,3 +622,34 @@ def test_pth_in_site_vs_PYTHONPATH(tmp_path): env=env, ) assert out == "ok\n" + + +def test_getsitepackages_system_site(tmp_path): + import site + + old_prefixes = site.PREFIXES + site.PREFIXES = [sys.base_prefix, sys.base_exec_prefix] + system_site_packages = site.getsitepackages() + site.PREFIXES = old_prefixes + + # Test without --system-site-packages + session = cli_run([ensure_text(str(tmp_path))]) + out = subprocess.check_output( + [str(session.creator.exe), "-c", r"import site; print(site.getsitepackages())"], + universal_newlines=True, + ) + site_packages = ast.literal_eval(out) + + for system_site_package in system_site_packages: + assert system_site_package not in site_packages + + # Test with --system-site-packages + session = cli_run([ensure_text(str(tmp_path)), "--system-site-packages"]) + out = subprocess.check_output( + [str(session.creator.exe), "-c", r"import site; print(site.getsitepackages())"], + universal_newlines=True, + ) + site_packages = ast.literal_eval(out) + + for system_site_package in system_site_packages: + assert system_site_package in site_packages
zulip__zulip-11317	Improve formatting for "arguments" sections with long examples. The line-wrapping for this endpoint's API documentation looks really ugly: ![image](https://user-images.githubusercontent.com/2746074/47042583-7e303200-d140-11e8-9b4f-d6fc1325dcba.png) We should either remove the maximum width on "description", or figure out a way to use more than one line for a given endpoint that doesn't look so bad (e.g. having the example be on the next line after the rest of the endpoint description).	[ { "content": "import re\nimport os\nimport ujson\n\nfrom django.utils.html import escape as escape_html\nfrom markdown.extensions import Extension\nfrom markdown.preprocessors import Preprocessor\nfrom zerver.lib.openapi import get_openapi_parameters\nfrom typing import Any, Dict, Optional, List\nimport markdow...	[ { "content": "import re\nimport os\nimport ujson\n\nfrom django.utils.html import escape as escape_html\nfrom markdown.extensions import Extension\nfrom markdown.preprocessors import Preprocessor\nfrom zerver.lib.openapi import get_openapi_parameters\nfrom typing import Any, Dict, Optional, List\nimport markdow...	diff --git a/static/third/bootstrap/css/bootstrap.css b/static/third/bootstrap/css/bootstrap.css index ef4330f7db3fb..23de9383f0f20 100644 --- a/static/third/bootstrap/css/bootstrap.css +++ b/static/third/bootstrap/css/bootstrap.css @@ -2008,6 +2008,16 @@ table { vertical-align: bottom; } +.table .json-api-example { + width: fit-content; + max-width: 300px; + word-wrap: break-word; +} + +.table .json-api-example code { + white-space: pre-wrap; +} + .table caption + thead tr:first-child th, .table caption + thead tr:first-child td, .table colgroup + thead tr:first-child th, diff --git a/zerver/lib/bugdown/api_arguments_table_generator.py b/zerver/lib/bugdown/api_arguments_table_generator.py index 885f8081d1426..d55c332133bc3 100644 --- a/zerver/lib/bugdown/api_arguments_table_generator.py +++ b/zerver/lib/bugdown/api_arguments_table_generator.py @@ -105,7 +105,7 @@ def render_table(self, arguments: List[Dict[str, Any]]) -> List[str]: tr = """ <tr> <td><code>{argument}</code></td> - <td><code>{example}</code></td> + <td class="json-api-example"><code>{example}</code></td> <td>{required}</td> <td>{description}</td> </tr>
voxel51__fiftyone-3905	[BUG] App is stuck on "Pixelating.." screen when loading COCO custom dataset. ### Describe the problem When loading my custom COCO dataset, I cannot launch the app on my Windows PC. The dataset is successfully created, but when I launch the app either in a script or in a jupyter notebook, it remain on the "Pixelating..." screen, even for a sample of 5 images. ### Code to reproduce issue Provide a reproducible test case that is the bare minimum necessary to generate the problem. Please avoid sharing code that relies on your local data or datasets. Include a short video or screenshot if the bug is in the App. ``` import os import fiftyone as fo import fiftyone.zoo as foz # The directory containing the source images data_path = r"...\data" # The path to the COCO labels JSON file labels_path = r"...\val.json" # Import the dataset dataset = fo.Dataset.from_dir( dataset_type=fo.types.COCODetectionDataset, data_path=data_path, labels_path=labels_path, label_types=["detections"], max_samples=1 ) session = fo.launch_app(dataset) ``` ### System information - OS Platform and Distribution: Windows 10 - Python version (`python --version`): 3.8.16 - FiftyOne version (`fiftyone --version`): v0.23.0 - FiftyOne installed from (pip or source): pip ### Other info/logs ![Screenshot 2023-12-07 at 2 32 04 PM](https://github.com/voxel51/fiftyone/assets/53239931/50a7c963-0215-44a0-8875-2de03ad8d1d3) ### Willingness to contribute The FiftyOne Community encourages bug fix contributions. Would you or another member of your organization be willing to contribute a fix for this bug to the FiftyOne codebase? - [ ] Yes. I can contribute a fix for this bug independently - [x] Yes. I would be willing to contribute a fix for this bug with guidance from the FiftyOne community - [ ] No. I cannot contribute a bug fix at this time	[ { "content": "\"\"\"\nFiftyOne Server queries.\n\n\| Copyright 2017-2023, Voxel51, Inc.\n\| `voxel51.com <https://voxel51.com/>`_\n\|\n\"\"\"\nfrom dataclasses import asdict\nfrom datetime import date, datetime\nfrom enum import Enum\nimport logging\nimport os\nimport typing as t\n\nimport eta.core.serial as etas\...	[ { "content": "\"\"\"\nFiftyOne Server queries.\n\n\| Copyright 2017-2023, Voxel51, Inc.\n\| `voxel51.com <https://voxel51.com/>`_\n\|\n\"\"\"\nfrom dataclasses import asdict\nfrom datetime import date, datetime\nfrom enum import Enum\nimport logging\nimport os\nimport typing as t\n\nimport eta.core.serial as etas\...	diff --git a/fiftyone/server/query.py b/fiftyone/server/query.py index 2cda36e6422..03d5e30fd3c 100644 --- a/fiftyone/server/query.py +++ b/fiftyone/server/query.py @@ -317,6 +317,9 @@ def modifier(doc: dict) -> dict: ] doc["default_skeletons"] = doc.get("default_skeletons", None) + # gql private fields must always be present + doc.setdefault("frame_collection_name", None) + return doc @classmethod diff --git a/tests/unittests/server_tests.py b/tests/unittests/server_tests.py index e7b8dac3c9e..7f41262cd48 100644 --- a/tests/unittests/server_tests.py +++ b/tests/unittests/server_tests.py @@ -13,8 +13,9 @@ import fiftyone.core.labels as fol import fiftyone.core.odm as foo import fiftyone.core.sample as fos -import fiftyone.server.view as fosv +from fiftyone.server.query import Dataset from fiftyone.server.samples import paginate_samples +import fiftyone.server.view as fosv from decorators import drop_datasets from utils.groups import make_disjoint_groups_dataset @@ -894,3 +895,10 @@ async def test_disjoint_groups(self): ) self.assertEqual(len(second_samples.edges), 1) self.assertEqual(second_samples.edges[0].node.id, second._id) + + +class ServerDocTests(unittest.TestCase): + def test_dataset_doc(self): + doc = Dataset.modifier({"_id": "id"}) + self.assertIn("frame_collection_name", doc) + self.assertEqual(doc["frame_collection_name"], None)
projectmesa__mesa-112	DataCollector bug Found a minor bug in DataCollector, where some variables are not initialized in the instance, and become class variables instead. Fixing.	[ { "content": "'''\nMesa Data Collection Module\n=====================================================\n\nDataCollector is meant to provide a simple, standard way to collect data\ngenerated by a Mesa model. It collects three types of data: model-level data,\nagent-level data, and tables.\n\nA DataCollector is in...	[ { "content": "'''\nMesa Data Collection Module\n=====================================================\n\nDataCollector is meant to provide a simple, standard way to collect data\ngenerated by a Mesa model. It collects three types of data: model-level data,\nagent-level data, and tables.\n\nA DataCollector is in...	diff --git a/mesa/datacollection.py b/mesa/datacollection.py index 0a4a929091b..f3270381373 100644 --- a/mesa/datacollection.py +++ b/mesa/datacollection.py @@ -80,6 +80,9 @@ def __init__(self, model_reporters={}, agent_reporters={}, tables={}): self.model_reporters = {} self.agent_reporters = {} + + self.model_vars = {} + self.agent_vars = {} self.tables = {} for name, func in model_reporters.items():
plotly__dash-796	[BUG] Auto-generated docstrings contain JS boolean values instead of Python boolean values Prompted by https://github.com/plotly/dash-bio/pull/379#discussion_r297840872 While `true` and `false` are not capitalized in JavaScript, they are capitalized in Python. The Python components' docstrings should reflect this, since other JS types are "translated" into Python types (e.g., `PropTypes.shape` -> `dict`).	[ { "content": "from collections import OrderedDict\nimport copy\nimport os\n\nfrom dash.development.base_component import _explicitize_args\nfrom dash.exceptions import NonExistentEventException\nfrom ._all_keywords import python_keywords\nfrom .base_component import Component\n\n\n# pylint: disable=unused-argum...	[ { "content": "from collections import OrderedDict\nimport copy\nimport os\n\nfrom dash.development.base_component import _explicitize_args\nfrom dash.exceptions import NonExistentEventException\nfrom ._all_keywords import python_keywords\nfrom .base_component import Component\n\n\n# pylint: disable=unused-argum...	diff --git a/dash/development/_py_components_generation.py b/dash/development/_py_components_generation.py index 3fcd96c89f..61bfd9b228 100644 --- a/dash/development/_py_components_generation.py +++ b/dash/development/_py_components_generation.py @@ -436,6 +436,9 @@ def create_prop_docstring(prop_name, type_object, required, description, else: default = default['value'] + if default in ['true', 'false']: + default = default.title() + is_required = 'optional' if required: is_required = 'required' diff --git a/tests/unit/development/test_base_component.py b/tests/unit/development/test_base_component.py index c39fe9a766..c34c655de8 100644 --- a/tests/unit/development/test_base_component.py +++ b/tests/unit/development/test_base_component.py @@ -1041,7 +1041,7 @@ def assert_flow_docstring(assertEqual, docstring): "Keyword arguments:", "- requiredString (string; required): A required string", "- optionalString (string; default ''): A string that isn't required.", - "- optionalBoolean (boolean; default false): A boolean test", + "- optionalBoolean (boolean; default False): A boolean test", "- optionalNode (a list of or a singular dash component, string or number; optional): " "A node test",
liqd__a4-product-261	HTTP Header I'll propose to set the following HTTP header * `HttpOnly` * `X-XSS-Protection` * `X-Content-Type-Options: nosniff` * ~HSTS~ set via nginx See [OWASP headers project](https://www.owasp.org/index.php/OWASP_Secure_Headers_Project) for details	[ { "content": "\"\"\"Django settings for Beteiligung.in.\"\"\"\n\n# Build paths inside the project like this: os.path.join(BASE_DIR, ...)\nimport os\n\nCONFIG_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))\nPROJECT_DIR = os.path.dirname(CONFIG_DIR)\nBASE_DIR = os.path.dirname(PROJECT_DIR)\n\n#...	[ { "content": "\"\"\"Django settings for Beteiligung.in.\"\"\"\n\n# Build paths inside the project like this: os.path.join(BASE_DIR, ...)\nimport os\n\nCONFIG_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))\nPROJECT_DIR = os.path.dirname(CONFIG_DIR)\nBASE_DIR = os.path.dirname(PROJECT_DIR)\n\n#...	diff --git a/liqd_product/config/settings/base.py b/liqd_product/config/settings/base.py index 0fff0e15f..6f384ea79 100644 --- a/liqd_product/config/settings/base.py +++ b/liqd_product/config/settings/base.py @@ -386,3 +386,7 @@ # The default language is used for emails and strings # that are stored translated to the database. DEFAULT_LANGUAGE = 'de' + +SECURE_BROWSER_XSS_FILTER = True +SESSION_COOKIE_HTTPONLY = True +SECURE_CONTENT_TYPE_NOSNIFF = True
kivy__kivy-7520	kivy.uix.Video._on_eos might be called after unoad. Software Versions * Python: 3.7 * OS: linux * Kivy: 2.0.0 * Kivy installation method: pip Describe the bug When using ffpyplayer based video implementation, it's possible that ``eos`` gets set from frame fetching thread after the video has been unload, which results in an ``AttributeError``, since ``self._video`` gets set to ``None`` in ``kivy.uix.Video.unload``. Proposed fix Add additional check whether ``self._video`` is set in ``_do_eos`` (https://github.com/kivy/kivy/blob/master/kivy/uix/video.py#L260) ```python def _on_eos(self, *largs): if not self._video or self._video.eos != 'loop': self.state = 'stop' self.eos = True ``` Any objections? Otherwise i'd create a PR for this.	[ { "content": "'''\nVideo\n=====\n\nThe :class:`Video` widget is used to display video files and streams.\nDepending on your Video core provider, platform, and plugins, you will\nbe able to play different formats. For example, the pygame video\nprovider only supports MPEG1 on Linux and OSX. GStreamer is more\nve...	[ { "content": "'''\nVideo\n=====\n\nThe :class:`Video` widget is used to display video files and streams.\nDepending on your Video core provider, platform, and plugins, you will\nbe able to play different formats. For example, the pygame video\nprovider only supports MPEG1 on Linux and OSX. GStreamer is more\nve...	diff --git a/kivy/uix/video.py b/kivy/uix/video.py index acdc6328f9..935dec70db 100644 --- a/kivy/uix/video.py +++ b/kivy/uix/video.py @@ -257,7 +257,7 @@ def _on_video_frame(self, largs): self.canvas.ask_update() def _on_eos(self, largs): - if self._video.eos != 'loop': + if not self._video or self._video.eos != 'loop': self.state = 'stop' self.eos = True
nilearn__nilearn-3337	Spelling Error <!--Describe your proposed enhancement in detail.--> I think the authors meant to describe ADHD but have written ADHD as AHDH. It is just a simple spelling or typographic error. <!--List any pages that would be impacted by the enhancement.--> ### Affected pages 1. https://nilearn.github.io/dev/auto_examples/04_glm_first_level/plot_adhd_dmn.html#sphx-glr-auto-examples-04-glm-first-level-plot-adhd-dmn-py 2. https://nilearn.github.io/dev/glm/first_level_model.html#fitting-a-first-level-model	[ { "content": "\"\"\"Default Mode Network extraction of AHDH dataset\n===============================================\n\nThis example shows a full step-by-step workflow of fitting a GLM to data\nextracted from a seed on the Posterior Cingulate Cortex and saving the results.\n\nMore specifically:\n\n1. A sequence...	[ { "content": "\"\"\"Default Mode Network extraction of ADHD dataset\n===============================================\n\nThis example shows a full step-by-step workflow of fitting a GLM to data\nextracted from a seed on the Posterior Cingulate Cortex and saving the results.\n\nMore specifically:\n\n1. A sequence...	diff --git a/doc/changes/latest.rst b/doc/changes/latest.rst index 1d92f16d2b..5a8f083142 100644 --- a/doc/changes/latest.rst +++ b/doc/changes/latest.rst @@ -29,6 +29,7 @@ Fixes Now if band-pass elements are equal :func:`~nilearn.signal.butterworth` returns an unfiltered signal with a warning (:gh:`3293` by `Yasmin Mzayek`_). - The parameter ``alpha`` is now correctly passed to :func:`~plotting.plot_glass_brain` in :func:`~plotting.plot_connectome` (:gh:`3306` by `Koen Helwegen`_). - Fix plotting of background image in :func:`~nilearn.plotting.view_img` when the background is not the MNI template (:gh:`3312` by `Jerome Dockes`_). +- Fix the typographic error on the page :ref:`sphx_glr_auto_examples_04_glm_first_level_plot_adhd_dmn.py` (:gh:`3337` by `Sachin Patalasingh`_). Enhancements ------------ diff --git a/doc/changes/names.rst b/doc/changes/names.rst index a25ccc4f71..9158fb44f2 100644 --- a/doc/changes/names.rst +++ b/doc/changes/names.rst @@ -190,6 +190,8 @@ .. _Ryan Hammonds: https://github.com/ryanhammonds +.. _Sachin Patalasingh: https://github.com/sachin-bsai + .. _Salma Bougacha: https://github.com/salma1601 .. _Sami Jawhar: https://github.com/sjawhar diff --git a/examples/04_glm_first_level/plot_adhd_dmn.py b/examples/04_glm_first_level/plot_adhd_dmn.py index 708d11bccf..8a233dd99e 100644 --- a/examples/04_glm_first_level/plot_adhd_dmn.py +++ b/examples/04_glm_first_level/plot_adhd_dmn.py @@ -1,4 +1,4 @@ -"""Default Mode Network extraction of AHDH dataset +"""Default Mode Network extraction of ADHD dataset =============================================== This example shows a full step-by-step workflow of fitting a GLM to data
ivy-llc__ivy-18341	leaky_relu Paddle Frontend	[ { "content": "# local\nimport ivy\nfrom ivy.func_wrapper import with_supported_dtypes\nfrom ivy.functional.frontends.paddle.func_wrapper import to_ivy_arrays_and_back\nfrom ivy.functional.frontends.paddle.tensor.math import tanh as paddle_tanh\n\n\n@with_supported_dtypes({\"2.5.0 and below\": (\"float32\", \"fl...	[ { "content": "# local\nimport ivy\nfrom ivy.func_wrapper import with_supported_dtypes\nfrom ivy.functional.frontends.paddle.func_wrapper import to_ivy_arrays_and_back\nfrom ivy.functional.frontends.paddle.tensor.math import tanh as paddle_tanh\n\n\n@with_supported_dtypes({\"2.5.0 and below\": (\"float32\", \"fl...	diff --git a/ivy/functional/frontends/paddle/nn/functional/activation.py b/ivy/functional/frontends/paddle/nn/functional/activation.py index 6826012fb0b93..6dc559e93a758 100644 --- a/ivy/functional/frontends/paddle/nn/functional/activation.py +++ b/ivy/functional/frontends/paddle/nn/functional/activation.py @@ -209,3 +209,8 @@ def elu( @to_ivy_arrays_and_back def mish(x, name=None): return ivy.mish(x) + +@with_supported_dtypes({"2.4.2 and below": ("float32", "float64")}, "paddle") +@to_ivy_arrays_and_back +def leaky_relu(x, negative_slope=0.01, name=None): + return ivy.leaky_relu(x) diff --git a/ivy_tests/test_ivy/test_frontends/test_paddle/test_nn/test_functional/test_paddle_activation.py b/ivy_tests/test_ivy/test_frontends/test_paddle/test_nn/test_functional/test_paddle_activation.py index 7b55199f1e5b6..d6b1030ee98e8 100644 --- a/ivy_tests/test_ivy/test_frontends/test_paddle/test_nn/test_functional/test_paddle_activation.py +++ b/ivy_tests/test_ivy/test_frontends/test_paddle/test_nn/test_functional/test_paddle_activation.py @@ -514,3 +514,29 @@ def test_paddle_mish( on_device=on_device, x=x[0], ) + + +@handle_frontend_test( + fn_tree="paddle.nn.functional.leaky_relu", + dtype_and_x=helpers.dtype_and_values( + available_dtypes=helpers.get_dtypes("float"), + ), +) +def test_paddle_leaky_relu( + *, + dtype_and_x, + on_device, + fn_tree, + frontend, + test_flags, +): + input_dtype, x = dtype_and_x + helpers.test_frontend_function( + input_dtypes=input_dtype, + frontend=frontend, + test_flags=test_flags, + fn_tree=fn_tree, + on_device=on_device, + negative_slope=0.01, + x=x[0], + )
saleor__saleor-1540	TypeError when configuring MAX_CART_LINE_QUANTITY via environment variable ### What I'm trying to achieve Add an item to a cart ### Steps to reproduce the problem 1. Configure MAX_CART_LINE_QUANTITY via environment variable 2. Attempt to add an item to the cart ### What I expected to happen A new item is added to the cart ### What happened instead/how it failed TypeError, returns status 500, item is not added to cart ```Traceback (most recent call last): File "/home/henry/PythonVirtualenvs/saleor/lib/python3.5/site-packages/django/core/handlers/exception.py", line 41, in inner response = get_response(request) File "/home/henry/PythonVirtualenvs/saleor/lib/python3.5/site-packages/django/core/handlers/base.py", line 187, in _get_response response = self.process_exception_by_middleware(e, request) File "/home/henry/PythonVirtualenvs/saleor/lib/python3.5/site-packages/django/core/handlers/base.py", line 185, in _get_response response = wrapped_callback(request, callback_args, *callback_kwargs) File "/home/henry/Code/saleor/saleor/product/views.py", line 94, in product_add_to_cart if form.is_valid(): File "/home/henry/PythonVirtualenvs/saleor/lib/python3.5/site-packages/django/forms/forms.py", line 183, in is_valid return self.is_bound and not self.errors File "/home/henry/PythonVirtualenvs/saleor/lib/python3.5/site-packages/django/forms/forms.py", line 175, in errors self.full_clean() File "/home/henry/PythonVirtualenvs/saleor/lib/python3.5/site-packages/django/forms/forms.py", line 384, in full_clean self._clean_fields() File "/home/henry/PythonVirtualenvs/saleor/lib/python3.5/site-packages/django/forms/forms.py", line 402, in _clean_fields value = field.clean(value) File "/home/henry/PythonVirtualenvs/saleor/lib/python3.5/site-packages/django/forms/fields.py", line 162, in clean self.run_validators(value) File "/home/henry/PythonVirtualenvs/saleor/lib/python3.5/site-packages/django/forms/fields.py", line 145, in run_validators v(value) File "/home/henry/PythonVirtualenvs/saleor/lib/python3.5/site-packages/django/core/validators.py", line 325, in __call__ if self.compare(cleaned, self.limit_value): File "/home/henry/PythonVirtuale nvs/saleor/lib/python3.5/site-packages/django/core/validators.py", line 349, in compare return a > b TypeError: unorderable types: int() > str() ERROR django.server "POST /products/product-4/add/ HTTP/1.1" 500 24428 [PID:32324:Thread-17] ``` python version: 3.5.4 django version: 1.11.5 most recent upstream commit: 0ec214a3deb606a951a268f7f83e659857be4dd7 Here's how I worked around: [integer_cart_line_quantity.patch.txt](https://github.com/mirumee/saleor/files/1587457/integer_cart_line_quantity.patch.txt)	[ { "content": "import ast\nimport os.path\n\nimport dj_database_url\nimport dj_email_url\nfrom django.contrib.messages import constants as messages\nimport django_cache_url\n\n\ndef get_list(text):\n return [item.strip() for item in text.split(',')]\n\n\nDEBUG = ast.literal_eval(os.environ.get('DEBUG', 'True'...	[ { "content": "import ast\nimport os.path\n\nimport dj_database_url\nimport dj_email_url\nfrom django.contrib.messages import constants as messages\nimport django_cache_url\n\n\ndef get_list(text):\n return [item.strip() for item in text.split(',')]\n\n\nDEBUG = ast.literal_eval(os.environ.get('DEBUG', 'True'...	diff --git a/saleor/settings.py b/saleor/settings.py index 8f8bd3fdbc2..2f103c03fc3 100644 --- a/saleor/settings.py +++ b/saleor/settings.py @@ -280,7 +280,7 @@ def get_host(): messages.ERROR: 'danger'} LOW_STOCK_THRESHOLD = 10 -MAX_CART_LINE_QUANTITY = os.environ.get('MAX_CART_LINE_QUANTITY', 50) +MAX_CART_LINE_QUANTITY = int(os.environ.get('MAX_CART_LINE_QUANTITY', 50)) PAGINATE_BY = 16 DASHBOARD_PAGINATE_BY = 30
kivy__kivy-4403	Mouse position wrongly processed on high-dpi screens? Hi, we experience a strange issue where the mouse pos seems to be wrongly processed (or I misunderstood something). When executing the same code ([see gist](https://gist.github.com/johanneshk/a043333546494e0ae5957ac4c08542b7)), on a Macbook with dpi=192 the mouse pos for the top two squares (click on them) is twice what you get on a 'normal' screen with dpi=96. Which is why we assume that something's wrong with the dpi. The behavior on the 96dpi screen is what we expect. The top squares are arranged in a GridLayout, the bottom squares in a RelativeLayout. Interestingly the positions for the squares in the RelativeLayout seem to be correct. Tow screenshots that demonstrate this behavior: [correct](http://i.imgur.com/jGCMR5T.png) [wrong](http://imgur.com/WSULgp1) Any ideas?	[ { "content": "# found a way to include it more easily.\n'''\nSDL2 Window\n===========\n\nWindowing provider directly based on our own wrapped version of SDL.\n\nTODO:\n - fix keys\n - support scrolling\n - clean code\n - manage correctly all sdl events\n\n'''\n\n__all__ = ('WindowSDL2', )\n\nfrom os...	[ { "content": "# found a way to include it more easily.\n'''\nSDL2 Window\n===========\n\nWindowing provider directly based on our own wrapped version of SDL.\n\nTODO:\n - fix keys\n - support scrolling\n - clean code\n - manage correctly all sdl events\n\n'''\n\n__all__ = ('WindowSDL2', )\n\nfrom os...	diff --git a/kivy/core/window/window_sdl2.py b/kivy/core/window/window_sdl2.py index 9809b115b5..a3fc207de4 100644 --- a/kivy/core/window/window_sdl2.py +++ b/kivy/core/window/window_sdl2.py @@ -381,7 +381,7 @@ def _set_cursor_state(self, value): def _fix_mouse_pos(self, x, y): y -= 1 - self.mouse_pos = x, self.system_size[1] - y + self.mouse_pos = x * self._density, (self.system_size[1] - y) * self._density return x, y def _mainloop(self):
SciTools__cartopy-1999	Colouring countries ### Description Cartopy stop working when you try to color some countries, like Austria (AUT), Albania among others in Europe as far as I could see. My maps heve been working fine until couple last update on april. #### Code to reproduce ```python import matplotlib.pyplot as plt import cartopy import cartopy.io.shapereader as shpreader import cartopy.crs as ccrs import matplotlib.pyplot as plt import cartopy.crs as ccrs import cartopy.feature as cfeature def area(ax, iso, clr) : shp = shpreader.natural_earth(resolution='10m',category='cultural',name='admin_0_countries') reader = shpreader.Reader(shp) countries = reader.records() for n in countries : if n.attributes['ADM0_A3'] == iso: ax.add_geometries(n.geometry, ccrs.PlateCarree(), facecolor=clr, alpha = 1.00, linewidth =0.15, edgecolor = "black", label=n.attributes['ADM0_A3']) return ax iso3 = ['USA','CAN','RUS','GBR','ISL','FRA','ITA','AUT'] # works fine with this codes #iso3 = ['USA','CAN','RUS','GBR','ISL','FRA','ITA','CHN','AUT'] # error message - due to "AUT" - Austria def main(): ax = plt.axes(projection=ccrs.Miller()) states_provinces = cfeature.NaturalEarthFeature( category='cultural', name='admin_1_states_provinces_lines', scale='50m', facecolor='none') ax.add_feature(cfeature.LAND) ax.add_feature(cfeature.COASTLINE) ax.add_feature(states_provinces, edgecolor='gray') for n in iso3 : area(ax,n,"red") plt.show() if __name__ == '__main__': main() ``` #### Traceback ```python-traceback File "C:\ProgramData\Anaconda3\lib\site-packages\cartopy\mpl\geoaxes.py", line 588, in add_geometries feature = cartopy.feature.ShapelyFeature(geoms, crs, **kwargs) File "C:\ProgramData\Anaconda3\lib\site-packages\cartopy\feature\__init__.py", line 231, in __init__ self._geoms = tuple(geometries) TypeError: 'Polygon' object is not iterable ``` <details> <summary>Full environment definition</summary> <!-- fill in the following information as appropriate --> ### Operating system Windows 10 ### Cartopy version 0.17.0 ### conda list 4.64.14 ### pip list 19.1 </details>	[ { "content": "# Copyright Cartopy Contributors\n#\n# This file is part of Cartopy and is released under the LGPL license.\n# See COPYING and COPYING.LESSER in the root of the repository for full\n# licensing details.\n\n\"\"\"\nThis module defines :class:`Feature` instances, for use with\nax.add_feature().\n\n\...	[ { "content": "# Copyright Cartopy Contributors\n#\n# This file is part of Cartopy and is released under the LGPL license.\n# See COPYING and COPYING.LESSER in the root of the repository for full\n# licensing details.\n\n\"\"\"\nThis module defines :class:`Feature` instances, for use with\nax.add_feature().\n\n\...	diff --git a/lib/cartopy/feature/__init__.py b/lib/cartopy/feature/__init__.py index e7685522e..86d4b7670 100644 --- a/lib/cartopy/feature/__init__.py +++ b/lib/cartopy/feature/__init__.py @@ -214,6 +214,8 @@ def __init__(self, geometries, crs, kwargs): """ super().__init__(crs, kwargs) + if isinstance(geometries, sgeom.base.BaseGeometry): + geometries = [geometries] self._geoms = tuple(geometries) def geometries(self): diff --git a/lib/cartopy/tests/mpl/test_axes.py b/lib/cartopy/tests/mpl/test_axes.py index a431ce989..904274ffe 100644 --- a/lib/cartopy/tests/mpl/test_axes.py +++ b/lib/cartopy/tests/mpl/test_axes.py @@ -13,6 +13,7 @@ import pytest import cartopy.crs as ccrs +import cartopy.feature as cfeature from cartopy.mpl.geoaxes import InterProjectionTransform, GeoAxes @@ -108,6 +109,14 @@ def test_styler_kwarg(self, ShapelyFeature, add_feature_method): add_feature_method.assert_called_once_with( ShapelyFeature(), styler=mock.sentinel.styler) + @pytest.mark.natural_earth + def test_single_geometry(self): + # A single geometry is acceptable + proj = ccrs.PlateCarree() + ax = GeoAxes(plt.figure(), [0, 0, 1, 1], + map_projection=proj) + ax.add_geometries(next(cfeature.COASTLINE.geometries()), crs=proj) + @cleanup def test_geoaxes_subplot():
castorini__pyserini-667	Switch to jnius_config.add_classpath Currently, pyserini replaces any previously registered jars on the classpath in its setup code. Is there any reason to not use add_classpath() instead of set_classpath()? Here is the pyjnius relevant code: ```python def set_classpath(path): """ Sets the classpath for the JVM to use. Replaces any existing classpath, overriding the CLASSPATH environment variable. """ check_vm_running() global classpath classpath = list(path) def add_classpath(path): """ Appends items to the classpath for the JVM to use. Replaces any existing classpath, overriding the CLASSPATH environment variable. """ check_vm_running() global classpath if classpath is None: classpath = list(path) else: classpath.extend(path) ```	[ { "content": "#\n# Pyserini: Reproducible IR research with sparse and dense representations\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/...	[ { "content": "#\n# Pyserini: Reproducible IR research with sparse and dense representations\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/...	diff --git a/pyserini/setup.py b/pyserini/setup.py index ec07b22a5..1cc1560c2 100644 --- a/pyserini/setup.py +++ b/pyserini/setup.py @@ -37,4 +37,4 @@ def configure_classpath(anserini_root="."): raise Exception('No matching jar file found in {}'.format(os.path.abspath(anserini_root))) latest = max(paths, key=os.path.getctime) - jnius_config.set_classpath(latest) + jnius_config.add_classpath(latest)
ivy-llc__ivy-27943	Fix Ivy Failing Test: jax - elementwise.asinh	[ { "content": "# global\nfrom typing import Union, Optional\n\nimport jax\nimport jax.numpy as jnp\n\n# local\nimport ivy\nfrom ivy import (\n default_float_dtype,\n is_float_dtype,\n)\nfrom ivy import promote_types_of_inputs\nfrom ivy.functional.backends.jax import JaxArray\nfrom ivy.func_wrapper import w...	[ { "content": "# global\nfrom typing import Union, Optional\n\nimport jax\nimport jax.numpy as jnp\n\n# local\nimport ivy\nfrom ivy import (\n default_float_dtype,\n is_float_dtype,\n)\nfrom ivy import promote_types_of_inputs\nfrom ivy.functional.backends.jax import JaxArray\nfrom ivy.func_wrapper import w...	diff --git a/ivy/functional/backends/jax/elementwise.py b/ivy/functional/backends/jax/elementwise.py index 42a5fd51077c5..056996b8cc710 100644 --- a/ivy/functional/backends/jax/elementwise.py +++ b/ivy/functional/backends/jax/elementwise.py @@ -55,6 +55,7 @@ def asin(x: JaxArray, /, , out: Optional[JaxArray] = None) -> JaxArray: return jnp.arcsin(x) +@with_unsupported_dtypes({"0.4.23 and below": ("complex",)}, backend_version) def asinh(x: JaxArray, /, , out: Optional[JaxArray] = None) -> JaxArray: return jnp.arcsinh(x)
ethereum__web3.py-2568	Can not parse tuple[][] ABI type * Version: 5.29.2 * Python: 3.7.3 * OS: osx * `pip freeze` output ``` aiohttp==3.8.1 aiosignal==1.2.0 alabaster==0.7.12 anaconda-client==1.7.2 anaconda-navigator==1.9.7 anaconda-project==0.8.3 anticaptchaofficial==1.0.34 apns2==0.7.2 appnope==0.1.0 appscript==1.0.1 asn1crypto==0.24.0 astroid==2.2.5 astropy==3.2.1 async-generator==1.10 async-timeout==4.0.2 asynctest==0.13.0 atomicwrites==1.3.0 attrs==21.2.0 Babel==2.7.0 backcall==0.1.0 backports.functools-lru-cache==1.5 backports.os==0.1.1 backports.shutil-get-terminal-size==1.0.0 backports.tempfile==1.0 backports.weakref==1.0.post1 base58==2.1.1 beautifulsoup4==4.7.1 bitarray==1.2.2 bkcharts==0.2 bleach==3.1.0 blocknative-sdk==0.2.5 bokeh==1.2.0 boto==2.49.0 Bottleneck==1.2.1 certifi==2019.6.16 cffi==1.12.3 chardet==3.0.4 charset-normalizer==2.0.11 Click==7.0 cloudpickle==1.2.1 clyent==1.2.2 colorama==0.4.1 conda==4.7.10 conda-build==3.18.8 conda-package-handling==1.3.11 conda-verify==3.4.2 contextlib2==0.5.5 cryptography==2.7 cycler==0.10.0 Cython==0.29.12 cytoolz==0.11.2 dask==2.1.0 decorator==4.4.0 defusedxml==0.6.0 distributed==2.1.0 dnspython==2.2.0 docutils==0.14 entrypoints==0.3 et-xmlfile==1.0.1 eth-abi==2.1.1 eth-account==0.5.8 eth-hash==0.3.2 eth-keyfile==0.5.1 eth-keys==0.3.4 eth-rlp==0.3.0 eth-typing==2.3.0 eth-utils==1.10.0 fake-useragent==0.1.11 fastcache==1.1.0 filelock==3.0.12 Flask==1.1.1 frozenlist==1.3.0 future==0.17.1 gevent==1.4.0 glob2==0.7 gmpy2==2.0.8 greenlet==0.4.15 h11==0.12.0 h2==2.6.2 h5py==2.9.0 heapdict==1.0.0 hexbytes==0.2.2 hpack==3.0.0 html5lib==1.0.1 hyper==0.7.0 hyperframe==3.2.0 idna==3.2 imageio==2.5.0 imagesize==1.1.0 importlib-metadata==0.17 importlib-resources==5.8.0 ipfshttpclient==0.8.0a2 ipykernel==5.1.1 ipython==7.6.1 ipython-genutils==0.2.0 ipywidgets==7.5.0 isort==4.3.21 itsdangerous==1.1.0 jdcal==1.4.1 jedi==0.13.3 Jinja2==2.10.1 joblib==0.13.2 json5==0.8.4 jsonschema==4.6.0 jupyter==1.0.0 jupyter-client==5.3.1 jupyter-console==6.0.0 jupyter-core==4.5.0 jupyterlab==1.0.2 jupyterlab-server==1.0.0 keyring==18.0.0 kiwisolver==1.1.0 lazy-object-proxy==1.4.1 libarchive-c==2.8 lief==0.9.0 llvmlite==0.29.0 locket==0.2.0 lru-dict==1.1.7 lxml==4.3.4 MarkupSafe==1.1.1 matplotlib==3.1.0 mccabe==0.6.1 mistune==0.8.4 mkl-fft==1.0.12 mkl-random==1.0.2 mkl-service==2.0.2 mock==3.0.5 more-itertools==7.0.0 mpmath==1.1.0 msgpack==0.6.1 multiaddr==0.0.9 multidict==6.0.2 multipledispatch==0.6.0 navigator-updater==0.2.1 nbconvert==5.5.0 nbformat==4.4.0 netaddr==0.8.0 networkx==2.3 nltk==3.4.4 nose==1.3.7 notebook==6.0.0 numba==0.44.1 numexpr==2.6.9 numpy==1.16.4 numpydoc==0.9.1 olefile==0.46 openpyxl==2.6.2 outcome==1.1.0 packaging==19.0 pandas==0.24.2 pandocfilters==1.4.2 parsimonious==0.8.1 parso==0.5.0 partd==1.0.0 path.py==12.0.1 pathlib2==2.3.4 patsy==0.5.1 pep8==1.7.1 pexpect==4.7.0 phxsocket==0.1.2 pickleshare==0.7.5 Pillow==6.1.0 pkginfo==1.5.0.1 pluggy==0.12.0 ply==3.11 prometheus-client==0.7.1 prompt-toolkit==2.0.9 protobuf==3.19.4 psutil==5.6.3 ptyprocess==0.6.0 py==1.8.0 pycodestyle==2.5.0 pycosat==0.6.3 pycparser==2.19 pycrypto==2.6.1 pycryptodome==3.14.1 pycurl==7.43.0.3 pyflakes==2.1.1 Pygments==2.4.2 PyJWT==1.7.1 pylint==2.3.1 pymongo==4.0.1 pyodbc==4.0.26 pyOpenSSL==19.0.0 pyparsing==2.4.0 pyrsistent==0.14.11 PySocks==1.7.0 pytest==5.0.1 pytest-arraydiff==0.3 pytest-astropy==0.5.0 pytest-doctestplus==0.3.0 pytest-openfiles==0.3.2 pytest-remotedata==0.3.1 python-dateutil==2.8.0 pytz==2019.1 PyWavelets==1.0.3 PyYAML==5.1.1 pyzmq==18.0.0 QtAwesome==0.5.7 qtconsole==4.5.1 QtPy==1.8.0 rel==0.4.7 requests==2.27.1 rlp==2.0.1 rope==0.14.0 ruamel-yaml==0.15.46 scikit-image==0.15.0 scikit-learn==0.21.2 scipy==1.3.0 seaborn==0.9.0 Send2Trash==1.5.0 simplegeneric==0.8.1 singledispatch==3.4.0.3 six==1.12.0 sniffio==1.2.0 snowballstemmer==1.9.0 sortedcollections==1.1.2 sortedcontainers==2.4.0 soupsieve==1.8 Sphinx==2.1.2 sphinxcontrib-applehelp==1.0.1 sphinxcontrib-devhelp==1.0.1 sphinxcontrib-htmlhelp==1.0.2 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.2 sphinxcontrib-serializinghtml==1.1.3 sphinxcontrib-websupport==1.1.2 spyder==3.3.6 spyder-kernels==0.5.1 SQLAlchemy==1.3.5 statsmodels==0.10.0 style==1.1.0 sympy==1.4 tables==3.5.2 tblib==1.4.0 terminado==0.8.2 testpath==0.4.2 toolz==0.10.0 tornado==6.0.3 tqdm==4.32.1 traitlets==4.3.2 trio==0.19.0 trio-websocket==0.9.2 typing-extensions==4.0.1 unicodecsv==0.14.1 update==0.0.1 urllib3==1.24.2 varint==1.0.2 wcwidth==0.1.7 web3==5.29.2 webencodings==0.5.1 websocket-client==1.3.2 websockets==9.1 Werkzeug==0.15.4 widgetsnbextension==3.5.0 wrapt==1.11.2 wsproto==1.0.0 wurlitzer==1.0.2 xlrd==1.2.0 XlsxWriter==1.1.8 xlwings==0.15.8 xlwt==1.3.0 yarl==1.7.2 zict==1.0.0 zipp==3.8.0 ``` ### What was wrong? The tuple regex match is something like this (in abi.py) ``` TUPLE_TYPE_STR_RE = re.compile(r'^(tuple)(\[([1-9][0-9]*)?\])?$') ``` where it can only match 'tuple[]' or 'tuple[12]' something like this. But the Seaport contract of opensea using 'tuple[][]' structure type for `fulfillAvailableOrders` and `fulfillAvailableAdvancedOrders`, which causes the regex match failed and can not correct encoding the data. The seaport contract is https://etherscan.io/address/0x00000000006c3852cbEf3e08E8dF289169EdE581 Please help to handle this case.	[ { "content": "import binascii\nfrom collections import (\n abc,\n namedtuple,\n)\nimport copy\nimport itertools\nimport re\nfrom typing import (\n Any,\n Callable,\n Collection,\n Dict,\n Iterable,\n List,\n Mapping,\n Optional,\n Sequence,\n Tuple,\n Type,\n Union,\n ...	[ { "content": "import binascii\nfrom collections import (\n abc,\n namedtuple,\n)\nimport copy\nimport itertools\nimport re\nfrom typing import (\n Any,\n Callable,\n Collection,\n Dict,\n Iterable,\n List,\n Mapping,\n Optional,\n Sequence,\n Tuple,\n Type,\n Union,\n ...	diff --git a/newsfragments/2555.feature.rst b/newsfragments/2555.feature.rst new file mode 100644 index 0000000000..fae2820847 --- /dev/null +++ b/newsfragments/2555.feature.rst @@ -0,0 +1 @@ +support multi-dimensional arrays for ABI tuples types diff --git a/tests/core/utilities/test_abi.py b/tests/core/utilities/test_abi.py index b861ee83ab..5f8c2406c9 100644 --- a/tests/core/utilities/test_abi.py +++ b/tests/core/utilities/test_abi.py @@ -21,23 +21,33 @@ 'input, expected', ( # Well-formed tuple type strings - ('tuple', ('tuple', None)), - ('tuple[]', ('tuple', '[]')), - ('tuple[1]', ('tuple', '[1]')), - ('tuple[10]', ('tuple', '[10]')), - ('tuple[19]', ('tuple', '[19]')), - ('tuple[195]', ('tuple', '[195]')), - + ("tuple", ("tuple", None)), + ("tuple[]", ("tuple", "[]")), + ("tuple[1]", ("tuple", "[1]")), + ("tuple[10]", ("tuple", "[10]")), + ("tuple[19]", ("tuple", "[19]")), + ("tuple[195]", ("tuple", "[195]")), + ("tuple[][]", ("tuple", "[][]")), + ("tuple[1][1]", ("tuple", "[1][1]")), + ("tuple[1][]", ("tuple", "[1][]")), + ("tuple[][1]", ("tuple", "[][1]")), + ("tuple[][][]", ("tuple", "[][][]")), + ("tuple[1][][]", ("tuple", "[1][][]")), + ("tuple[][1][]", ("tuple", "[][1][]")), + ("tuple[][][1]", ("tuple", "[][][1]")), # Malformed tuple type strings - ('tuple[][]', None), - ('tuple[1][1]', None), - ('tuple[0]', None), - ('tuple[01]', None), - ('tupleasfasdf', None), - ('uint256', None), - ('bool', None), - ('', None), - ('tupletuple', None), + ("tupleasfasdf", None), + ("uint256", None), + ("bool", None), + ("", None), + ("tupletuple", None), + ("tuple[0]", None), + ("tuple[01]", None), + ("tuple[][0]", None), + ("tuple[][01]", None), + ("tuple[0][][]", None), + ("tuple[][0][]", None), + ("tuple[][][0]", None), ), ) def test_get_tuple_type_str_parts(input, expected): diff --git a/web3/_utils/abi.py b/web3/_utils/abi.py index 698f4151cd..d58c283902 100644 --- a/web3/_utils/abi.py +++ b/web3/_utils/abi.py @@ -494,7 +494,7 @@ def merge_args_and_kwargs( return tuple() -TUPLE_TYPE_STR_RE = re.compile(r'^(tuple)(\[([1-9][0-9])?\])?$') +TUPLE_TYPE_STR_RE = re.compile(r"^(tuple)((\[([1-9]\d\b)?])*)??$") def get_tuple_type_str_parts(s: str) -> Optional[Tuple[str, Optional[str]]]:
translate__pootle-5024	Exception in terminology management view When visiting https://mozilla.locamotion.org/eu/firefox/terminology/ the following exception is thrown: `'SortedRelatedManager' object does not support indexing`	[ { "content": "# -- coding: utf-8 --\n#\n# Copyright (C) Pootle contributors.\n#\n# This file is a part of the Pootle project. It is distributed under the GPL3\n# or later license. See the LICENSE file for a copy of the license and the\n# AUTHORS file for copyright and authorship information.\n\nfrom django.co...	[ { "content": "# -- coding: utf-8 --\n#\n# Copyright (C) Pootle contributors.\n#\n# This file is a part of the Pootle project. It is distributed under the GPL3\n# or later license. See the LICENSE file for a copy of the license and the\n# AUTHORS file for copyright and authorship information.\n\nfrom django.co...	diff --git a/pootle/apps/pootle_terminology/views.py b/pootle/apps/pootle_terminology/views.py index 332559636bf..b65fde84e5e 100644 --- a/pootle/apps/pootle_terminology/views.py +++ b/pootle/apps/pootle_terminology/views.py @@ -27,7 +27,7 @@ def get_terminology_filename(translation_project): return ( 'pootle-terminology.%s' - % translation_project.project.filetypes[0].extension) + % translation_project.project.filetypes.first().extension) def manage_store(request, ctx, language, term_store):
liqd__a4-meinberlin-3150	#3289 Interactive Event URL: https://meinberlin-dev.liqd.net/projekte/module/interaktive-veranstaltung/ device & browser: e.g. Firefox 80.0 (64-bit) Comment/Question: ![Screenshot_2020-09-17-Lorem-Ipsum-—-meinBerlin(2)](https://user-images.githubusercontent.com/59610786/93490308-9d293700-f908-11ea-827f-a0988917bf37.jpg) 01 – The questions were supposed to be 20px, but its also fine for me like that. 02 – The Icons are different and fine, but this one seems a bit off, I have save the ones I did here in case you need them: Nextcloud/Projekte/meinBerlin/Material/CI/Bilder & Grafiken/icons/svg 03 – Shall we put a max number of characters here since the questions should be short? @CarolingerSeilchenspringer 04 – I did the spacing between the questions using 8px but if that was already the meinBerlin spacing guidelines, we leave like that. 05 – The category labels seem a bit far from the question, if possible, could we shorten the spacing here a bit so it gets closer from the question and "far" from the Like button? 06 – Are the moderators supposed to like the question? If yes, its not working for me. :/ ![Screenshot 2020-09-17 at 17 05 20](https://user-images.githubusercontent.com/59610786/93491015-7d464300-f909-11ea-9f17-fc4d7195597a.png) 07 – If possible can we use here the text style from the notes (14px)? ![Screenshot 2020-09-17 at 17 08 19](https://user-images.githubusercontent.com/59610786/93491078-90f1a980-f909-11ea-9b5a-22d06351d485.png) 08 – The statistics seem a bit off compared to the sketch on Zeplin. Same on Mobile. ![Screenshot 2020-09-17 at 17 03 12](https://user-images.githubusercontent.com/59610786/93491135-a1a21f80-f909-11ea-929d-e8bdb2140015.png) 09 – Selected categories seem a bit off after selecting them, they kind of stay there instead of just being selected. (Do you know what I mean? I can also explain to you better sharing the screen or something). ![Screenshot 2020-09-17 at 17 27 12](https://user-images.githubusercontent.com/59610786/93492752-715b8080-f90b-11ea-8a1f-b7d87e13416f.png) 10 – The Menu on Mobile is different than on Zeplin. ![Screenshot 2020-09-17 at 17 24 33](https://user-images.githubusercontent.com/59610786/93492800-86381400-f90b-11ea-993c-2616dc4993ab.png) 11 – Same here, the infobox is difficult to understand. Also the buttons are off, spacing inbetween them are different. ![Screenshot 2020-09-17 at 17 26 58](https://user-images.githubusercontent.com/59610786/93492878-994ae400-f90b-11ea-84a1-db9b760ba010.png) 12 – Small thing here but if possible, the success infobox should be aligned properly to the left. ![Screenshot 2020-09-17 at 17 25 59](https://user-images.githubusercontent.com/59610786/93492962-b2539500-f90b-11ea-9b06-bad2fa5eab15.png) 13 – Can we increase the spacing here a bit between the link and icon? ![Screenshot 2020-09-17 at 16 50 18](https://user-images.githubusercontent.com/59610786/93492603-4709c300-f90b-11ea-973a-8e99376faa24.png) 14 – The Blueprint is not updated, I left the .svg file on Taiga I just didn't manage to test the Initiator's view cause there is no project open to testing, could you edit the phase from one of yours and send me the link? Cause all the ones I created I'm the moderator as well. Thanks a lot! Let me know if you need anything :)	[ { "content": "from django.utils.translation import ugettext_lazy as _\n\nfrom adhocracy4.dashboard.blueprints import ProjectBlueprint\nfrom meinberlin.apps.budgeting import phases as budgeting_phases\nfrom meinberlin.apps.documents import phases as documents_phases\nfrom meinberlin.apps.ideas import phases as i...	[ { "content": "from django.utils.translation import ugettext_lazy as _\n\nfrom adhocracy4.dashboard.blueprints import ProjectBlueprint\nfrom meinberlin.apps.budgeting import phases as budgeting_phases\nfrom meinberlin.apps.documents import phases as documents_phases\nfrom meinberlin.apps.ideas import phases as i...	diff --git a/meinberlin/apps/dashboard/blueprints.py b/meinberlin/apps/dashboard/blueprints.py index 1dc37d5ea7..d43c17f282 100644 --- a/meinberlin/apps/dashboard/blueprints.py +++ b/meinberlin/apps/dashboard/blueprints.py @@ -152,7 +152,7 @@ content=[ livequestion_phases.IssuePhase(), ], - image='images/text-review.svg', + image='images/interactive-event.svg', settings_model=None, )), ] diff --git a/meinberlin/apps/livequestions/assets/Filters.jsx b/meinberlin/apps/livequestions/assets/Filters.jsx index 2ca14cbcfa..8ae1b9abaf 100644 --- a/meinberlin/apps/livequestions/assets/Filters.jsx +++ b/meinberlin/apps/livequestions/assets/Filters.jsx @@ -50,9 +50,9 @@ export default class Filter extends React.Component { checked={this.props.displayOnShortlist} onChange={this.props.toggleDisplayOnShortlist} // eslint-disable-line react/jsx-handler-names /> - <span className="checkbox-btn__text"> + <div className="checkbox-btn__text"> <i className="far fa-list-alt" aria-label={onlyShowMarkedText} /> - </span> + </div> </label> </div> <div className="checkbox-btn u-spacer-right"> diff --git a/meinberlin/apps/livequestions/assets/InfoBox.jsx b/meinberlin/apps/livequestions/assets/InfoBox.jsx index d7138ea414..9bcd189b75 100644 --- a/meinberlin/apps/livequestions/assets/InfoBox.jsx +++ b/meinberlin/apps/livequestions/assets/InfoBox.jsx @@ -35,29 +35,29 @@ export default class InfoBox extends React.Component { {this.props.isModerator && <div className="alert-dismissible"> <div className="u-align-right"> - <button type="button" className="u-muted" onClick={this.toggleInformation.bind(this)}> + <button type="button" className="btn btn--none u-muted" onClick={this.toggleInformation.bind(this)}> <span aria-label={ariaCloseInfo}>{btnHide} <i className="fa fa-times" /></span> </button> </div> - <div className="infobox u-inline-flex"> + <div className="infobox"> <div className="infobox__box"> <i className="far fa-list-alt" /> - <div>{textAddQuestion}</div> + <span className="infobox__text">{textAddQuestion}</span> </div> <div className="infobox__box"> - <span className="fa-stack fa-1x"> + <span className="fa-stack fa-1x infobox__icon"> <i className="fas fa-tv fa-stack-2x" aria-label="hidden"> </i> - <i className="fas fa-arrow-up fa-stack-1x" aria-label="hidden"> </i> + <i className="fas fa-check fa-stack-1x" aria-label="hidden"> </i> </span> - <div>{textDisplayQuestion}</div> + <span className="infobox__text">{textDisplayQuestion}</span> </div> <div className="infobox__box"> <i className="far fa-check-circle" /> - <div>{textMarkAnswered}</div> + <span className="infobox__text">{textMarkAnswered}</span> </div> <div className="infobox__box infobox__box--last"> <i className="far fa-eye" /> - <div>{textHideQuestion}</div> + <span className="infobox__text">{textHideQuestion}</span> </div> </div> </div>} diff --git a/meinberlin/apps/livequestions/assets/QuestionBox.jsx b/meinberlin/apps/livequestions/assets/QuestionBox.jsx index 635a6809c0..11a6eb6c7c 100644 --- a/meinberlin/apps/livequestions/assets/QuestionBox.jsx +++ b/meinberlin/apps/livequestions/assets/QuestionBox.jsx @@ -268,6 +268,17 @@ export default class QuestionBox extends React.Component { hasLikingPermission={this.props.hasLikingPermission} /> </div> + {this.props.hasAskQuestionsPermission && + <div className="l-center-6"> + <a + href={this.props.askQuestionUrl} + className="btn btn--primary btn--full btn--huge u-spacer-top" + id="question-create" + > + <i className="fa fa-plus question-list-button-icon" aria-hidden="true" /> + {django.gettext('Add Question')} + </a> + </div>} </div> </div> </div> diff --git a/meinberlin/apps/livequestions/assets/QuestionModerator.jsx b/meinberlin/apps/livequestions/assets/QuestionModerator.jsx index 73a77ceb1b..f97a3a07c7 100644 --- a/meinberlin/apps/livequestions/assets/QuestionModerator.jsx +++ b/meinberlin/apps/livequestions/assets/QuestionModerator.jsx @@ -105,7 +105,7 @@ export default class QuestionModerator extends React.Component { return ( <div className="list-item list-item--squashed"> <div> - <p className={this.props.is_hidden ? 'u-muted u-text-decoration-line-through' : ''}>{this.props.children}</p> + <p className={this.props.is_hidden ? 'u-muted u-text-decoration-line-through live_questions__question' : 'live_questions__question'}>{this.props.children}</p> </div> {this.props.category && <div> @@ -118,7 +118,7 @@ export default class QuestionModerator extends React.Component { <div> {this.props.displayIsOnShortlist && <button type="button" className="btn btn--none" onClick={this.toggleIsOnShortList.bind(this)}> - <i className={this.state.is_on_shortlist ? 'far fa-list-alt u-primary' : 'far fa-list-alt'} aria-label={this.state.is_on_shortlist ? addShortlistText : removeShortlistText} /> + <i className={this.state.is_on_shortlist ? 'far fa-list-alt u-primary' : 'far fa-list-alt u-muted'} aria-label={this.state.is_on_shortlist ? addShortlistText : removeShortlistText} /> </button>} {this.props.displayIsLive && <button type="button" className="btn btn--none" onClick={this.toggleIslive.bind(this)}> diff --git a/meinberlin/apps/livequestions/assets/QuestionUser.jsx b/meinberlin/apps/livequestions/assets/QuestionUser.jsx index 63efdff936..b9fafa8e01 100644 --- a/meinberlin/apps/livequestions/assets/QuestionUser.jsx +++ b/meinberlin/apps/livequestions/assets/QuestionUser.jsx @@ -58,7 +58,7 @@ export default class QuestionUser extends React.Component { <div> {this.props.is_on_shortlist && <i className="far fa-list-alt u-primary" aria-label={shortlistText} />} - <p> + <p className="live_questions__question"> {this.props.children} </p> </div> diff --git a/meinberlin/apps/livequestions/assets/StatisticsBox.jsx b/meinberlin/apps/livequestions/assets/StatisticsBox.jsx index b1bea53259..d1806d2f19 100644 --- a/meinberlin/apps/livequestions/assets/StatisticsBox.jsx +++ b/meinberlin/apps/livequestions/assets/StatisticsBox.jsx @@ -43,6 +43,7 @@ export default class StatisticsBox extends React.Component { render () { const questionAnsweredTag = django.gettext('Questions Answered') const categoriesAnsweredTag = django.gettext('Categories Answered') + return ( <div className="module-content"> <div className="l-wrapper"> @@ -58,8 +59,8 @@ export default class StatisticsBox extends React.Component { <div className="progress-bar" style={style} role="progressbar" aria-valuenow="25" aria-valuemin="0" aria-valuemax="100" - ><span> {category} </span>{countPerCategory}% - </div> + /> + <span className="progress-bar__stats"> {category} {countPerCategory}%</span> </div> </div> ) diff --git a/meinberlin/apps/livequestions/templates/meinberlin_livequestions/question_present_list.html b/meinberlin/apps/livequestions/templates/meinberlin_livequestions/question_present_list.html index e0d811cb0f..5f313c5e86 100644 --- a/meinberlin/apps/livequestions/templates/meinberlin_livequestions/question_present_list.html +++ b/meinberlin/apps/livequestions/templates/meinberlin_livequestions/question_present_list.html @@ -16,7 +16,7 @@ </div> </div> <div class="l-wrapper live_questions_infographic u-spacer-bottom"> - <div class="block--infographic__body"> + <div class="block--infographic__body u-spacer-bottom"> <div class="block--infographic__icon-block"> <div class="block--infographic__icon"> <img src="{% static 'images/icon_liveq_infografik_phone.svg' %}" alt=""> @@ -54,7 +54,7 @@ </div> </div> </div> - <div class="l-center-6 u-align-center"> + <div class="l-center-8 u-align-center"> <span>{% trans "join in here" %}<a href="{{ project.get_absolute_url }}">{{ view.get_full_url }}</a></span> </div> </div> diff --git a/meinberlin/assets/images/blueprints/interactive-event.svg b/meinberlin/assets/images/blueprints/interactive-event.svg new file mode 100644 index 0000000000..3f7d3e4885 --- /dev/null +++ b/meinberlin/assets/images/blueprints/interactive-event.svg @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 270 150" style="enable-background:new 0 0 270 150;" xml:space="preserve"> +<style type="text/css"> + .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#253377;} + .st1{fill:none;stroke:#FFFFFF;stroke-width:3.45;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;} + .st2{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;} + .st3{fill:#253377;stroke:#FFFFFF;stroke-miterlimit:10;} +</style> +<desc>Created with Sketch.</desc> +<rect id="icon_textCommenting" class="st0" width="270" height="150"/> +<g> + <g> + <rect x="99.2" y="21.7" class="st1" width="54.8" height="106.6"/> + <rect x="99.2" y="38" class="st1" width="54.8" height="74"/> + <circle class="st2" cx="126.7" cy="120.2" r="2.2"/> + <path class="st1" d="M118.8,29.7h15.8"/> + </g> + <path class="st3" d="M182.3,49.6h-43.9c-4.6,0-8.4,3.9-8.4,8.7v26.9c0,4.8,3.8,8.7,8.4,8.7H154v11.9l11.4-11.9h16.8 + c4.6,0,8.4-3.9,8.4-8.7V58.3C190.8,53.5,186.9,49.6,182.3,49.6z"/> + <path class="st1" d="M182.3,49.6h-43.9c-4.6,0-8.4,3.9-8.4,8.7v26.9c0,4.8,3.8,8.7,8.4,8.7H154v11.9l11.4-11.9h16.8 + c4.6,0,8.4-3.9,8.4-8.7V58.3C190.8,53.5,186.9,49.6,182.3,49.6z"/> +</g> +</svg> diff --git a/meinberlin/assets/scss/components/_list_item.scss b/meinberlin/assets/scss/components/_list_item.scss index 2f124bbde1..5b9a459132 100644 --- a/meinberlin/assets/scss/components/_list_item.scss +++ b/meinberlin/assets/scss/components/_list_item.scss @@ -18,7 +18,7 @@ .list-item--squashed { border: 0; - margin-bottom: 3px; + margin-bottom: 8px; @media print { border: 1px solid $border-color; diff --git a/meinberlin/assets/scss/components/_live_questions.scss b/meinberlin/assets/scss/components/_live_questions.scss index eb930eca52..641e402da7 100644 --- a/meinberlin/assets/scss/components/_live_questions.scss +++ b/meinberlin/assets/scss/components/_live_questions.scss @@ -14,16 +14,17 @@ } .live_questions__filters--dropdown { - width: 100%; + min-width: 100%; } .live_questions__filters--btns { width: 100%; display: inline-flex; justify-content: flex-end; + margin: $spacer 0; @media screen and (min-width: $breakpoint-xs) { - margin-left: $spacer; + margin: 0 0 0 $spacer; } } @@ -37,23 +38,68 @@ justify-content: space-between; } +.live_questions__question { + font-size: $font-size-lg; + margin-bottom: 0.25$spacer; +} + .infobox__box { background-color: $bg-tertiary; - padding: 0.5$spacer; - margin-right: $spacer; - text-align: center; + padding: 0.5$spacer $spacer; + font-size: $font-size-sm; + margin-bottom: $spacer; i { + position: absolute; color: $brand-primary; + line-height: 1.2rem; } } -.infobox__box--last { - margin-right: 0; +.infobox__text { + margin-left: 2$spacer; +} + +.infobox__icon { + margin-left: -0.6*$spacer; + position: absolute; +} + +//infobox bigger +@media screen and (min-width: $breakpoint-xs) { + .infobox { + display: inline-flex; + } + + .infobox__box { + text-align: center; + padding: $spacer; + margin-right: $spacer; + } + + .infobox__box > i { + display: block; + position: relative; + } + + .infobox__text { + margin-left: 0; + } + + .infobox__icon { + display: block; + position: relative; + margin: auto; + } + + .infobox__box--last { + margin-right: 0; + } } .progress { margin-bottom: $spacer; + position: relative; } .progress-bar { @@ -61,11 +107,16 @@ height: 1.5rem; background-color: $brand-primary-tint; border-radius: 0.25rem; + position: absolute; +} + +.progress-bar__stats { + position: relative; + z-index: 1; } .checkbox-btn { display: inline-block; - cursor: pointer; } .checkbox-btn__input { @@ -77,7 +128,6 @@ clip: rect(0, 0, 0, 0); white-space: nowrap; border: 0; - cursor: pointer; } .checkbox-btn__label--primary { @@ -87,6 +137,10 @@ cursor: pointer; } + input[type="checkbox"]:focus + .checkbox-btn__text { + box-shadow: 0 0 0 4px #5595ff; // Faking browser focus ring + } + input[type="checkbox"]:checked + .checkbox-btn__text { @extend .btn--secondary; } @@ -136,6 +190,10 @@ color: $body-bg; text-decoration: underline; display: block; + + @media screen and (min-width: $breakpoint) { + display: inline-block; + } } } @@ -155,5 +213,6 @@ } .fa-stack-1x { - font-size: 0.7rem; + font-size: 0.6rem; + line-height: 0.85rem; } diff --git a/meinberlin/assets/scss/utility.scss b/meinberlin/assets/scss/utility.scss index c6df1a6dc5..dd64515951 100644 --- a/meinberlin/assets/scss/utility.scss +++ b/meinberlin/assets/scss/utility.scss @@ -92,6 +92,10 @@ color: $text-color-gray; } +.u-text-decoration-line-through { + text-decoration: line-through; +} + .u-whitespace-pre { white-space: pre-wrap; }
fossasia__open-event-server-7659	Preset roles deletion is allowed Describe the bug Currently the preset roles like "organizer, coorganizer etc" should not be deleted from the db. But right now it is possible to delete these entries. To Reproduce Steps to reproduce the behavior: 1. Hit the delete endpoint for role 2. Choose any of the ids pointing to any of the 7 preset roles 3. You can find deletion to be successful Expected behavior <!-- A clear and concise description of what you expected to happen. --> Stacktrace <!-- If applicable, add stacktrace to help explain your problem. --> Additional details (please complete the following information): - OS: [e.g. MacOS, Ubuntu, CentOS] - Python Version [e.g. `3.5`, `3.6`] - `HEAD` Commit hash [e.g. `4629c62`] Additional context <!-- Add any other context about the problem here. -->	[ { "content": "from flask_rest_jsonapi import ResourceDetail, ResourceList\n\nfrom app.api.bootstrap import api\nfrom app.api.helpers.db import safe_query_kwargs\nfrom app.api.helpers.errors import UnprocessableEntityError\nfrom app.api.schema.roles import RoleSchema\nfrom app.models import db\nfrom app.models.r...	[ { "content": "from flask_rest_jsonapi import ResourceDetail, ResourceList\n\nfrom app.api.bootstrap import api\nfrom app.api.helpers.db import safe_query_kwargs\nfrom app.api.helpers.errors import UnprocessableEntityError\nfrom app.api.schema.roles import RoleSchema\nfrom app.models import db\nfrom app.models.r...	diff --git a/app/api/roles.py b/app/api/roles.py index 71fe93c13c..e30b3ad2bf 100644 --- a/app/api/roles.py +++ b/app/api/roles.py @@ -97,5 +97,8 @@ def before_delete_object(self, obj, kwargs): data_layer = { 'session': db.session, 'model': Role, - 'methods': {'before_get_object': before_get_object}, + 'methods': { + 'before_get_object': before_get_object, + 'before_delete_object': before_delete_object, + }, } diff --git a/tests/hook_main.py b/tests/hook_main.py index 42d93e99cd..4fc51f3408 100644 --- a/tests/hook_main.py +++ b/tests/hook_main.py @@ -2524,7 +2524,7 @@ def role_delete(transaction): :return: """ with stash['app'].app_context(): - role = RoleFactory() + role = RoleFactory(name="example role") db.session.add(role) db.session.commit()
ibis-project__ibis-2249	BUG: Multiple aliases on the same column not behaving as expected ``` python column = table.some_column table.projection( [ column.name("alias1"), column.name("alias2"), column.name("alias3"), ] ) ``` I think the expected behavior would be a table expression with: ``` Selection[table] table: Table: ref_0 selections: alias1 = Column[float64] 'some_column' from table ref_0 alias2 = Column[float64] 'some_column' from table ref_0 alias3 = Column[float64] 'some_column' from table ref_0 ``` However, the result I'm getting is: ``` Selection[table] table: Table: ref_0 selections: alias1 = Column[float64] 'some_column' from table ref_0 alias1 = Column[float64] 'some_column' from table ref_0 alias1 = Column[float64] 'some_column' from table ref_0 ```	[ { "content": "import ibis.expr.operations as ops\nimport ibis.expr.types as ir\nimport ibis.util as util\n\n\nclass FormatMemo:\n # A little sanity hack to simplify the below\n\n def __init__(self):\n from collections import defaultdict\n\n self.formatted = {}\n self.aliases = {}\n ...	[ { "content": "import ibis.expr.operations as ops\nimport ibis.expr.types as ir\nimport ibis.util as util\n\n\nclass FormatMemo:\n # A little sanity hack to simplify the below\n\n def __init__(self):\n from collections import defaultdict\n\n self.formatted = {}\n self.aliases = {}\n ...	diff --git a/docs/source/release/index.rst b/docs/source/release/index.rst index e0c1b0b87bad..92158b9b87ff 100644 --- a/docs/source/release/index.rst +++ b/docs/source/release/index.rst @@ -12,6 +12,7 @@ Release Notes These release notes are for versions of ibis 1.0 and later. Release notes for pre-1.0 versions of ibis can be found at :doc:`release-pre-1.0` +* :bug:`2229` Fix same column with multiple aliases not showing properly in repr * :feature:`2233` Add ibis.pandas.trace module to log time and call stack information. * :feature:`2198` Validate that the output type of a UDF is a single element * :bug:`2223` Fix PySpark compiler error when elementwise UDF output_type is Decimal or Timestamp diff --git a/ibis/expr/format.py b/ibis/expr/format.py index 7db80fbd48fa..c2a17a98822c 100644 --- a/ibis/expr/format.py +++ b/ibis/expr/format.py @@ -248,7 +248,7 @@ def visit(what, extra_indents=0): def _format_subexpr(self, expr): subexprs = self.memo.subexprs - key = expr.op() + key = expr._key try: result = subexprs[key] except KeyError: diff --git a/ibis/expr/tests/test_format.py b/ibis/expr/tests/test_format.py index 6dd0bc589399..e7b5a8ef4642 100644 --- a/ibis/expr/tests/test_format.py +++ b/ibis/expr/tests/test_format.py @@ -246,3 +246,25 @@ def output_type(self): second_arg: 2.0""" assert result == expected + + +def test_same_column_multiple_aliases(): + table = ibis.table([('col', 'int64')], name='t') + expr = table[table.col.name('alias1'), table.col.name('alias2')] + result = repr(expr) + expected = """\ +ref_0 +UnboundTable[table] + name: t + schema: + col : int64 + +Selection[table] + table: + Table: ref_0 + selections: + alias1 = Column[int64] 'col' from table + ref_0 + alias2 = Column[int64] 'col' from table + ref_0""" + assert result == expected
pwr-Solaar__Solaar-1826	Release 1.1.7	[ { "content": "#!/usr/bin/env python3\n\nfrom glob import glob as _glob\n\ntry:\n from setuptools import setup\nexcept ImportError:\n from distutils.core import setup\n\n# from solaar import NAME, __version__\n__version__ = '1.1.7'\nNAME = 'Solaar'\n\n\ndef _data_files():\n from os.path import dirname a...	[ { "content": "#!/usr/bin/env python3\n\nfrom glob import glob as _glob\n\ntry:\n from setuptools import setup\nexcept ImportError:\n from distutils.core import setup\n\n# from solaar import NAME, __version__\n__version__ = '1.1.7'\nNAME = 'Solaar'\n\n\ndef _data_files():\n from os.path import dirname a...	diff --git a/setup.py b/setup.py index ae7045cba8..38982eebd4 100755 --- a/setup.py +++ b/setup.py @@ -66,7 +66,6 @@ def _data_files(): 'PyYAML (>= 3.12)', 'python-xlib (>= 0.27)', 'psutil (>= 5.4.3)', - 'typing_extensions (>=4.0.0)', ], extras_require={ 'report-descriptor': ['hid-parser'],
microsoft__Qcodes-87	PR #70 breaks parameter .get and .set functionality I cannot debug the issue properly because all the objects are `multiprocessing` objects. A minimal example showing the issue: ``` python %matplotlib nbagg import matplotlib.pyplot as plt import time import numpy as np import qcodes as qc from toymodel import AModel, MockGates, MockSource, MockMeter, AverageGetter, AverageAndRaw # now create this "experiment" model = AModel() gates = MockGates('gates', model=model) c0, c1, c2 = gates.chan0, gates.chan1, gates.chan2 print('fine so far...') print('error...') c2.get() print('no effect?') c2.set(0.5) ```	[ { "content": "# code for example notebook\n\nimport math\n\nfrom qcodes import MockInstrument, MockModel, Parameter, Loop, DataArray\nfrom qcodes.utils.validators import Numbers\n\n\nclass AModel(MockModel):\n def __init__(self):\n self._gates = [0.0, 0.0, 0.0]\n self._excitation = 0.1\n ...	[ { "content": "# code for example notebook\n\nimport math\n\nfrom qcodes import MockInstrument, MockModel, Parameter, Loop, DataArray\nfrom qcodes.utils.validators import Numbers\n\n\nclass AModel(MockModel):\n def __init__(self):\n self._gates = [0.0, 0.0, 0.0]\n self._excitation = 0.1\n ...	diff --git a/docs/examples/toymodel.py b/docs/examples/toymodel.py index bccbeaae2dc..2731171d07f 100644 --- a/docs/examples/toymodel.py +++ b/docs/examples/toymodel.py @@ -40,7 +40,7 @@ def gates_set(self, parameter, value): def gates_get(self, parameter): if parameter[0] == 'c': - return self.fmt(self.gates[int(parameter[1:])]) + return self.fmt(self._gates[int(parameter[1:])]) else: raise ValueError
doccano__doccano-603	[Tiny enhancement request] Allow digit keys as shortkeys Feature description --------- English letters are allowed as shortkeys for annotation now, only. Proposition: allow English letters and digits as shortkeys.	[ { "content": "import string\n\nfrom django.db import models\nfrom django.dispatch import receiver\nfrom django.db.models.signals import post_save, pre_delete\nfrom django.urls import reverse\nfrom django.conf import settings\nfrom django.contrib.auth.models import User\nfrom django.contrib.staticfiles.storage i...	[ { "content": "import string\n\nfrom django.db import models\nfrom django.dispatch import receiver\nfrom django.db.models.signals import post_save, pre_delete\nfrom django.urls import reverse\nfrom django.conf import settings\nfrom django.contrib.auth.models import User\nfrom django.contrib.staticfiles.storage i...	diff --git a/app/api/models.py b/app/api/models.py index 697ceb0f02..256e7ac8f6 100644 --- a/app/api/models.py +++ b/app/api/models.py @@ -150,7 +150,7 @@ class Label(models.Model): ('ctrl shift', 'ctrl shift') ) SUFFIX_KEYS = tuple( - (c, c) for c in string.ascii_lowercase + (c, c) for c in string.digits + string.ascii_lowercase ) text = models.CharField(max_length=100) diff --git a/frontend/components/containers/labels/LabelActionMenu.vue b/frontend/components/containers/labels/LabelActionMenu.vue index 14b9fe4a60..aaa4c8b214 100644 --- a/frontend/components/containers/labels/LabelActionMenu.vue +++ b/frontend/components/containers/labels/LabelActionMenu.vue @@ -9,6 +9,7 @@ <base-dialog :dialog="createDialog"> <label-creation-form :create-label="createLabel" + :keys="shortkeys" @close="createDialog=false" /> </base-dialog> @@ -22,7 +23,7 @@ </template> <script> -import { mapActions } from 'vuex' +import { mapActions, mapGetters } from 'vuex' import ActionMenu from '@/components/molecules/ActionMenu' import BaseDialog from '@/components/molecules/BaseDialog' import LabelCreationForm from '@/components/organisms/labels/LabelCreationForm' @@ -48,6 +49,10 @@ export default { } }, + computed: { + ...mapGetters('labels', ['shortkeys']) + }, + created() { this.setCurrentProject(this.$route.params.id) }, diff --git a/frontend/components/containers/labels/LabelList.vue b/frontend/components/containers/labels/LabelList.vue index 13a94ca379..5f76c5cf52 100644 --- a/frontend/components/containers/labels/LabelList.vue +++ b/frontend/components/containers/labels/LabelList.vue @@ -40,7 +40,7 @@ <template v-slot:input> <v-select :value="item.suffix_key" - :items="keys" + :items="shortkeys" @change="handleUpdateLabel({ id: item.id, suffix_key: $event })" label="Key" /> @@ -74,7 +74,7 @@ </template> <script> -import { mapState, mapActions, mapMutations } from 'vuex' +import { mapGetters, mapState, mapActions, mapMutations } from 'vuex' import { colorRules, labelNameRules } from '@/rules/index' import { idealColor } from '~/plugins/utils' @@ -105,10 +105,7 @@ export default { computed: { ...mapState('labels', ['items', 'selected', 'loading']), - - keys() { - return 'abcdefghijklmnopqrstuvwxyz'.split('') - } + ...mapGetters('labels', ['shortkeys']) }, created() { diff --git a/frontend/components/organisms/labels/LabelCreationForm.vue b/frontend/components/organisms/labels/LabelCreationForm.vue index 944119c451..7a0f9e1b38 100644 --- a/frontend/components/organisms/labels/LabelCreationForm.vue +++ b/frontend/components/organisms/labels/LabelCreationForm.vue @@ -63,7 +63,8 @@ export default { }, keys: { type: Array, - default: () => 'abcdefghijklmnopqrstuvwxyz'.split('') + default: () => [], + required: true } }, data() { diff --git a/frontend/store/labels.js b/frontend/store/labels.js index 80829a3b79..4ebf68833a 100644 --- a/frontend/store/labels.js +++ b/frontend/store/labels.js @@ -9,6 +9,9 @@ export const state = () => ({ export const getters = { isLabelSelected(state) { return state.selected.length > 0 + }, + shortkeys() { + return '0123456789abcdefghijklmnopqrstuvwxyz'.split('') } }