Skip to content

Commit

Permalink
Up.
Browse files Browse the repository at this point in the history
  • Loading branch information
ionelmc committed Sep 4, 2018
1 parent e98bc4d commit ded3a4f
Show file tree
Hide file tree
Showing 14 changed files with 32 additions and 47 deletions.
28 changes: 14 additions & 14 deletions .cookiecutterrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,37 @@

cookiecutter:
_template: cookiecutter-pylibrary
appveyor: 'yes'
appveyor: yes
c_extension_function: longest
c_extension_module: _nameless
c_extension_optional: 'no'
c_extension_support: 'no'
codacy: 'no'
codeclimate: 'no'
codecov: 'yes'
c_extension_optional: no
c_extension_support: no
codacy: no
codeclimate: no
codecov: yes
command_line_interface: plain
command_line_interface_bin_name: nameless
coveralls: 'no'
coveralls: no
distribution_name: nameless
email: [email protected]
full_name: Ionel Cristian Mărieș
github_username: ionelmc
landscape: 'no'
landscape: no
license: BSD 2-Clause License
linter: flake8
package_name: nameless
project_name: Nameless
project_short_description: An example package. Generated with cookiecutter-pylibrary.
release_date: today
repo_name: python-nameless
requiresio: 'yes'
scrutinizer: 'no'
sphinx_doctest: 'no'
requiresio: yes
scrutinizer: no
sphinx_doctest: no
sphinx_theme: sphinx-rtd-theme
test_matrix_configurator: 'no'
test_matrix_separate_coverage: 'no'
test_matrix_configurator: no
test_matrix_separate_coverage: no
test_runner: pytest
travis: 'yes'
travis: yes
version: 0.1.0
website: https://blog.ionelmc.ro
year: now
4 changes: 2 additions & 2 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[paths]
source =
src/nameless
*/site-packages/nameless
src
*/site-packages

[run]
branch = true
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ pip-log.txt
.coverage
.tox
.coverage.*
.pytest_cache/
nosetests.xml
coverage.xml
htmlcov
Expand Down
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ matrix:
- python: '2.7'
env:
- TOXENV=py27,report,codecov
- python: '3.3'
env:
- TOXENV=py33,report,codecov
- python: '3.4'
env:
- TOXENV=py34,report,codecov
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Changelog
=========

0.1.0 (2017-11-01)
0.1.0 (2018-09-04)
------------------

* First release on PyPI.
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Tips

To run a subset of tests::

tox -e envname -- py.test -k test_myfeature
tox -e envname -- pytest -k test_myfeature

To run all the test environments in *parallel* (you need to ``pip install detox``)::

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 2-Clause License

