Skip to content

Commit

Permalink
Upgrade version requirements and add github actions
Browse files Browse the repository at this point in the history
  • Loading branch information
digitalresistor committed Apr 5, 2020
1 parent 9a93e47 commit d5e5756
Show file tree
Hide file tree
Showing 5 changed files with 171 additions and 40 deletions.
70 changes: 70 additions & 0 deletions .github/workflows/ci-linux.yml
@@ -0,0 +1,70 @@
name: Build/test on Linux
# This workflow is triggered on pushes to the repository.
on: [push, pull_request]

jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
py: [
'2.7',
'3.5',
'3.6',
'3.7',
'3.8',
'pypy2',
'pypy3'
]
name: "Python: ${{ matrix.py }}"
steps:
- uses: actions/checkout@master
- name: Setup python
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.py }}
architecture: x64
- run: pip install tox
- name: Running tox
run: tox -e py
coverage:
runs-on: ubuntu-latest
name: Validate coverage for Python 2/3
steps:
- uses: actions/checkout@master
- name: Setup python
uses: actions/setup-python@v1
with:
python-version: 2.7
architecture: x64
- name: Setup python
uses: actions/setup-python@v1
with:
python-version: 3.8
architecture: x64
- run: pip install tox
- run: tox -e py2-cover,py3-cover,coverage
docs:
runs-on: ubuntu-latest
name: Build the documentation
steps:
- uses: actions/checkout@master
- name: Setup python
uses: actions/setup-python@v1
with:
python-version: 3.5
architecture: x64
- run: pip install tox
- run: tox -e docs
# lint:
# runs-on: ubuntu-latest
# name: Lint the package
# steps:
# - uses: actions/checkout@master
# - name: Setup python
# uses: actions/setup-python@v1
# with:
# python-version: 3.8
# architecture: x64
# - run: pip install tox
# - run: tox -e lint
32 changes: 32 additions & 0 deletions .github/workflows/ci-macos.yml
@@ -0,0 +1,32 @@
name: Build/test on MacOS
# This workflow is triggered on pushes to the repository.
on: [push, pull_request]

jobs:
test:
runs-on: macOS-latest
strategy:
matrix:
py: [
'2.7',
'3.5',
'3.6',
'3.7',
'3.8',
'pypy2',
'pypy3'
]
architecture: ['x64']
name: "Python: ${{ matrix.py }}"
steps:
- uses: actions/checkout@master
- name: Setup python
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.py }}
architecture: ${{ matrix.architecture }}
- run: pip install tox
- name: Running tox
run: |
ulimit -n 4096
tox -e py
28 changes: 28 additions & 0 deletions .github/workflows/ci-windows.yml
@@ -0,0 +1,28 @@
name: Build/test on Windows
# This workflow is triggered on pushes to the repository.
on: [push, pull_request]

jobs:
test:
runs-on: windows-2019
strategy:
matrix:
py: [
'2.7',
'3.5',
'3.6',
'3.7',
'3.8'
]
architecture: ['x86', 'x64']
name: "Python: ${{ matrix.py }} (${{ matrix.architecture }})"
steps:
- uses: actions/checkout@master
- name: Setup python
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.py }}
architecture: ${{ matrix.architecture }}
- run: pip install tox
- name: Running tox
run: tox -e py
76 changes: 38 additions & 38 deletions setup.py
Expand Up @@ -12,67 +12,67 @@
#
##############################################################################

from setuptools import setup, find_packages
from setuptools import find_packages, setup

README = open('README.rst').read()
CHANGES = open('CHANGES.txt').read()
README = open("README.rst").read()
CHANGES = open("CHANGES.txt").read()

requires = [
'Jinja2>=2.5.0',
'MarkupSafe',
'pyramid>=1.3.0', # pyramid.path.DottedNameResolver
'zope.deprecation',
"Jinja2>=2.5.0",
"MarkupSafe",
"pyramid>=1.3.0", # pyramid.path.DottedNameResolver
"zope.deprecation",
]

testing_extras = [
'coverage',
'nose>=1.2.0',
'WebTest',
"coverage",
"nose>=1.2.0",
"WebTest",
]
docs_extras = [
'pylons-sphinx-themes >= 0.3',
'Sphinx>=1.7.5',
"pylons-sphinx-themes >= 0.3",
"Sphinx>=1.7.5",
]

setup(name='pyramid_jinja2',
version='2.8',
description='Jinja2 template bindings for the Pyramid web framework',
long_description=README + '\n\n' + CHANGES,
classifiers=[
setup(
name="pyramid_jinja2",
version="2.8",
description="Jinja2 template bindings for the Pyramid web framework",
long_description=README + "\n\n" + CHANGES,
classifiers=[
"Intended Audience :: Developers",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Programming Language :: Python",
"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",
"Framework :: Pyramid",
"License :: Repoze Public License",
],
keywords='web wsgi pylons pyramid jinja2',
author="Rocky Burt",
author_email="pylons-discuss@googlegroups.com",
maintainer="Domen Kozar",
maintainer_email="domen@dev.si",
url="https://github.com/Pylons/pyramid_jinja2",
license="BSD-derived (http://www.repoze.org/LICENSE.txt)",
packages=find_packages(),
include_package_data=True,
zip_safe=False,
install_requires=requires,
extras_require = {
'testing':testing_extras,
'docs':docs_extras,
},
tests_require=requires + ['WebTest'],
test_suite="pyramid_jinja2.tests",
entry_points="""
],
keywords="web wsgi pylons pyramid jinja2",
author="Rocky Burt",
author_email="pylons-discuss@googlegroups.com",
maintainer="Domen Kozar",
maintainer_email="domen@dev.si",
url="https://github.com/Pylons/pyramid_jinja2",
license="BSD-derived (http://www.repoze.org/LICENSE.txt)",
packages=find_packages(),
include_package_data=True,
zip_safe=False,
install_requires=requires,
extras_require={"testing": testing_extras, "docs": docs_extras,},
tests_require=requires + ["WebTest"],
test_suite="pyramid_jinja2.tests",
python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*",
entry_points="""
[paste.paster_create_template]
pyramid_jinja2_starter=pyramid_jinja2.scaffolds:Jinja2ProjectTemplate
[pyramid.scaffold]
pyramid_jinja2_starter=pyramid_jinja2.scaffolds:Jinja2ProjectTemplate
""",
)
)
5 changes: 3 additions & 2 deletions tox.ini
@@ -1,8 +1,8 @@
[tox]
envlist =
py27,py34,py35,py36,py37,pypy,
py27,py35,py36,py37,py38,pypy,
py27-pyramid{13,14,15,16,17,18,19},
py27-pyramid{13,14,15,16,17,18,110},
py37-pyramid{13,14,15,16,17,18,110},
docs,
{py2,py3}-cover,coverage

Expand All @@ -15,6 +15,7 @@ basepython =
py35: python3.5
py36: python3.6
py37: python3.7
py38: python3.8
pypy: pypy
pypy3: pypy3
py2: python2.7
Expand Down

0 comments on commit d5e5756

Please sign in to comment.