Skip to content

Commit 4b1e90f

Browse files
author
kwzrd
committed
Merge: changes from 'upstream/main' & conflict resolution
Conflict in the lockfile resolved by re-locking the merged Pipfile. Conflict in Branding constants resolved by keeping my local version. Change in the cog's target branch to 'main' from 'master' is currently irrelevant as we targets a development branch anyway.
2 parents 1e8d597 + 60f410e commit 4b1e90f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+854
-399
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ bot/exts/info/information.py @mbaruh
1212
bot/exts/filters/** @mbaruh
1313
bot/exts/fun/** @ks129
1414
bot/exts/utils/** @ks129
15+
bot/exts/recruitment/** @wookie184
1516

1617
# Rules
1718
bot/rules/** @mbaruh

.github/FUNDING.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_run:
55
workflows: ["Lint & Test"]
66
branches:
7-
- master
7+
- main
88
types:
99
- completed
1010

.github/workflows/deploy.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ on:
44
workflow_run:
55
workflows: ["Build"]
66
branches:
7-
- master
7+
- main
88
types:
99
- completed
1010

1111
jobs:
1212
build:
13+
environment: production
1314
if: github.event.workflow_run.conclusion == 'success'
1415
name: Build & Push
1516
runs-on: ubuntu-latest

.github/workflows/lint-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Lint & Test
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88

99

.github/workflows/sentry_release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ name: Create Sentry release
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77

88
jobs:
99
create_sentry_release:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@master
13+
uses: actions/checkout@main
1414

1515
- name: Create a Sentry.io release
1616
uses: tclindner/[email protected]

.pre-commit-config.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ repos:
77
- id: check-yaml
88
args: [--unsafe] # Required due to custom constructors (e.g. !ENV)
99
- id: end-of-file-fixer
10-
- id: mixed-line-ending
11-
args: [--fix=lf]
1210
- id: trailing-whitespace
1311
args: [--markdown-linebreak-ext=md]
1412
- repo: https://github.com/pre-commit/pygrep-hooks

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Contributing to one of Our Projects
22

3-
Our projects are open-source and are automatically deployed whenever commits are pushed to the `master` branch on each repository, so we've created a set of guidelines in order to keep everything clean and in working order.
3+
Our projects are open-source and are automatically deployed whenever commits are pushed to the `main` branch on each repository, so we've created a set of guidelines in order to keep everything clean and in working order.
44

55
Note that contributions may be rejected on the basis of a contributor failing to follow these guidelines.
66

77
## Rules
88

99
1. **No force-pushes** or modifying the Git history in any way.
1010
2. If you have direct access to the repository, **create a branch for your changes** and create a pull request for that branch. If not, create a branch on a fork of the repository and create a pull request from there.
11-
* It's common practice for a repository to reject direct pushes to `master`, so make branching a habit!
11+
* It's common practice for a repository to reject direct pushes to `main`, so make branching a habit!
1212
* If PRing from your own fork, **ensure that "Allow edits from maintainers" is checked**. This gives permission for maintainers to commit changes directly to your fork, speeding up the review process.
1313
3. **Adhere to the prevailing code style**, which we enforce using [`flake8`](http://flake8.pycqa.org/en/latest/index.html) and [`pre-commit`](https://pre-commit.com/).
1414
* Run `flake8` and `pre-commit` against your code [**before** you push it](https://soundcloud.com/lemonsaurusrex/lint-before-you-push). Your commit will be rejected by the build server if it fails to lint.
@@ -18,7 +18,7 @@ Note that contributions may be rejected on the basis of a contributor failing to
1818
* Avoid making minor commits for fixing typos or linting errors. Since you've already set up a `pre-commit` hook to run the linting pipeline before a commit, you shouldn't be committing linting issues anyway.
1919
* A more in-depth guide to writing great commit messages can be found in Chris Beam's [*How to Write a Git Commit Message*](https://chris.beams.io/posts/git-commit/)
2020
5. **Avoid frequent pushes to the main repository**. This goes for PRs opened against your fork as well. Our test build pipelines are triggered every time a push to the repository (or PR) is made. Try to batch your commits until you've finished working for that session, or you've reached a point where collaborators need your commits to continue their own work. This also provides you the opportunity to amend commits for minor changes rather than having to commit them on their own because you've already pushed.
21-
* This includes merging master into your branch. Try to leave merging from master for after your PR passes review; a maintainer will bring your PR up to date before merging. Exceptions to this include: resolving merge conflicts, needing something that was pushed to master for your branch, or something was pushed to master that could potentionally affect the functionality of what you're writing.
21+
* This includes merging main into your branch. Try to leave merging from main for after your PR passes review; a maintainer will bring your PR up to date before merging. Exceptions to this include: resolving merge conflicts, needing something that was pushed to main for your branch, or something was pushed to main that could potentionally affect the functionality of what you're writing.
2222
6. **Don't fight the framework**. Every framework has its flaws, but the frameworks we've picked out have been carefully chosen for their particular merits. If you can avoid it, please resist reimplementing swathes of framework logic - the work has already been done for you!
2323
7. If someone is working on an issue or pull request, **do not open your own pull request for the same task**. Instead, collaborate with the author(s) of the existing pull request. Duplicate PRs opened without communicating with the other author(s) and/or PyDis staff will be closed. Communication is key, and there's no point in two separate implementations of the same thing.
2424
* One option is to fork the other contributor's repository and submit your changes to their branch with your own pull request. We suggest following these guidelines when interacting with their repository as well.

Pipfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ sphinx = "~=2.2"
2929
statsd = "~=3.3"
3030
arrow = "~=0.17"
3131
emoji = "~=0.6"
32-
python-json-logger = "~=2.0"
3332

3433
[dev-packages]
3534
coverage = "~=5.0"

0 commit comments

Comments
 (0)