Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/marcosquadross/activist int…
Browse files Browse the repository at this point in the history
…o dev
  • Loading branch information
Marcos Quadros committed Nov 2, 2023
2 parents 0c43e17 + c25abc5 commit aa1d7bd
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 32 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/pr_ci_backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ on:
branches:
- main
types: [opened, reopened, synchronize]
workflow_run:
workflows: [pr_maintainer_checklist]
types:
- completed

jobs:
backend:
Expand Down Expand Up @@ -36,4 +32,4 @@ jobs:
continue-on-error: true

- name: Run mypy - Static Type Checking
run: mypy ./backend --config-file ./backend/mypy.ini
run: mypy ./backend --config-file ./backend/pyproject.toml
4 changes: 0 additions & 4 deletions .github/workflows/pr_ci_frontend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ on:
branches:
- main
types: [opened, reopened, synchronize]
workflow_run:
workflows: [pr_maintainer_checklist]
types:
- completed

jobs:
frontend:
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/pr_maintainer_checklist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ jobs:
permissions:
pull-requests: write
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Comment PR
uses: thollander/actions-comment-pull-request@v2
with:
Expand Down
21 changes: 19 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,24 @@ activist is very open to contributions from people in the early stages of their
> [!NOTE]\
> If you are new to Docker, as an alternative activist recommends installing [Docker Desktop](https://docs.docker.com/desktop/). Docker Desktop comes with many Docker tools and a straightforward user interface.
3. [Fork](http://help.github.com/fork-a-repo/) the repo, clone your fork, and configure the remotes:
3. [Fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo) the repo, clone your fork, and configure the remotes:

> [!NOTE]
>
> <details><summary>Consider using SSH</summary>
>
> <p>
>
> Alternatively to using HTTPS as in the instructions below, consider SSH to interact with GitHub from the terminal. SSH allows you to connect without a user-pass authentication flow.
>
> To run git commands with SSH, remember then to substitute the HTTPS URL, `https://github.com/...`, with the SSH one, `git@github.com:...`.
>
> - e.g. Cloning now becomes `git clone git@github.com:<your-username>/activist.git`
>
> GitHub also has their documentation on how to [Generate new SSH key](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent). 🔑
>
> </p>
> </details>
```bash
# Clone your fork of the repo into the current directory.
Expand Down Expand Up @@ -240,7 +257,7 @@ Good pull requests — patches, improvements and new features — are a fantasti

**Please ask first** before embarking on any significant pull request (implementing features, refactoring code, etc), otherwise you risk spending a lot of time working on something that the developers might not want to merge into the project. With that being said, major additions are very appreciated!

When making a contribution, adhering to the [GitHub flow](https://guides.github.com/introduction/flow/index.html) process is the best way to get your work merged:
When making a contribution, adhering to the [GitHub flow](https://docs.github.com/en/get-started/quickstart/github-flow) process is the best way to get your work merged:

1. If you cloned a while ago, get the latest changes from upstream:

Expand Down
19 changes: 18 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,24 @@ Note that the Figma file above is the [public facing designs](https://www.figma.
> [!NOTE]\
> If you are new to Docker, as an alternative activist recommends installing [Docker Desktop](https://docs.docker.com/desktop/). Docker Desktop comes with many Docker tools and a straightforward user interface.
3. [Fork](http://help.github.com/fork-a-repo/) the repo, clone your fork and configure the remotes:
3. [Fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo) the repo, clone your fork, and configure the remotes:

> [!NOTE]
>
> <details><summary>Consider using SSH</summary>
>
> <p>
>
> Alternatively to using HTTPS as in the instructions below, consider SSH to interact with GitHub from the terminal. SSH allows you to connect without a user-pass authentication flow.
>
> To run git commands with SSH, remember then to substitute the HTTPS URL, `https://github.com/...`, with the SSH one, `git@github.com:...`.
>
> - e.g. Cloning now becomes `git clone git@github.com:<your-username>/activist.git`
>
> GitHub also has their documentation on how to [Generate new SSH key](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent). 🔑
>
> </p>
> </details>
```bash
# Clone your fork of the repo into the current directory.
Expand Down
14 changes: 0 additions & 14 deletions backend/mypy.ini

This file was deleted.

19 changes: 16 additions & 3 deletions backend/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ select = [
fixable = ["I"]

ignore = [
"E501", # line too long, handled by black
"E501", # line too long, handled by black
]

# Exclude a variety of commonly ignored directories.
Expand Down Expand Up @@ -56,5 +56,18 @@ omit = [
"tests.py",
"asgi.py",
"wsgi.py",
"manage.py"
]
"manage.py",
]

[tool.mypy]
mypy_path = "backend"
plugins = ["mypy_django_plugin.main", "mypy_drf_plugin.main"]
ignore_missing_imports = true
strict = true
exclude = ["content/factory.py"]
[[tool.mypy.overrides]]
module = "content.*"
follow_imports = "skip"

[tool.django-stubs]
django_settings_module = "backend.settings"

0 comments on commit aa1d7bd

Please sign in to comment.