aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' into roles-command-paginationGravatar scragly2020-03-05-150/+121
|\
| * Merge pull request #814 from python-discord/antimalware-loggingGravatar Mark2020-03-04-17/+24
| |\ | | | | | | Expand Antimalware User Feedback & Logging
| | * Merge branch 'master' into antimalware-loggingGravatar Mark2020-03-04-133/+97
| | |\ | | |/ | |/|
| * | Merge pull request #816 from ↵Gravatar Shirayuki Nekomata2020-03-04-3/+3
| |\ \ | | | | | | | | | | | | | | | | python-discord/extensions-cog-docstring-deprecation-warning Use raw strings for docstrings with forward slashes
| | * \ Merge branch 'master' into extensions-cog-docstring-deprecation-warningGravatar Shirayuki Nekomata2020-03-04-128/+85
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #811 from python-discord/feat/deps/o138/pre-commit-hooksGravatar scragly2020-03-04-128/+85
| |\ \ \ | | | | | | | | | | Add more pre-commit hooks and run them in CI
| | * \ \ Merge branch 'master' into feat/deps/o138/pre-commit-hooksGravatar scragly2020-03-04-33/+102
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Update code for pep8-naming complianceGravatar S. Co12020-03-03-6/+6
| | | | |
| | * | | Remove CaseInsensitiveDictGravatar S. Co12020-03-03-94/+0
| | | | | | | | | | | | | | | This was added by the now-removed Snake cog & is not used elsewhere on bot.
| | * | | Add pep8-naming & relockGravatar S. Co12020-03-03-14/+28
| | | | |
| | * | | CI: mock the pipenv binaryGravatar MarkKoz2020-03-03-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mock gets used by the flake8 pre-commit hook, which invokes flake8 via `pipenv run flake8`. It's normally useful to use pipenv here cause it ensures flake8 is invoked within the context of the venv. However, in CI, there is no venv - dependencies are installed directly to the system site-packages. `pipenv run` does not work in such case because it tries to create a new venv if one doesn't exist (it doesn't consider the system interpreter to be a venv). This workaround (okay, it's a hack) creates an executable shell script which replaces the original pipenv binary. The shell script simply ignores the first argument (i.e. ignores `run` in `pipenv run`) and executes the rest of the arguments as a command. It essentially makes `pipenv run flake8` equivalent to just having ran `flake8`. When pre-commit executes pipenv, the aforementioned script is what will run.
| | * | | CI: add a restore key for the pre-commit cacheGravatar MarkKoz2020-03-03-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A cache for an outdated pre-commit environment may still be useful. It may be the case that only some hooks need to be updated rather than all.
| | * | | Use pre-commit in pipenv lint scriptGravatar MarkKoz2020-03-03-4/+12
| | | | |
| | * | | Add more pre-commit hooksGravatar MarkKoz2020-03-02-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | * Remove trailing whitespaces * Specify error code for a noqa in the free command
| | | * | Use raw strings for docstrings with forward slashesGravatar Sebastiaan Zeeff2020-03-04-3/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | A few docstrings in `bot.cogs.extensions` have forward slashed in them to escape Markdown rendering when our help feature uses these docstring in a Discord message. However, the use of forward slashes with an invalid escape sequence in docstrings now raises a DeprecationWarning in Python: /home/sebastiaan/pydis/repositories/bot/bot/cogs/extensions.py:72: DeprecationWarning: invalid escape sequence \* PEP 257 (Docstring Conventions, https://www.python.org/dev/peps/pep-0257/) states that raw strings should be used for docstrings that use forward slashes, so I've added the `r`-prefix to the docstrings that use forward slashes.
| * | | Merge pull request #815 from python-discord/watchchannel-dmGravatar scragly2020-03-04-2/+9
| |\ \ \ | | | | | | | | | | Prevent exception if a watched user sends a DM to the bot
| | * | | Prevent exception if a watched user sends a DM to the botGravatar S. Co12020-03-03-2/+9
| |/ / / | | | | | | | | The previous embed assumed that the messages would be sent on the server, where the channel would have a name and the message would have a jump URL. For a DM, neither of these are present and an exception will be raised when attempting to construct the embed for the webhook to send.
| | | * Merge branch 'master' into antimalware-loggingGravatar S. Co12020-03-03-1076/+1451
| | | |\ | | |_|/ | |/| |
| | | * Add logging to antimalware cog & expand user feedbackGravatar S. Co12020-03-01-17/+24
| | | | | | | | | | | | | | | | | | | | | | | | * Add generic handling for multi-file uploads * Log user, id, and blocked extensions * Provide the full list of attachment filenames as a logging extra * Provide feedback on all blacklisted file types uploaded
* | | | (Information Cog, !roles command test): Removed 's' at end of "Total 1 ↵Gravatar ks1232020-03-05-1/+1
| | | | | | | | | | | | | | | | role(s)" due changes in command.
* | | | (Information Cog, !roles command): Added 's' to end of 'role' only if there ↵Gravatar ks1232020-03-05-1/+1
| | | | | | | | | | | | | | | | is more then 1 role.
* | | | (Information Cog, !roles command test): Applied empty parameter change.Gravatar ks1232020-03-05-1/+1
| | | |
* | | | (Information Cog, !roles command): Added empty parameter to pagination (False)Gravatar ks1232020-03-05-1/+1
| | | |
* | | | Merge branch 'master' into roles-command-paginationGravatar S. Co12020-03-03-735/+507
|\| | |
| * | | Merge pull request #750 from python-discord/bug/backend/b748/resolver-in-coroGravatar Mark2020-03-03-31/+93
| |\ \ \ | | |/ / | |/| | Create AsyncResolver inside a coroutine to avoid DeprecationWarning
| | * | Merge branch 'master' into bug/backend/b748/resolver-in-coroGravatar Mark2020-03-03-1048/+1367
| | |\ \ | | |/ / | |/| |
| * | | Adding helpers to the Filtering whitelistGravatar Leon Sandøy2020-03-02-0/+1
| | | | | | | | | | | | Resolves an issue mentioned in https://github.com/python-discord/bot/issues/767, giving Helpers access to post invites and other things caught by the Filtering cog.
| * | | Merge pull request #783 from python-discord/python38-migrationGravatar S. Co12020-03-01-661/+301
| |\ \ \ | | | | | | | | | | Migrate bot to Python 3.8
| | * \ \ Merge branch 'master' into python38-migrationGravatar Leon Sandøy2020-03-01-2/+29
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #809 from python-discord/ban-grabify-urlsGravatar kwzrd2020-03-01-0/+24
| |\ \ \ \ | | | | | | | | | | | | Add grabify (IP logger) domains to banned domains
| | * | | | Add grabify (IP logger) domains to banned domainsGravatar Joseph2020-03-01-0/+24
| |/ / / /
| * | | | Merge pull request #808 from spyoungtech/masterGravatar scragly2020-03-02-2/+5
| |\ \ \ \ | | | | | | | | | | | | Optimize Dockerfile for faster rebuilds
| | * \ \ \ Merge branch 'master' into masterGravatar scragly2020-03-02-0/+0
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Optimize DockerfileGravatar Spencer Young2020-03-01-2/+5
| | | | | |
| | | * | | Modify log test regex to be non-os-specificGravatar S. Co12020-03-01-1/+1
| | | | | | | | | | | | | | | | | | Previous regex utilized a `/`, which doesn't work for comparing against Windows paths, which use `\`
| | | * | | Move syncer confirmation reaction check out of finally clauseGravatar S. Co12020-03-01-11/+11
| | | | | | | | | | | | | | | | | | Returning directly out of a `finally` clause can cause any exceptions raised in the clause to be discarded, so we can remove the finally clause entirely and shift the control statements into the body of the function
| | | * | | Bump Dependencies & RelockGravatar S. Co12020-03-01-78/+76
| | | | | | | | | | | | | | | | | | * Remove explicit urllib3 pinning, CVE that caused its pinning has been resolved by 1.25+. This is a child dependency of requests.
| | | * | | Merge branch 'master' into python38-migrationGravatar Sebastiaan Zeeff2020-03-01-29/+71
| | | |\ \ \ | | |_|/ / / | |/| | | | | | | | | | I have resolved a merge conflict in Pipfile.lock by relocking with the newly added dependencies of `coloredlogs` and `colorama`.
| * | | | | Merge pull request #806 from python-discord/feat/frontend/b000/coloured-logsGravatar Eivind Teig2020-03-01-47/+89
| |\| | | | | | | | | | | | | | | | Coloured log output
| | * | | | Make logs coloured!Gravatar MarkKoz2020-02-29-7/+23
| | | | | |
| | * | | | Install the coloredlogs packageGravatar MarkKoz2020-02-29-40/+66
| |/ / / / | | | | | | | | | | | | | | | | | | | | This makes it easy to add colour to the logs. Colorama is also installed if on a Windows system.
| | * | | Migrate snekbox tests to Python 3.8's unittestGravatar Sebastiaan Zeeff2020-02-29-41/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've migrated the `tests/test_snekbox.py` file to use the new Python 3.8-style unittests instead of our old style using our custom Async mocks. In particular, I had to make a few changes: - Mocking the async post() context manager correctly Since `ClientSession.post` returns an async context manager when called, we need to make sure to assign the return value to the __aenter__ method of whatever `post()` returns, not of `post` itself (i.e.. when it's not called). - Use the new AsyncMock assert methods `assert_awaited_once` and `assert_awaited_once_with` Objects of the new `unittest.mock.AsyncMock` class have special methods to assert what they were called with that also assert that specific coroutine object was awaited. This means we test two things in one: Whether or not it was called with the right arguments and whether or not the returned coroutine object was then awaited. - Patch `functools.partial` as `partial` objects are compared by identity When you create two partial functions of the same function, you'll end up with two different `partial` objects. Since `partial` objects are compared by identity, you can't compare a `partial` created in a test method to that created in the callable you're trying to test. They will always compare as `False`. Since we're not interested in actually creating `partial` objects, I've just patched `functools.partial` in the namespace of the module we're testing to make sure we can compare them.
| | * | | Merge branch 'master' into python38-migrationGravatar Sebastiaan Zeeff2020-02-29-403/+1005
| | |\ \ \ | | |/ / / | |/| | | | | | | | I've resolved the merge conflict by confirming the deleted part of tests/helpers.py
| | * | | Use MagicMock as return value for _get_diff mockGravatar Sebastiaan Zeeff2020-02-24-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `_get_diff` method of TestSyncer class is mocked using an AsyncMock object. By default, when an AsyncMock object is called **and awaited**, it returns a child mock of the same time (another AsyncMock) according to the "the child is a like the parent" principle. This means that the _get_diff method will return an AsyncMock unless a different return_value is explicitly provided. Because of that "child is like parent" behavior, this will happen in lines 194-196 of bot.cogs.sync.syncers (annotations added by me): ``` // `diff` will be a child AsyncMock as "child is like parent" diff = await self._get_diff(guild) // `diff._asdict` will be an AsyncMock as "child is like parent" and, // after being called, it will return an unawaited coroutine object // we assign the name `diff_dict`: diff_dict = diff._asdict() // `diff_dict` is still an unawaited coroutine object meaning that it // doesn't have an `items()` method: totals = {k: len(v) for k, v in diff_dict.items() if v is not None} ``` Original, unannotated: https://github.com/python-discord/bot/blob/c81a4d401ea434e98b0a1ece51d3d10f1a3ad226/bot/cogs/sync/syncers.py#L194-L196 This will lead to the following exception when running the tests: ```py ====================================================================== ERROR: test_sync_confirmation_context_redirect (tests.bot.cogs.sync.test_base.SyncerSyncTests) (ctx=None, author=<MockMember name='mock.user' spec_set='Member' id='140583452034864'>, message=None) If ctx is given, a new message should be sent and author should be ctx's author. ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/sebastiaan/pydis/repositories/bot/tests/bot/cogs/sync/test_base.py", line 348, in test_sync_confirmation_context_redirect await self.syncer.sync(guild, ctx) File "/home/sebastiaan/pydis/repositories/bot/bot/cogs/sync/syncers.py", line 196, in sync totals = {k: len(v) for k, v in diff_dict.items() if v is not None} AttributeError: 'coroutine' object has no attribute 'items' ``` The solution is to assign an explicit return value so the parent mock doesn't "guess" and return an object of its own type. I previously did that by providing a specific `_Diff` object as the return value, but I should have gone with a `MagicMock` to signify that it's not an important return value; it's just something that needs to support/mimic the API we use on it. So that's what this commit adds.
| | * | | Sync tests: use autospec instead of MockSyncerGravatar MarkKoz2020-02-23-18/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Autospec supports using AsyncMocks in 3.8 so there's no need to rely on a subclass of CustomMockMixin for the async mocks.
| | * | | Migrate syncers test suite to Python 3.8Gravatar Sebastiaan Zeeff2020-02-24-75/+34
| | | | | | | | | | | | | | | | | | | | The test suite for the new role/member syncers used the "old"-style test suite with the helpers implemented for Python 3.7. I have migrated it to use the new Python 3.8 asyncio test helpers.
| | * | | Use realistic mixin implementationGravatar Sebastiaan Zeeff2020-02-24-1/+1
| | | | | | | | | | | | | | | | | | | | Instead of using the mixin class bare, I've now included into a class tha subclasses unittest.TestCase as that's how it's going to be used "in the wild".
| | * | | Merge branch 'master' into python38-migrationGravatar Sebastiaan Zeeff2020-02-24-541/+1658
| | |\ \ \
| | * | | | Update Dockerfile to use python:3.8-slimGravatar Sebastiaan Zeeff2020-02-24-1/+1
| | | | | |
| | * | | | Make Azure CI use Python 3.8 and Ubuntu 18.04Gravatar Sebastiaan Zeeff2020-02-24-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Since the bot is now using Python 3.8 and some of our dependencies have Python-version specfic dependencies, it's important that the CI, which installs from our Pipfile, uses the same version of Python.
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-02 14:34:50 +0000