Skip to content

Commit

Permalink
Back in black! (#739)
Browse files Browse the repository at this point in the history
Applies a bunch clean up filters with pre-commit (https://pre-commit.com/)
  • Loading branch information
jfboismenu committed Jan 15, 2020
1 parent d286d2e commit 857ff9d
Show file tree
Hide file tree
Showing 467 changed files with 21,102 additions and 15,417 deletions.
1 change: 0 additions & 1 deletion .coveragerc
Expand Up @@ -23,4 +23,3 @@ omit=
[report]
exclude_lines =
raise NotImplementedError

1 change: 0 additions & 1 deletion .flake8
Expand Up @@ -61,4 +61,3 @@ exclude =
# E999 SyntaxError: invalid syntax (hack for hound CI which runs python 3.x)

ignore = E501, W291, W293, W391, W503, E221, E261, E402, N802, N806, E999

2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -45,4 +45,4 @@ htmlcov
.DS_Store

# pyenv
.python-version
.python-version
1 change: 0 additions & 1 deletion .hound.yml
Expand Up @@ -16,4 +16,3 @@ python:

rubocop:
enabled: false

44 changes: 44 additions & 0 deletions .pre-commit-config.yaml
@@ -0,0 +1,44 @@
# Copyright (c) 2019 Shotgun Software Inc.
#
# CONFIDENTIAL AND PROPRIETARY
#
# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit
# Source Code License included in this distribution package. See LICENSE.
# By accessing, using, copying or modifying this work you indicate your
# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
# not expressly granted therein are reserved by Shotgun Software Inc.

# Styles the code properly
# Exclude the following file types
# - third party modules (tank_vendor/third_party)
# - any UI files (ui/*.py)
# - any images (*.png)
# - any pickles (*.pickle)
# - any files that are compared against the output of a tool (test_post_update_new_parser.yml, test_post_update_old_parser.yml, tank_core.txt)
exclude: "tank_vendor|third_party|ui\/.*py$|\/.*png|\/.*pickle|test_post_update_new_parser.yml|test_post_update_old_parser.yml|tank_core.txt|zip_with_root_folder.txt|zip_with_root_auto_detect.txt"
# List of super useful formatters.
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.2.3
hooks:
# Ensures the code is syntaxically correct
- id: check-ast
language_version: python3
# Ensures a file name will resolve on all platform
- id: check-case-conflict
# Checks files with the execute bit set have shebangs
- id: check-executables-have-shebangs
# Ensure there's no incomplete merges
- id: check-merge-conflict
# Adds an empty line if missing at the end of a file.
- id: end-of-file-fixer
# Makes sure requirements.txt is properly formatted
- id: requirements-txt-fixer
# Removes trailing whitespaces.
- id: trailing-whitespace
# Leave black at the bottom so all touchups are done before it is run.
- repo: https://github.com/ambv/black
rev: stable
hooks:
- id: black
language_version: python3
2 changes: 1 addition & 1 deletion .tkdeploy
Expand Up @@ -8,4 +8,4 @@ exclude=
.coveragerc
# Remove unneeded files.
tests
docs
docs
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -37,4 +37,4 @@ install:
# command to run tests
script: tests/run_travis.sh
# Only run coveralls if we actually ran tests. Otherwise this breaks coveralls it seems.
after_success: test $SHOTGUN_COMPILE_ONLY = 0 && coveralls
after_success: test $SHOTGUN_COMPILE_ONLY = 0 && coveralls
14 changes: 7 additions & 7 deletions LICENSE
Expand Up @@ -4,9 +4,9 @@ Version: 7/07/2013

Shotgun Software Inc. ("Company") provides the Shotgun Pipeline Toolkit,
software, including source code, in this package or repository folder (the
"Shotgun Toolkit Code") subject to your acceptance of and compliance with
"Shotgun Toolkit Code") subject to your acceptance of and compliance with
the following terms and conditions (the "License Terms"). By accessing,
downloading, copying, using or modifying any of the Shotgun Toolkit Code,
downloading, copying, using or modifying any of the Shotgun Toolkit Code,
you agree to these License Terms.

Eligibility
Expand All @@ -33,7 +33,7 @@ to the Shotgun Toolkit Code or any of Company's other software or intellectual
property rights. You agree not to take any action with respect to the Shotgun
Toolkit Code that is not expressly authorized above.

You must keep intact (and, in the case of copies, reproduce) all copyright
You must keep intact (and, in the case of copies, reproduce) all copyright
and other proprietary notices, including all references to and copies of these
License Terms, as originally included on, in, or with the Shotgun Toolkit
Code. You must ensure that all derivative works you make of the Shotgun
Expand Down Expand Up @@ -64,7 +64,7 @@ Company).
Liability

You agree to be solely responsible for your use and modifications of the
Shotgun Toolkit Code, and for any harm or liability arising out of such use
Shotgun Toolkit Code, and for any harm or liability arising out of such use
or modifications, including but not limited to any liability for infringement
of third-party intellectual property rights.

Expand All @@ -78,7 +78,7 @@ advised of the possibility of such damages; and (b) in any event, Company's
aggregate liability under these License Terms or in connection with the
Shotgun Toolkit Code, regardless of the form of action and under any theory
(whether in contract, tort, statutory, or otherwise), will not exceed the
greater of $50 or the amount (if any) that you actually paid for access to
greater of $50 or the amount (if any) that you actually paid for access to
the Shotgun Toolkit Code.

Ownership
Expand Down Expand Up @@ -115,7 +115,7 @@ Company grants you a non-exclusive right to continue to modify, make
derivative works of, reproduce, and use the Contribution for your
non-commercial or internal business purposes, and to further Company's
development of Company Programs. This grant does not: (a) limit Company's
rights, (b) grant you any rights with respect to the Company Programs; nor
rights, (b) grant you any rights with respect to the Company Programs; nor
(c) permit you to distribute, operate for the benefit of third parties (for
example, on a hosted basis), or otherwise commercially exploit the
Contribution.
Expand Down Expand Up @@ -143,4 +143,4 @@ employees, and agents against any and all claims, actions or damages
account of a breach or alleged breach of the foregoing warranty. You make no
other express or implied warranty (including without limitation any warranty
of merchantability or fitness for a particular purpose) regarding the
Contribution.
Contribution.
3 changes: 2 additions & 1 deletion README.md
Expand Up @@ -3,6 +3,7 @@
[![Build Status Linux](https://secure.travis-ci.org/shotgunsoftware/tk-core.svg?branch=master)](http://travis-ci.org/shotgunsoftware/tk-core)
[![Build status Windows](https://ci.appveyor.com/api/projects/status/wa0nkvpawf6020fi/branch/master?svg=true)](https://ci.appveyor.com/project/jfboismenu/tk-core/branch/master)
[![Coverage Status](https://coveralls.io/repos/github/shotgunsoftware/tk-core/badge.svg?branch=master)](https://coveralls.io/github/shotgunsoftware/tk-core?branch=master)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
[![Linting](https://img.shields.io/badge/PEP8%20by-Hound%20CI-a873d1.svg)](https://houndci.com)

# Shotgun Pipeline Toolkit Core API
Expand All @@ -13,7 +14,7 @@ This repository represents the Shotgun Pipeline Toolkit Core API.

Installing the Shotgun Pipeline Toolkit is normally done via our
Shotgun App Store. For detailed instructions on how to get started
with Toolkit, head over to our support site:
with Toolkit, head over to our support site:
https://support.shotgunsoftware.com/entries/95442748

## Reference Documentation and Release Notes
Expand Down

0 comments on commit 857ff9d

Please sign in to comment.