Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add mypy to the linting step. #271

Merged
merged 3 commits into from
May 18, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ on:
branches: [main]
pull_request:
branches: [main]
workflow_dispatch:

jobs:
tests:
runs-on: ${{ matrix.os }}
timeout-minutes: 15
strategy:
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
Expand All @@ -26,24 +28,29 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Install dependencies
- name: Install
run: |
python -m pip install --upgrade pip
pip install --upgrade -r requirements-optional.txt
pip install --upgrade -e .

- name: Lint with black
run: |
pip install --upgrade black
black --check --diff green
- name: Format
run: black --check --diff green example
if: matrix.python-version == '3.11' && matrix.os == 'ubuntu-latest'

- name: Mypy
run: mypy .
if: matrix.python-version == '3.11' && matrix.os == 'ubuntu-latest'

- name: Test
run: python -m green.cmdline -tvvvv green
run: |
green -tvvvv green
cd example && python -m green.cmdline -tvvvv proj
sodul marked this conversation as resolved.
Show resolved Hide resolved

- name: Generate coverage
run: |
pip install --upgrade coveralls
./g -tvvvvr green
green -tvvvvr green
if: matrix.python-version == '3.11' && matrix.os == 'ubuntu-latest'

- name: Coveralls
Expand Down
125 changes: 125 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
# Contributing to CONTRIBUTING.md

First off, thanks for taking the time to contribute! ❤️

