-
Notifications
You must be signed in to change notification settings - Fork 38
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
Python 3 only -- fixes deprecation warnings #63
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
c25f62b
Move to src folder
digitalresistor 6d5fcb7
Move tests to their own folder
digitalresistor 91fbc1a
Update setup.py/setup.cfg/pyproject.toml
digitalresistor f3a2bdb
Update version to 2.0.0
digitalresistor 71b98c3
Update .gitignore
digitalresistor 6cfd77c
Update coverage information
digitalresistor 9b35c84
Update to Python 3 only world
digitalresistor 257a6db
Update tox.ini for new world
digitalresistor 579a3ce
Update travis for py3 only
digitalresistor f9eb29d
Add MANIFEST.in
digitalresistor c2d7a25
Don't add LICENSE.txt to long_description
digitalresistor File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
[run] | ||
parallel = true | ||
source = | ||
venusian | ||
|
||
[paths] | ||
source = | ||
src/venusian | ||
*/src/venusian | ||
*/site-packages/venusian | ||
|
||
[report] | ||
show_missing = true | ||
precision = 2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,6 +10,7 @@ | |
.*.swp | ||
.cache/ | ||
.coverage | ||
.coverage.* | ||
.tox/ | ||
__pycache__/ | ||
build/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
graft src/venusian | ||
graft tests | ||
graft docs | ||
prune docs/_build | ||
prune docs/_themes | ||
|
||
include README.rst | ||
include CHANGES.rst | ||
include LICENSE.txt | ||
include CONTRIBUTING.rst | ||
include CONTRIBUTORS.txt | ||
include COPYRIGHT.txt | ||
|
||
include pyproject.toml setup.cfg | ||
include .coveragerc | ||
include tox.ini .travis.yml rtd.txt | ||
|
||
recursive-exclude * __pycache__ *.py[cod] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
[build-system] | ||
requires = ["setuptools >= 40.9.0"] | ||
build-backend = "setuptools.build_meta" | ||
|
||
[tool.black] | ||
py36 = false | ||
exclude = ''' | ||
/( | ||
\.git | ||
| .tox | ||
)/ | ||
''' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,49 @@ | ||
[easy_install] | ||
zip_ok = false | ||
[metadata] | ||
name = venusian | ||
version = 2.0.0 | ||
description = A library for deferring decorator actions | ||
long_description = file: README.rst, CHANGES.rst | ||
long_description_content_type = text/x-rst | ||
keywords = web wsgi zope | ||
license = BSD-derived (http://www.repoze.org/LICENSE.txt) | ||
classifiers = | ||
Development Status :: 6 - Mature | ||
Intended Audience :: Developers | ||
Programming Language :: Python :: 3 | ||
Programming Language :: Python :: 3.5 | ||
Programming Language :: Python :: 3.6 | ||
Programming Language :: Python :: 3.7 | ||
Programming Language :: Python :: 3.8 | ||
Programming Language :: Python :: Implementation :: CPython | ||
Programming Language :: Python :: Implementation :: PyPy | ||
url = https://pylonsproject.org/ | ||
author = Chris McDonough, Agendaless Consulting | ||
author_email = pylons-devel@googlegroups.com | ||
python_requires = >=3.5 | ||
|
||
[bdist_wheel] | ||
universal = 1 | ||
[options] | ||
package_dir= | ||
=src | ||
packages=find: | ||
|
||
[options.packages.find] | ||
where=src | ||
|
||
[tools:pytest] | ||
ignore=venusian/tests/fixtures/ | ||
testpaths=venusian/tests/ | ||
[options.extras_require] | ||
testing = | ||
pytest | ||
pytest-cov | ||
coverage | ||
docs = | ||
Sphinx | ||
repoze.sphinx.autointerface | ||
|
||
[bdist_wheel] | ||
universal=1 | ||
|
||
[aliases] | ||
dev = develop easy_install venusian[testing] | ||
docs = develop easy_install venusian[docs] | ||
[tool:pytest] | ||
ignore=tests/fixtures/ | ||
python_files = test_*.py | ||
testpaths = | ||
tests | ||
addopts = -W always --cov --cov-report=term-missing |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,76 +1,7 @@ | ||
############################################################################## | ||
# | ||
# Copyright (c) 2010 Agendaless Consulting and Contributors. | ||
# All Rights Reserved. | ||
# | ||
# This software is subject to the provisions of the BSD-like license at | ||
# http://www.repoze.org/LICENSE.txt. A copy of the license should accompany | ||
# this distribution. THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL | ||
# EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, | ||
# THE IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND | ||
# FITNESS FOR A PARTICULAR PURPOSE | ||
# | ||
############################################################################## | ||
|
||
import os | ||
""" | ||
Necessary for pip install -e, and python setup.py check | ||
""" | ||
|
||
from setuptools import setup | ||
from setuptools import find_packages | ||
|
||
here = os.path.abspath(os.path.dirname(__file__)) | ||
|
||
try: | ||
with open(os.path.join(here, 'README.rst')) as f: | ||
README = f.read() | ||
with open(os.path.join(here, 'CHANGES.rst')) as f: | ||
CHANGES = f.read() | ||
except: | ||
README = '' | ||
CHANGES = '' | ||
|
||
testing_extras = [ | ||
'pytest', | ||
'coverage', | ||
'pytest-cov', | ||
] | ||
|
||
docs_extras = [ | ||
'Sphinx', | ||
'repoze.sphinx.autointerface' | ||
] | ||
|
||
setup(name='venusian', | ||
version='1.2.0', | ||
description='A library for deferring decorator actions', | ||
long_description=README + '\n\n' + CHANGES, | ||
classifiers=[ | ||
"Development Status :: 6 - Mature", | ||
"Intended Audience :: Developers", | ||
"Programming Language :: Python", | ||
"Programming Language :: Python :: 2.7", | ||
"Programming Language :: Python :: 3", | ||
"Programming Language :: Python :: 3.4", | ||
"Programming Language :: Python :: 3.5", | ||
"Programming Language :: Python :: 3.6", | ||
"Programming Language :: Python :: 3.7", | ||
"Programming Language :: Python :: Implementation :: CPython", | ||
"Programming Language :: Python :: Implementation :: PyPy", | ||
], | ||
keywords='web wsgi zope', | ||
author="Chris McDonough, Agendaless Consulting", | ||
author_email="pylons-devel@googlegroups.com", | ||
url="https://pylonsproject.org", | ||
license="BSD-derived (http://www.repoze.org/LICENSE.txt)", | ||
packages=find_packages(), | ||
include_package_data=True, | ||
zip_safe=False, | ||
extras_require={ | ||
'testing': testing_extras, | ||
'docs': docs_extras, | ||
}, | ||
tests_require=[], | ||
install_requires=[], | ||
test_suite='venusian', | ||
entry_points="""\ | ||
""" | ||
) | ||
setup() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
.../fixtures/importerror_package/__init__.py → tests/fixtures/attrerror/__init__.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...an/tests/fixtures/importerror/__init__.py → tests/fixtures/attrerror_package/__init__.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
4 changes: 2 additions & 2 deletions
4
venusian/tests/fixtures/category.py → tests/fixtures/category.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
venusian/tests/fixtures/class_and_method.py → tests/fixtures/class_and_method.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
from venusian.tests.fixtures import decorator | ||
from tests.fixtures import decorator | ||
|
||
|
||
@decorator(class_=True) | ||
|
2 changes: 1 addition & 1 deletion
2
venusian/tests/fixtures/classdecorator.py → tests/fixtures/classdecorator.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
from tests.fixtures import decorator | ||
from tests.fixtures.import_and_scan.two import twofunction # should not be scanned | ||
|
||
@decorator(function=True) | ||
def onefunction(request): # pragma: no cover | ||
twofunction(request) | ||
return request |
2 changes: 1 addition & 1 deletion
2
...ian/tests/fixtures/import_and_scan/two.py → tests/fixtures/import_and_scan/two.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Meat of the change here...