Skip to content

Commit

Permalink
Merge pull request #6 from zopefoundation/fix-deprecation-warning
Browse files Browse the repository at this point in the history
Fix DeprecationWarnings for (I)ObjectEvent
  • Loading branch information
janjaapdriessen committed Sep 2, 2020
2 parents 04277c9 + 273ebef commit bb9840b
Show file tree
Hide file tree
Showing 19 changed files with 201 additions and 251 deletions.
39 changes: 39 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
#
# EditorConfig Configuration file, for more details see:
# http://EditorConfig.org
# EditorConfig is a convention description, that could be interpreted
# by multiple editors to enforce common coding conventions for specific
# file types

# top-most EditorConfig file:
# Will ignore other EditorConfig files in Home directory or upper tree level.
root = true


[*] # For All Files
# Unix-style newlines with a newline ending every file
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
# Set default charset
charset = utf-8
# Indent style default
indent_style = space
# Max Line Length - a hard line wrap, should be disabled
max_line_length = off

[*.{py,cfg,ini}]
# 4 space indentation
indent_size = 4

[*.{yml,zpt,pt,dtml}]
# 2 space indentation
indent_size = 2

[{Makefile,.gitmodules}]
# Tab indentation (no size specified, but view as 4 spaces)
indent_style = tab
indent_size = unset
tab_width = unset
25 changes: 16 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
*.bak
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
*.egg-info/
*.profraw
*.pyc
*.pyo
*.swp
.coverage*
.coverage
.coverage.*
.installed.cfg
.mr.developer.cfg
.tox
bin
develop-eggs
develop/*
.tox/
__pycache__/
bin/
build/
coverage.xml
develop-eggs/
dist/
docs/_build
eggs/
htmlcov/
lib/
lib64
parts/
pip-selfcheck.json
pyvenv.cfg
src/*.egg-info
41 changes: 28 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,34 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
language: python
python:
- 2.7
- 3.4
- 3.5
- 3.6
- pypy
- pypy3
- 2.7
- pypy
- 3.5
- 3.6
- 3.7
- 3.8
- pypy3

matrix:
include:
- name: "lint"
python: 3.7
env: TOXENV="lint"
- name: "coverage"
python: 3.7
env: TOXENV="coverage"
after_success:
- coveralls

install:
- pip install -U pip setuptools
- pip install -U zope.testrunner coverage coveralls
- pip install -U -e .[test]
- pip install -U pip
- pip install -U tox-travis coveralls

script:
- coverage run -m zope.testrunner --test-path=src
after_success:
- coveralls
- tox

notifications:
email: false
email: false

cache: pip
3 changes: 2 additions & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ Changes
3.0.4 (unreleased)
------------------

- Nothing changed yet.
- Fix DeprecationWarnings.

- Drop support for Python 3.4 and add support for 3.7 and 3.8.

3.0.3 (2018-01-12)
------------------
Expand Down
23 changes: 19 additions & 4 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
include *.txt
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
include *.rst
include bootstrap.py
include *.txt
include buildout.cfg
include .travis.yml
recursive-include src *.py *.zcml
include tox.ini

exclude MANIFEST.in

recursive-include docs *.bat
recursive-include docs *.py
recursive-include docs *.rst
recursive-include docs Makefile

recursive-include src *.gif
recursive-include src *.pt
recursive-include src *.py
recursive-include src *.rst
recursive-include src *.txt
recursive-include src *.xml
recursive-include src *.zcml
178 changes: 0 additions & 178 deletions bootstrap.py

This file was deleted.

13 changes: 13 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
[bdist_wheel]
universal = 1

[flake8]
doctests = 1

[check-manifest]
ignore =
.editorconfig
.meta.cfg
.travis.yml
21 changes: 14 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
def read(*rnames):
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()


long_description = (
read('README.txt')
+ '\n' +
Expand All @@ -29,13 +30,19 @@ def read(*rnames):
description='Grok-like configuration for Zope local site and utilities',
long_description=long_description,
license='ZPL',
classifiers=['Environment :: Web Environment',
'Intended Audience :: Developers',
'License :: OSI Approved :: Zope Public License',
'Programming Language :: Python',
'Framework :: Zope :: 3',
],

classifiers=[
'Environment :: Web Environment',
'Intended Audience :: Developers',
'License :: OSI Approved :: Zope Public License',
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Framework :: Zope :: 3',
],
packages=find_packages('src'),
package_dir={'': 'src'},
namespace_packages=['grokcore'],
Expand Down

0 comments on commit bb9840b

Please sign in to comment.