All types of contributions are encouraged and valued. See the [Table of Contents](#table-of-contents) for different ways to help and details about how this project handles them. Please make sure to read the relevant section before making your contribution. It will make it a lot easier for us maintainers and smooth out the experience for all involved. The community looks forward to your contributions. 🎉

> And if you like the project, but just don't have time to contribute, that's fine. There are other easy ways to support the project and show your appreciation, which we would also be very happy about:
> - Star the project
> - Tweet about it
> - Refer this project in your project's readme
> - Mention the project at local meetups and tell your friends/colleagues


## Table of Contents

- [I Have a Question](#i-have-a-question)
- [I Want To Contribute](#i-want-to-contribute)
- [Reporting Bugs](#reporting-bugs)
- [Suggesting Enhancements](#suggesting-enhancements)
- [Your First Code Contribution](#your-first-code-contribution)
- [Improving The Documentation](#improving-the-documentation)
- [Styleguides](#styleguides)
- [Commit Messages](#commit-messages)
- [Join The Project Team](#join-the-project-team)



## I Have a Question

> If you want to ask a question, we assume that you have read the available [Documentation]().
sodul marked this conversation as resolved.
Show resolved Hide resolved

Before you ask a question, it is best to search for existing [Issues](/issues) and [Discussions](/discussions) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue. It is also advisable to search the internet for answers first.
sodul marked this conversation as resolved.
Show resolved Hide resolved

If you then still feel the need to ask a question and need clarification, we recommend the following:

- Open an [Issue](/issues/new) or [Discussion](/discussions/new) as appropriate.
sodul marked this conversation as resolved.
Show resolved Hide resolved
- Provide as much context as you can about what you're running into.
- Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant.

We will then take care of the issue as soon as possible.
sodul marked this conversation as resolved.
Show resolved Hide resolved



## I Want To Contribute

> ### Legal Notice
> When contributing to this project, you must agree that you have authored 100% of the content, that you have the necessary rights to the content and that the content you contribute may be provided under the project license.
sodul marked this conversation as resolved.
Show resolved Hide resolved

### Reporting Bugs


#### Before Submitting a Bug Report

A good bug report shouldn't leave others needing to chase you up for more information. Therefore, we ask you to investigate carefully, collect information and describe the issue in detail in your report. Please complete the following steps in advance to help us fix any potential bug as fast as possible.
sodul marked this conversation as resolved.
Show resolved Hide resolved

- Make sure that you are using the latest version.
sodul marked this conversation as resolved.
Show resolved Hide resolved
- Determine if your bug is really a bug and not an error on your side e.g. using incompatible environment components/versions (Make sure that you have read the [documentation](). If you are looking for support, you might want to check [this section](#i-have-a-question)).
sodul marked this conversation as resolved.
Show resolved Hide resolved
- To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the [bug tracker](issues?q=label%3Abug).
sodul marked this conversation as resolved.
Show resolved Hide resolved
- Also make sure to search the internet (including Stack Overflow) to see if users outside of the GitHub community have discussed the issue.
sodul marked this conversation as resolved.
Show resolved Hide resolved
- Collect information about the bug:
- Stack trace (Traceback)
- OS, Platform and Version (Windows, Linux, macOS, x86, ARM)
- Version of the interpreter, compiler, SDK, runtime environment, package manager, depending on what seems relevant.
sodul marked this conversation as resolved.
Show resolved Hide resolved
- Possibly your input and the output.
- Can you reliably reproduce the issue? And can you also reproduce it with older versions?


#### How Do I Submit a Good Bug Report?

We use GitHub issues to track bugs and errors. If you run into an issue with the project:

- Open an [Issue](/issues/new). (Since we can't be sure at this point whether it is a bug or not, we ask you not to talk about a bug yet and not to label the issue.)
sodul marked this conversation as resolved.
Show resolved Hide resolved
- Explain the behavior you would expect and the actual behavior.
- Please provide as much context as possible and describe the *reproduction steps* that someone else can follow to recreate the issue on their own. This usually includes your code. For good bug reports you should isolate the problem and create a reduced test case.
- Provide the information you collected in the previous section.

Once it's filed:

- The project team will label the issue accordingly.
- A team member will try to reproduce the issue with your provided steps. If there are no reproduction steps or no obvious way to reproduce the issue, the team will ask you for those steps and mark the issue as `needs-repro`. Bugs with the `needs-repro` tag will not be addressed until they are reproduced.
- If the team is able to reproduce the issue, it will be marked `needs-fix`, as well as possibly other tags (such as `critical`), and the issue will be left to be [implemented by someone](#your-first-code-contribution).
sodul marked this conversation as resolved.
Show resolved Hide resolved



### Suggesting Enhancements

This section guides you through submitting an enhancement suggestion for CONTRIBUTING.md, **including completely new features and minor improvements to existing functionality**. Following these guidelines will help maintainers and the community to understand your suggestion and find related suggestions.
sodul marked this conversation as resolved.
Show resolved Hide resolved


#### Before Submitting an Enhancement

- Make sure that you are using the latest version.
sodul marked this conversation as resolved.
Show resolved Hide resolved
- Read the [documentation]() carefully and find out if the functionality is already covered, maybe by an individual configuration.
sodul marked this conversation as resolved.
Show resolved Hide resolved
- Perform a search of [issues](/issues) and [discussions](/discussions) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
sodul marked this conversation as resolved.
Show resolved Hide resolved
- Find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset. If you're just targeting a minority of users, consider writing an add-on/plugin library.
sodul marked this conversation as resolved.
Show resolved Hide resolved


#### How Do I Submit a Good Enhancement Suggestion?

Enhancement suggestions are tracked as [GitHub Discussions](/discussions).

- Use a **clear and descriptive title** for the issue to identify the suggestion.
- Provide a **step-by-step description of the suggested enhancement** in as many details as possible.
- **Describe the current behavior** and **explain which behavior you expected to see instead** and why. At this point you can also tell which alternatives do not work for you.
- You may want to **include screenshots and animated GIFs** which help you demonstrate the steps or point out the part which the suggestion is related to. You can use [this tool](https://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and [this tool](https://github.com/colinkeenan/silentcast) or [this tool](https://github.com/GNOME/byzanz) on Linux.
sodul marked this conversation as resolved.
Show resolved Hide resolved
- **Explain why this enhancement would be useful** to most CONTRIBUTING.md users. You may also want to point out the other projects that solved it better and which could serve as inspiration.
sodul marked this conversation as resolved.
Show resolved Hide resolved



### Your First Code Contribution


### Improving The Documentation


## Styleguides
### Commit Messages

sodul marked this conversation as resolved.
Show resolved Hide resolved
sodul marked this conversation as resolved.
Show resolved Hide resolved

## Join The Project Team


sodul marked this conversation as resolved.
Show resolved Hide resolved

## Attribution
This guide is based on the **contributing.md**. [Make your own](https://contributing.md/)!
sodul marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 2 additions & 1 deletion green/command.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
try:
from setuptools import Command
except ImportError: # pragma: no cover
from distutils.cmd import Command
# The distutils package is deprecated as of https://peps.python.org/pep-0632/
from distutils.cmd import Command # type: ignore
sodul marked this conversation as resolved.
Show resolved Hide resolved

from green.config import parseArguments
from green.cmdline import main
Expand Down
6 changes: 1 addition & 5 deletions green/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
# it from coverage. We still have tests, though!

import argparse # pragma: no cover

try: # pragma: no cover
import configparser
except: # pragma: no cover
import ConfigParser as configparser
import configparser # pragma: no cover

import coverage # pragma: no cover

Expand Down
5 changes: 3 additions & 2 deletions green/djangorunner.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from argparse import Namespace
import os
import sys
from typing import Sequence

from green.config import mergeConfig
from green.loader import GreenTestLoader
Expand All @@ -24,7 +25,7 @@
SECRET_KEY = ")9^_e(=cisybdt4m4+fs+_wb%d$!9mpcoy0um^alvx%gexj#jv"
DEBUG = True
TEMPLATE_DEBUG = True
ALLOWED_HOSTS = []
ALLOWED_HOSTS: Sequence[str] = []
INSTALLED_APPS = (
"django.contrib.admin",
"django.contrib.auth",
Expand Down Expand Up @@ -131,4 +132,4 @@ def run_tests(self, test_labels, extra_tests=None, **kwargs):
return self.suite_result(suite, result)

except ImportError: # pragma: no cover
DjangoRunner = django_missing
DjangoRunner = django_missing # type: ignore
13 changes: 6 additions & 7 deletions green/process.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
from multiprocessing.pool import Pool, RUN, TERMINATE
import platform
import random
import shutil
import sys
import tempfile
import threading
import traceback

import coverage
Expand Down Expand Up @@ -212,11 +210,12 @@ def _repopulate_pool_static(

LoggingDaemonlessPool = LoggingDaemonlessPool38
if tuple(map(int, platform.python_version_tuple()[:2])) < (3, 8): # pragma: no cover
LoggingDaemonlessPool = LoggingDaemonlessPool37
LoggingDaemonlessPool = LoggingDaemonlessPool37 # type: ignore


import multiprocessing.pool
from multiprocessing import util
from multiprocessing.pool import MaybeEncodingError
from multiprocessing import util # type: ignore
from multiprocessing.pool import MaybeEncodingError # type: ignore


def worker(
Expand All @@ -229,7 +228,7 @@ def worker(
finalizer=None,
finalargs=(),
): # pragma: no cover
assert maxtasks is None or (type(maxtasks) == int and maxtasks > 0)
assert maxtasks is None or (isinstance(maxtasks, int) and maxtasks > 0)
put = outqueue.put
get = inqueue.get
if hasattr(inqueue, "_writer"):
Expand Down Expand Up @@ -305,7 +304,7 @@ def rebuild_exc(exc, tb): # pragma: no cover
return exc


multiprocessing.pool.worker = worker
multiprocessing.pool.worker = worker # type: ignore
# END of Worker Finalization Monkey Patching
# -----------------------------------------------------------------------------

Expand Down
3 changes: 1 addition & 2 deletions green/suite.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
from fnmatch import fnmatch
import sys
from unittest.suite import _call_if_exists, _DebugResult, _isnotsuite, TestSuite
from unittest.suite import _call_if_exists, _DebugResult, _isnotsuite, TestSuite # type: ignore
from unittest import util
import unittest
from io import StringIO

from green.config import default_args
from green.output import GreenStream
from green.result import ProtoTest


class GreenTestSuite(TestSuite):
Expand Down
4 changes: 2 additions & 2 deletions green/test/test_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
try:
from setuptools.dist import Distribution
except ImportError:
from distutil.dist import Distribution

# The distutils package is deprecated as of https://peps.python.org/pep-0632/
from distutils.dist import Distribution # type: ignore
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's delete this block, then.


from green import command
from green.config import StoreOpt
Expand Down
32 changes: 17 additions & 15 deletions green/test/test_integration.py
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
import copy
import multiprocessing
import os
from pathlib import PurePath
import pathlib
import shutil
import subprocess
import sys
import tempfile
from textwrap import dedent
import unittest
from unittest.mock import MagicMock

from green import cmdline


class TestFinalizer(unittest.TestCase):
def setUp(self):
self.tmpdir = tempfile.mkdtemp()
def setUp(self) -> None:
self.tmpdir = pathlib.Path(tempfile.mkdtemp())

def tearDown(self) -> None:
shutil.rmtree(self.tmpdir, ignore_errors=True)

def test_finalizer(self):
def test_finalizer(self) -> None:
"""
Test that the finalizer works on Python 3.8+
Test that the finalizer works on all supported versions of Python.
sodul marked this conversation as resolved.
Show resolved Hide resolved
"""
sub_tmpdir = tempfile.mkdtemp(dir=self.tmpdir)
sub_tmpdir = pathlib.Path(tempfile.mkdtemp(dir=self.tmpdir))
for i in range(multiprocessing.cpu_count() * 2):
fh = open(os.path.join(sub_tmpdir, f"test_finalizer{i}.py"), "w")
fh.write(
finalizer_path = sub_tmpdir / f"test_finalizer{i}.py"
finalizer_path.write_text(
dedent(
f"""
import unittest
Expand All @@ -35,25 +36,26 @@ def msg():
"""
)
)
fh.close()
args = [
sys.executable,
"-m",
"green.cmdline",
"--finalizer=test_finalizer0.msg",
"--maxtasksperchild=1",
]
pythonpath = str(PurePath(__file__).parent.parent.parent)
pythonpath = str(pathlib.Path(__file__).parent.parent.parent)

env = copy.deepcopy(os.environ)
env["PYTHONPATH"] = pythonpath

output = subprocess.run(
args,
cwd=sub_tmpdir,
cwd=str(sub_tmpdir),
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
env=env,
timeout=10,
).stdout.decode("utf-8")
encoding="utf-8",
check=True,
).stdout
self.assertIn("finalizer worked", output)
Loading