Skip to content

Commit

Permalink
Merge pull request #9 from zopefoundation/config-with-pure-python-wit…
Browse files Browse the repository at this point in the history
…hout-pypy

Config with pure python without pypy
  • Loading branch information
sallner committed May 14, 2020
2 parents 414bffc + 512268a commit ab7235c
Show file tree
Hide file tree
Showing 11 changed files with 175 additions and 261 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-without-pypy
#
# 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
35 changes: 19 additions & 16 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
bin
build
develop-eggs
dist
lib
include
man
parts

__pycache__
.*
*.dll
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python-without-pypy
*.egg-info/
*.profraw
*.pyc
*.pyo
*.so
eggs/
*.egg-info
.coverage
.installed.cfg
.mr.developer.cfg
.tox/
__pycache__/
bin/
build/
coverage.xml
nosetests.xml
develop-eggs/
dist/
eggs/
htmlcov/
lib/
lib64
parts/
pyvenv.cfg
36 changes: 27 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,32 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python-without-pypy
language: python
sudo: false
python:
- 2.7
- 3.4
- 3.5
- 3.6
- 2.7
- 3.5
- 3.6
- 3.7
- 3.8

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

install:
- python bootstrap.py
- bin/buildout
- pip install -U pip
- pip install -U tox-travis coveralls

script:
- bin/test -v1
- tox

notifications:
email: false
email: false

cache: pip
4 changes: 3 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ Changelog
4.2 (unreleased)
----------------

- Nothing changed yet.
- Add support for Python 3.7 and 3.8.

- Drop support for Python 3.4.


4.1 (2017-05-26)
Expand Down
19 changes: 8 additions & 11 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python-without-pypy
include *.rst

recursive-include src *

include bootstrap.py
exclude bootstrap.py

include *.txt
include buildout.cfg
exclude buildout.cfg

include tox.ini
exclude tox.ini

exclude MANIFEST.in

global-exclude *.pyc
global-exclude *.pyo
recursive-include src *.pt
recursive-include src *.rst
recursive-include src *.txt
recursive-include src *.xml
recursive-include src *.zcml
189 changes: 0 additions & 189 deletions bootstrap.py

This file was deleted.

17 changes: 11 additions & 6 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
[nosetests]
nocapture=1
cover-package=zope.mkzeoinstance
cover-erase=1
cover-min-percentage=100
where=src
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python-without-pypy
[bdist_wheel]
universal = 1

[flake8]
doctests = 1

[check-manifest]
ignore =
.travis.yml
.editorconfig
11 changes: 10 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,25 @@
"Programming Language :: Python :: 2",
"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 :: 3.8",
"Programming Language :: Python :: Implementation :: CPython",
],
keywords="ZEO ZODB instance script",
packages=find_packages('src'),
package_dir={'': 'src'},
namespace_packages=['zope'],
include_package_data=True,
python_requires=', '.join([
'>=2.7',
'!=3.0.*',
'!=3.1.*',
'!=3.2.*',
'!=3.3.*',
'!=3.4.*',
]),
install_requires=[
'setuptools',
'zdaemon',
Expand Down
Loading

0 comments on commit ab7235c

Please sign in to comment.