Skip to content

Commit ca0cd6d

Browse files
authored
Merge branch 'master' into Upgrade-to-Python-3.8
2 parents b202a01 + 36d229f commit ca0cd6d

File tree

266 files changed

+9998
-11904
lines changed

Some content is hidden

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

266 files changed

+9998
-11904
lines changed

.coveragerc

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[report]
2+
sort = Cover
3+
omit =
4+
.env/*

.github/workflows/autoblack.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# GitHub Action that uses Black to reformat Python code (if needed) when doing a git push.
2+
# If all Python code in the repo is compliant with Black then this Action does nothing.
3+
# Otherwise, Black is run and its changes are committed to the repo.
4+
# https://github.com/cclauss/autoblack
5+
6+
name: autoblack_push
7+
on: [push]
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v1
13+
- uses: actions/setup-python@v1
14+
- run: pip install black
15+
- run: black --check .
16+
- name: If needed, commit black changes to a new pull request
17+
if: failure()
18+
run: |
19+
black .
20+
git config --global user.name github-actions
21+
git config --global user.email '${GITHUB_ACTOR}@users.noreply.github.com'
22+
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
23+
git commit -am "fixup! Format Python code with psf/black push"
24+
git push --force origin HEAD:$GITHUB_REF
+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# The objective of this GitHub Action is to update the DIRECTORY.md file (if needed)
2+
# when doing a git push
3+
name: directory_writer
4+
on: [push]
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- uses: actions/setup-python@v1
11+
with:
12+
python-version: 3.x
13+
- name: Update DIRECTORY.md
14+
run: |
15+
scripts/build_directory_md.py 2>&1 | tee DIRECTORY.md
16+
git config --global user.name github-actions
17+
git config --global user.email '${GITHUB_ACTOR}@users.noreply.github.com'
18+
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
19+
git commit -am "updating DIRECTORY.md" || true
20+
git push --force origin HEAD:$GITHUB_REF || true

.github/workflows/stale.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Mark stale issues and pull requests
2+
on:
3+
schedule:
4+
- cron: "0 0 * * *"
5+
jobs:
6+
stale:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/stale@v1
10+
with:
11+
repo-token: ${{ secrets.GITHUB_TOKEN }}
12+
stale-issue-message: 'Stale issue message'
13+
stale-pr-message: 'Stale pull request message'
14+
stale-issue-label: 'no-issue-activity'
15+
stale-pr-label: 'no-pr-activity'

.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ before_install: pip install --upgrade pip setuptools
55
install: pip install -r requirements.txt
66
before_script:
77
- black --check . || true
8-
- flake8 . --count --select=E9,F4,F63,F7,F82 --show-source --statistics
8+
- flake8 . --count --select=E101,E9,F4,F63,F7,F82,W191 --show-source --statistics
9+
- flake8 . --count --exit-zero --max-line-length=127 --statistics
910
script:
1011
- scripts/validate_filenames.py # no uppercase, no spaces, in a directory
1112
- mypy --ignore-missing-imports .
12-
- pytest . --doctest-modules
13+
- pytest --doctest-modules --cov-report=term-missing:skip-covered --cov=. .
1314
after_success:
14-
- scripts/build_directory_md.py > DIRECTORY.md
15-
- cat DIRECTORY.md
15+
- scripts/build_directory_md.py 2>&1 | tee DIRECTORY.md

CONTRIBUTING.md

+38-31
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,32 @@ Your contribution will be tested by our [automated testing on Travis CI](https:/
3030
We want your work to be readable by others; therefore, we encourage you to note the following:
3131

3232
- Please write in Python 3.7+. __print()__ is a function in Python 3 so __print "Hello"__ will _not_ work but __print("Hello")__ will.
33-
3433
- Please focus hard on naming of functions, classes, and variables. Help your reader by using __descriptive names__ that can help you to remove redundant comments.
35-
- Single letter variable names are _old school_ so please avoid them unless their life only spans a few lines.
36-
- Expand acronyms because __gcd()__ is hard to understand but __greatest_common_divisor()__ is not.
37-
- Please follow the [Python Naming Conventions](https://pep8.org/#prescriptive-naming-conventions) so variable_names and function_names should be lower_case, CONSTANTS in UPPERCASE, ClassNames should be CamelCase, etc.
34+
- Single letter variable names are _old school_ so please avoid them unless their life only spans a few lines.
35+
- Expand acronyms because __gcd()__ is hard to understand but __greatest_common_divisor()__ is not.
36+
- Please follow the [Python Naming Conventions](https://pep8.org/#prescriptive-naming-conventions) so variable_names and function_names should be lower_case, CONSTANTS in UPPERCASE, ClassNames should be CamelCase, etc.
37+
38+
3839

3940
- We encourage the use of Python [f-strings](https://realpython.com/python-f-strings/#f-strings-a-new-and-improved-way-to-format-strings-in-python) where the make the code easier to read.
4041

41-
- Please consider running [__psf/black__](https://github.com/python/black) on your Python file(s) before submitting your pull request. This is not yet a requirement but it does make your code more readable and automatically aligns it with much of [PEP 8](https://www.python.org/dev/peps/pep-0008/). There are other code formatters (autopep8, yapf) but the __black__ style is now the recommendation of the Python Core Team. To use it,
42-
```bash
43-
pip3 install black # only required the first time
44-
black .
45-
```
42+
43+
44+
- Please consider running [__psf/black__](https://github.com/python/black) on your Python file(s) before submitting your pull request. This is not yet a requirement but it does make your code more readable and automatically aligns it with much of [PEP 8](https://www.python.org/dev/peps/pep-0008/). There are other code formatters (autopep8, yapf) but the __black__ style is now the recommendation of the Python Core Team. To use it,
45+
46+
```bash
47+
pip3 install black # only required the first time
48+
black .
49+
```
4650

4751
- All submissions will need to pass the test __flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics__ before they will be accepted so if possible, try this test locally on your Python file(s) before submitting your pull request.
48-
```bash
49-
pip3 install flake8 # only required the first time
50-
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
51-
```
52+
53+
```bash
54+
pip3 install flake8 # only required the first time
55+
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
56+
```
57+
58+
5259

5360
- Original code submission require docstrings or comments to describe your work.
5461

@@ -93,9 +100,10 @@ We want your work to be readable by others; therefore, we encourage you to note
93100
```
94101

95102
These doctests will be run by pytest as part of our automated testing so please try to run your doctests locally and make sure that they are found and pass:
96-
```bash
97-
python3 -m doctest -v my_submission.py
98-
```
103+
104+
```bash
105+
python3 -m doctest -v my_submission.py
106+
```
99107

100108
The use of the Python builtin __input()__ function is **not** encouraged:
101109

@@ -110,44 +118,43 @@ We want your work to be readable by others; therefore, we encourage you to note
110118
```python
111119
starting_value = int(input("Please enter a starting value: ").strip())
112120
```
113-
121+
114122
The use of [Python type hints](https://docs.python.org/3/library/typing.html) is encouraged for function parameters and return values. Our automated testing will run [mypy](http://mypy-lang.org) so run that locally before making your submission.
115-
```python
116-
def sumab(a: int, b: int) --> int:
123+
124+
```python
125+
def sumab(a: int, b: int) --> int:
117126
pass
118127
```
119128

120-
- [__list comprehensions and generators__](https://docs.python.org/3/tutorial/datastructures.html#list-comprehensions) are preferred over the use of `lambda`, `map`, `filter`, `reduce` but the important thing is to demonstrate the power of Python in code that is easy to read and maintain.
121129

122-
- Avoid importing external libraries for basic algorithms. Only use those libraries for complicated algorithms.
123130

131+
- [__List comprehensions and generators__](https://docs.python.org/3/tutorial/datastructures.html#list-comprehensions) are preferred over the use of `lambda`, `map`, `filter`, `reduce` but the important thing is to demonstrate the power of Python in code that is easy to read and maintain.
132+
133+
134+
135+
- Avoid importing external libraries for basic algorithms. Only use those libraries for complicated algorithms.
124136
- If you need a third party module that is not in the file __requirements.txt__, please add it to that file as part of your submission.
125137

126138
#### Other Standard While Submitting Your Work
127139

128140
- File extension for code should be `.py`. Jupiter notebook files are acceptable in machine learning algorithms.
129-
130-
- Please avoid creating new directories if at all possible. Try to fit your work into the existing directory structue.
131-
132141
- Strictly use snake_case (underscore_separated) in your file_name, as it will be easy to parse in future using scripts.
142+
- Please avoid creating new directories if at all possible. Try to fit your work into the existing directory structure.
143+
- If possible, follow the standard *within* the folder you are submitting to.
133144

134-
If possible, follow the standard *within* the folder you are submitting to.
135145

136-
- If you have modified/added code work, make sure the code compiles before submitting.
137146

147+
- If you have modified/added code work, make sure the code compiles before submitting.
138148
- If you have modified/added documentation work, ensure your language is concise and contains no grammar errors.
139-
140149
- Do not update the README.md or DIRECTORY.md file which will be periodically autogenerated by our Travis CI processes.
141-
142150
- Add a corresponding explanation to [Algorithms-Explanation](https://github.com/TheAlgorithms/Algorithms-Explanation) (Optional but recommended).
143-
144151
- All submissions will be tested with [__mypy__](http://www.mypy-lang.org) so we encourage to add [__Python type hints__](https://docs.python.org/3/library/typing.html) where it makes sense to do so.
145152

146-
- Most importantly,
147153

154+
155+
- Most importantly,
148156
- **Be consistent in the use of these guidelines when submitting.**
149157
- **Join** [Gitter](https://gitter.im/TheAlgorithms) **now!**
150158
- Happy coding!
151159

152-
153160
Writer [@poyea](https://github.com/poyea), Jun 2019.

0 commit comments

Comments
 (0)