Skip to content

Commit

Permalink
Merge pull request #5 from zopefoundation/config-with-pure-python
Browse files Browse the repository at this point in the history
Config with pure python
  • Loading branch information
Michael Howitz committed Dec 14, 2021
2 parents e9a3721 + e76795a commit a970929
Show file tree
Hide file tree
Showing 20 changed files with 395 additions and 180 deletions.
3 changes: 0 additions & 3 deletions .coveragerc

This file was deleted.

1 change: 0 additions & 1 deletion .coveralls.yml

This file was deleted.

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,zcml}]
# 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
63 changes: 63 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
name: tests

on:
push:
pull_request:
schedule:
- cron: '0 12 * * 0' # run once a week on Sunday
# Allow to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
build:
strategy:
# We want to see all failures:
fail-fast: false
matrix:
os:
- ubuntu
config:
# [Python version, tox env]
- ["3.9", "lint"]
- ["2.7", "py27"]
- ["3.5", "py35"]
- ["3.6", "py36"]
- ["3.7", "py37"]
- ["3.8", "py38"]
- ["3.9", "py39"]
- ["3.10", "py310"]
- ["pypy2", "pypy"]
- ["pypy3", "pypy3"]
- ["3.9", "coverage"]

runs-on: ${{ matrix.os }}-latest
name: ${{ matrix.config[1] }}
steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.config[0] }}
- name: Pip cache
uses: actions/cache@v2
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
restore-keys: |
${{ runner.os }}-pip-${{ matrix.config[0] }}-
${{ runner.os }}-pip-
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox
- name: Test
run: tox -e ${{ matrix.config[1] }}
- name: Coverage
if: matrix.config[1] == 'coverage'
run: |
pip install coveralls coverage-python-version
coveralls --service=github
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36 changes: 27 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,31 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
*.dll
*.egg-info/
*.profraw
*.pyc
*.pyo
*.so
*.dll
__pycache__
src/*.egg-info

.coverage
.coverage.*
.eggs/
.installed.cfg
.tox
bin
build
develop-eggs
parts
.mr.developer.cfg
.tox/
.vscode/
__pycache__/
bin/
build/
coverage.xml
develop-eggs/
develop/
dist/
docs/_build
eggs/
etc/
lib/
lib64
log/
parts/
pyvenv.cfg
var/
34 changes: 34 additions & 0 deletions .meta.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
[meta]
template = "pure-python"
commit-id = "fba6d957ba447b6fa369d872e803756bd5176391"

[python]
with-windows = false
with-pypy = true
with-future-python = false
with-legacy-python = true
with-sphinx-doctests = false

[tox]
use-flake8 = true
testenv-deps = [
"zope.testrunner",
]

[coverage]
fail-under = 86

[manifest]
additional-rules = [
"recursive-include src *.po",
"recursive-include src *.pot",
"recursive-include src *.txt",
"recursive-include src *.zcml",
]

[check-manifest]
ignore-bad-ideas = [
"src/z3c/password/locales/*/LC_MESSAGES/z3c.password.mo",
]
28 changes: 0 additions & 28 deletions .travis.yml

This file was deleted.

15 changes: 9 additions & 6 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
CHANGES
=======

1.0.1 (unreleased)
1.1.0 (unreleased)
------------------

- Nothing changed yet.
- Add support for Python 3.8, 3.9 and 3.10.

- Drop support for Python 3.4.


1.0.0 (2018-11-14)
Expand All @@ -17,17 +19,18 @@ CHANGES
- Drop support for ``None`` passwords, since they are not supported in the
underlying APIs anymore.


1.0.0a1 (2013-02-28)
--------------------

- Added support for Python 3.3.
- Add support for Python 3.3.

- Dropped dependency on ``zope.app.testing`` and ``zope.app.authentication``.
- Drop dependency on ``zope.app.testing`` and ``zope.app.authentication``.

- Replaced deprecated ``zope.interface.implements`` usage with equivalent
- Replace deprecated ``zope.interface.implements`` usage with equivalent
``zope.interface.implementer`` decorator.

- Dropped support for Python 2.4 and 2.5.
- Drop support for Python 2.4 and 2.5.


0.11.1 (2012-09-19)
Expand Down
15 changes: 8 additions & 7 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
include *.rst
include *.txt
include *.py
include buildout.cfg
include tox.ini
include .coveragerc
include .travis.yml
include .coveralls.yml

recursive-include src *

global-exclude *.pyc
recursive-include src *.py
recursive-include src *.po
recursive-include src *.pot
recursive-include src *.txt
recursive-include src *.zcml
8 changes: 6 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
============
z3c.password
============

.. image:: https://travis-ci.com/zopefoundation/z3c.password.png?branch=master
:target: https://travis-ci.com/zopefoundation/z3c.password

.. image:: https://github.com/zopefoundation/z3c.password/actions/workflows/tests.yml/badge.svg
:target: https://github.com/zopefoundation/z3c.password/actions/workflows/tests.yml

.. image:: https://coveralls.io/repos/github/zopefoundation/z3c.password/badge.svg?branch=master
:target: https://coveralls.io/github/zopefoundation/z3c.password?branch=master
Expand Down
14 changes: 14 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
[bdist_wheel]
universal = 1

[flake8]
doctests = 1

[check-manifest]
ignore =
.editorconfig
.meta.toml
ignore-bad-ideas =
src/z3c/password/locales/*/LC_MESSAGES/z3c.password.mo
52 changes: 29 additions & 23 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,25 @@
import os
from setuptools import setup, find_packages


def read(*rnames):
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()

setup (

setup(
name='z3c.password',
version='1.0.1.dev0',
author = "Stephan Richter, Roger Ineichen and the Zope Community",
author_email = "zope3-dev@zope.org",
description = "Password generation and verification utility for Zope3",
version='1.1.0.dev0',
author="Stephan Richter, Roger Ineichen and the Zope Community",
author_email="zope3-dev@zope.org",
description="Password generation and verification utility for Zope3",
long_description=(
read('README.rst')
+ '\n\n' +
read('CHANGES.rst')
),
license = "ZPL 2.1",
keywords = "zope3 z3c password verification",
classifiers = [
),
license="ZPL 2.1",
keywords="zope3 z3c password verification",
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
'Intended Audience :: Developers',
Expand All @@ -41,28 +43,32 @@ def read(*rnames):
'Programming Language :: Python :: 2',
'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',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: Implementation :: CPython',
"Programming Language :: Python :: Implementation :: PyPy",
'Natural Language :: English',
'Operating System :: OS Independent',
'Topic :: Internet :: WWW/HTTP',
'Framework :: Zope :: 3'],
url = 'http://pypi.org/project/z3c.password',
packages = find_packages('src'),
include_package_data = True,
package_dir = {'':'src'},
namespace_packages = ['z3c'],
extras_require = dict(
test = [
url='http://pypi.org/project/z3c.password',
packages=find_packages('src'),
include_package_data=True,
package_dir={'': 'src'},
namespace_packages=['z3c'],
extras_require=dict(
test=[
'z3c.coverage',
'zope.password',
'zope.pluggableauth',
'zope.testing',
],
),
install_requires = [
],
),
install_requires=[
'setuptools',
'zope.component',
'zope.exceptions',
Expand All @@ -71,12 +77,12 @@ def read(*rnames):
'zope.interface',
'zope.schema',
'zope.security',
],
tests_require = [
],
tests_require=[
'zope.password',
'zope.pluggableauth',
'zope.testing',
],
],
test_suite='z3c.password.tests.test_suite',
zip_safe = False,
zip_safe=False,
)
Loading

0 comments on commit a970929

Please sign in to comment.