Copyright (c) 2017, Ionel Cristian Mărieș
Copyright (c) 2018, Ionel Cristian Mărieș
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
Expand Down
11 changes: 0 additions & 11 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,6 @@ environment:
PYTHON_HOME: C:\Python27-x64
PYTHON_VERSION: '2.7'
PYTHON_ARCH: '64'
- TOXENV: 'py33,report,codecov'
TOXPYTHON: C:\Python33\python.exe
PYTHON_HOME: C:\Python33
PYTHON_VERSION: '3.3'
PYTHON_ARCH: '32'
- TOXENV: 'py33,report,codecov'
TOXPYTHON: C:\Python33-x64\python.exe
WINDOWS_SDK_VERSION: v7.1
PYTHON_HOME: C:\Python33-x64
PYTHON_VERSION: '3.3'
PYTHON_ARCH: '64'
- TOXENV: 'py34,report,codecov'
TOXPYTHON: C:\Python34\python.exe
PYTHON_HOME: C:\Python34
Expand Down
5 changes: 0 additions & 5 deletions ci/appveyor-bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
URLS = {
("2.7", "64"): BASE_URL + "2.7.13/python-2.7.13.amd64.msi",
("2.7", "32"): BASE_URL + "2.7.13/python-2.7.13.msi",
# NOTE: no .msi installer for 3.3.6
("3.3", "64"): BASE_URL + "3.3.5/python-3.3.5.amd64.msi",
("3.3", "32"): BASE_URL + "3.3.5/python-3.3.5.msi",
("3.4", "64"): BASE_URL + "3.4.4/python-3.4.4.amd64.msi",
("3.4", "32"): BASE_URL + "3.4.4/python-3.4.4.msi",
("3.5", "64"): BASE_URL + "3.5.4/python-3.5.4-amd64.exe",
Expand All @@ -34,8 +31,6 @@
# Commands are allowed to fail only if they are not the last command. Eg: uninstall (/x) allowed to fail.
"2.7": [["msiexec.exe", "/L*+!", "install.log", "/qn", "/x", "{path}"],
["msiexec.exe", "/L*+!", "install.log", "/qn", "/i", "{path}", "TARGETDIR={home}"]],
"3.3": [["msiexec.exe", "/L*+!", "install.log", "/qn", "/x", "{path}"],
["msiexec.exe", "/L*+!", "install.log", "/qn", "/i", "{path}", "TARGETDIR={home}"]],
"3.4": [["msiexec.exe", "/L*+!", "install.log", "/qn", "/x", "{path}"],
["msiexec.exe", "/L*+!", "install.log", "/qn", "/i", "{path}", "TARGETDIR={home}"]],
"3.5": [["{path}", "/quiet", "TargetDir={home}"]],
Expand Down
4 changes: 4 additions & 0 deletions ci/templates/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ matrix:
include:
{%- for env in tox_environments %}{{ '' }}
- python: '{{ '{0[0]}-5.4'.format(env.split('-')) if env.startswith('pypy') else '{0[2]}.{0[3]}'.format(env) }}'
{% if env.startswith('py37') %}
dist: xenial
sudo: required
{% endif %}
env:
- TOXENV={{ env }},report,codecov
{%- endfor %}{{ '' }}
Expand Down
2 changes: 1 addition & 1 deletion ci/templates/appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ environment:
PYTHON_ARCH: '32'
- TOXENV: '{{ env }},report,codecov'
TOXPYTHON: C:\Python{{ env[2:4] }}-x64\python.exe
{%- if env.startswith(('py2', 'py33', 'py34')) %}
{%- if env.startswith(('py2', 'py34')) %}

WINDOWS_SDK_VERSION: v7.{{ '1' if env.startswith('py3') else '0' }}
{%- endif %}
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
source_suffix = '.rst'
master_doc = 'index'
project = 'Nameless'
year = '2017'
year = '2018'
author = 'Ionel Cristian Mărieș'
copyright = '{0}, {1}'.format(year, author)
version = release = '0.1.0'
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ def read(*names, **kwargs):
# complete classifier list: http://pypi.python.org/pypi?%3Aaction=list_classifiers
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'License :: OSI Approved :: Apache Software License',
'License :: OSI Approved :: BSD License',
'Operating System :: Unix',
'Operating System :: POSIX',
'Operating System :: Microsoft :: Windows',
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.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',
# uncomment if you test on these interpreters:
Expand Down
9 changes: 4 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
; a generative tox configuration, see: https://testrun.org/tox/latest/config.html#generative-envlist
; a generative tox configuration, see: https://tox.readthedocs.io/en/latest/config.html#generative-envlist

[tox]
envlist =
clean,
check,
{py27,py33,py34,py35,py36,pypy},
{py27,py34,py35,py36,py37,pypy},
report,
docs

[testenv]
basepython =
pypy: {env:TOXPYTHON:pypy}
{py27,docs,spell}: {env:TOXPYTHON:python2.7}
py33: {env:TOXPYTHON:python3.3}
py34: {env:TOXPYTHON:python3.4}
py35: {env:TOXPYTHON:python3.5}
py36: {env:TOXPYTHON:python3.6}
py37: {env:TOXPYTHON:python3.7}
{bootstrap,clean,check,report,coveralls,codecov}: {env:TOXPYTHON:python3}
setenv =
PYTHONPATH={toxinidir}/tests
Expand All @@ -28,7 +28,7 @@ deps =
pytest-travis-fold
pytest-cov
commands =
{posargs:py.test --cov --cov-report=term-missing -vv tests}
{posargs:pytest --cov --cov-report=term-missing -vv tests}

[testenv:bootstrap]
deps =
Expand Down Expand Up @@ -90,7 +90,6 @@ commands =
deps = coverage
skip_install = true
commands =
coverage combine --append
coverage report
coverage html

Expand Down

0 comments on commit ded3a4f

Please sign in to comment.