Skip to content

Commit c5d3a23

Browse files
committed
Upgrade skel. Add docs dir.
1 parent cb7a3bd commit c5d3a23

30 files changed

+442
-201
lines changed

Diff for: .bumpversion.cfg

+2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@ tag = True
55

66
[bumpversion:file:setup.py]
77

8+
[bumpversion:file:docs/conf.py]
9+
810
[bumpversion:file:src/tblib/__init__.py]
911

Diff for: .cookiecutterrc

+36-33
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
1-
# This file exists so you can easily regenerate your project.
2-
#
3-
# Unfortunately cookiecutter can't use this right away so
4-
# you have to copy this file to ~/.cookiecutterrc
1+
# Generated by cookiepatcher, a small shim around cookiecutter (pip install cookiepatcher)
52

6-
default_context:
7-
8-
appveyor: 'yes'
9-
c_extension_optional: 'no'
10-
c_extension_support: 'no'
11-
codacy: 'yes'
12-
codeclimate: 'yes'
13-
codecov: 'yes'
14-
command_line_interface: 'no'
15-
coveralls: 'yes'
16-
distribution_name: 'tblib'
17-
18-
full_name: 'Ionel Cristian Mărieș'
19-
github_username: 'ionelmc'
20-
landscape: 'yes'
21-
package_name: 'tblib'
22-
project_name: 'tblib'
23-
project_short_description: 'Traceback fiddling library. For now allows you to pickle tracebacks and raise exceptions with pickled tracebacks in different processes. This allows better error handling when running code over multiple processes (imagine multiprocessing, billiard, futures, celery etc).'
24-
release_date: '2015-07-27'
25-
repo_name: 'python-tblib'
26-
requiresio: 'yes'
27-
scrutinizer: 'yes'
28-
sphinx_theme: 'sphinx-py3doc-enhanced-theme'
29-
test_matrix_configurator: 'no'
30-
test_runner: 'no'
31-
travis: 'yes'
32-
version: '1.1.0'
33-
website: 'http://blog.ionelmc.ro'
34-
year: '2013-2015'
3+
cookiecutter:
4+
appveyor: 'yes'
5+
c_extension_cython: 'yes'
6+
c_extension_optional: 'no'
7+
c_extension_support: 'no'
8+
codacy: 'yes'
9+
codeclimate: 'yes'
10+
codecov: 'yes'
11+
command_line_interface: 'no'
12+
command_line_interface_bin_name: '-'
13+
coveralls: 'yes'
14+
distribution_name: tblib
15+
16+
full_name: Ionel Cristian Mărieș
17+
github_username: ionelmc
18+
landscape: 'yes'
19+
package_name: tblib
20+
project_name: tblib
21+
project_short_description: Traceback fiddling library. For now allows you to pickle
22+
tracebacks and raise exceptions with pickled tracebacks in different processes.
23+
This allows better error handling when running code over multiple processes
24+
(imagine multiprocessing, billiard, futures, celery etc).
25+
release_date: '2015-12-18'
26+
repo_name: python-tblib
27+
requiresio: 'yes'
28+
scrutinizer: 'yes'
29+
sphinx_doctest: 'no'
30+
sphinx_theme: sphinx-py3doc-enhanced-theme
31+
test_matrix_configurator: 'no'
32+
test_matrix_separate_coverage: 'no'
33+
test_runner: pytest
34+
travis: 'yes'
35+
version: 1.2.0
36+
website: http://blog.ionelmc.ro
37+
year: 2013-2016

Diff for: .coveragerc

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
[paths]
2-
source = src
2+
source =
3+
src/tblib
4+
*/site-packages/tblib
35

46
[run]
57
branch = True
6-
source = src
8+
source = tblib
79
parallel = true
810

911
[report]

Diff for: .editorconfig

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# see http://editorconfig.org
2+
root = true
3+
4+
[*]
5+
end_of_line = lf
6+
trim_trailing_whitespace = true
7+
insert_final_newline = true
8+
indent_style = space
9+
indent_size = 4
10+
charset = utf-8
11+
12+
[*.{bat,cmd,ps1}]
13+
end_of_line = crlf

Diff for: .travis.yml

+13-20
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,17 @@ python: '3.5'
33
sudo: false
44
env:
55
global:
6-
LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
6+
- LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
7+
- SEGFAULT_SIGNALS=all
78
matrix:
89
- TOXENV=check
10+
- TOXENV=docs
911

10-
- TOXENV=2.6-cover,coveralls,codecov
11-
- TOXENV=2.6-nocov
12-
13-
- TOXENV=2.7-cover,coveralls,codecov
14-
- TOXENV=2.7-nocov
15-
16-
- TOXENV=3.3-cover,coveralls,codecov
17-
- TOXENV=3.3-nocov
18-
19-
- TOXENV=3.4-cover,coveralls,codecov
20-
- TOXENV=3.4-nocov
21-
22-
- TOXENV=3.5-cover,coveralls,codecov
23-
- TOXENV=3.5-nocov
24-
25-
- TOXENV=pypy-cover,coveralls,codecov
26-
- TOXENV=pypy-nocov
27-
12+
- TOXENV=py27,coveralls,codecov
13+
- TOXENV=py33,coveralls,codecov
14+
- TOXENV=py34,coveralls,codecov
15+
- TOXENV=py35,coveralls,codecov
16+
- TOXENV=pypy,coveralls,codecov
2817
before_install:
2918
- python --version
3019
- uname -a
@@ -40,8 +29,12 @@ script:
4029
after_failure:
4130
- more .tox/log/* | cat
4231
- more .tox/*/log/* | cat
32+
before_cache:
33+
- rm -rf $HOME/.cache/pip/log
34+
cache:
35+
directories:
36+
- $HOME/.cache/pip
4337
notifications:
4438
email:
4539
on_success: never
4640
on_failure: always
47-

Diff for: CONTRIBUTING.rst

+8-7
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,15 @@ If you are proposing a feature:
3030

3131
* Explain in detail how it would work.
3232
* Keep the scope as narrow as possible, to make it easier to implement.
33-
* Remember that this is a volunteer-driven project, and that contributions are welcome :)
33+
* Remember that this is a volunteer-driven project, and that code contributions are welcome :)
3434

3535
Development
3636
===========
3737

3838
To set up `python-tblib` for local development:
3939

40-
1. `Fork python-tblib on GitHub <https://github.com/ionelmc/python-tblib/fork>`_.
40+
1. Fork `python-tblib <https://github.com/ionelmc/python-tblib>`_
41+
(look for the "Fork" button).
4142
2. Clone your fork locally::
4243

4344
git clone [email protected]:your_name_here/python-tblib.git
@@ -68,15 +69,15 @@ If you need some code review or feedback while you're developing the code just m
6869
For merging, you should:
6970

7071
1. Include passing tests (run ``tox``) [1]_.
71-
2. Update documentation when there's new API, functionality etc.
72+
2. Update documentation when there's new API, functionality etc.
7273
3. Add a note to ``CHANGELOG.rst`` about the changes.
7374
4. Add yourself to ``AUTHORS.rst``.
7475

75-
.. [1] If you don't have all the necessary python versions available locally you can rely on Travis - it will
76+
.. [1] If you don't have all the necessary python versions available locally you can rely on Travis - it will
7677
`run the tests <https://travis-ci.org/ionelmc/python-tblib/pull_requests>`_ for each change you add in the pull request.
77-
78+
7879
It will be slower though ...
79-
80+
8081
Tips
8182
----
8283

@@ -86,4 +87,4 @@ To run a subset of tests::
8687

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

89-
detox
90+
detox

Diff for: LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2013-2015, Ionel Cristian Mărieș
1+
Copyright (c) 2013-2016, Ionel Cristian Mărieș
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the

Diff for: MANIFEST.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ graft tests
77
include .bumpversion.cfg
88
include .coveragerc
99
include .cookiecutterrc
10+
include .editorconfig
1011
include .isort.cfg
11-
include .pylintrc
1212

1313
include AUTHORS.rst
1414
include CHANGELOG.rst

Diff for: README.rst

+12-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
=====
2-
tblib
3-
=====
1+
========
2+
Overview
3+
========
4+
5+
.. start-badges
46
57
.. list-table::
68
:stub-columns: 1
@@ -49,6 +51,7 @@ tblib
4951
.. |codeclimate| image:: https://codeclimate.com/github/ionelmc/python-tblib/badges/gpa.svg
5052
:target: https://codeclimate.com/github/ionelmc/python-tblib
5153
:alt: CodeClimate Quality Status
54+
5255
.. |version| image:: https://img.shields.io/pypi/v/tblib.svg?style=flat
5356
:alt: PyPI Package latest release
5457
:target: https://pypi.python.org/pypi/tblib
@@ -73,8 +76,12 @@ tblib
7376
:alt: Scrutinizer Status
7477
:target: https://scrutinizer-ci.com/g/ionelmc/python-tblib/
7578

76-
Traceback fiddling library. For now allows you to pickle tracebacks and raise exceptions with pickled tracebacks in different processes.
77-
This allows better error handling when running code over multiple processes (imagine multiprocessing, billiard, futures, celery etc).
79+
80+
.. end-badges
81+
82+
Traceback fiddling library. For now allows you to pickle tracebacks and raise exceptions with pickled tracebacks in
83+
different processes. This allows better error handling when running code over multiple processes (imagine
84+
multiprocessing, billiard, futures, celery etc).
7885

7986
* Free software: BSD license
8087

Diff for: appveyor.yml

+10-42
Original file line numberDiff line numberDiff line change
@@ -11,74 +11,40 @@ environment:
1111
PYTHON_VERSION: '2.7'
1212
PYTHON_ARCH: '32'
1313

14-
- TOXENV: '2.7-cover,codecov'
15-
TOXPYTHON: C:\Python27\python.exe
16-
PYTHON_HOME: C:\Python27
17-
PYTHON_VERSION: '2.7'
18-
PYTHON_ARCH: '32'
19-
- TOXENV: '2.7-nocov'
14+
- TOXENV: 'py27,codecov'
2015
TOXPYTHON: C:\Python27\python.exe
2116
PYTHON_HOME: C:\Python27
2217
PYTHON_VERSION: '2.7'
2318
PYTHON_ARCH: '32'
2419

25-
- TOXENV: '2.7-cover,codecov'
26-
TOXPYTHON: C:\Python27-x64\python.exe
27-
WINDOWS_SDK_VERSION: v7.0
28-
PYTHON_HOME: C:\Python27-x64
29-
PYTHON_VERSION: '2.7'
30-
PYTHON_ARCH: '64'
31-
- TOXENV: '2.7-nocov'
20+
- TOXENV: 'py27,codecov'
3221
TOXPYTHON: C:\Python27-x64\python.exe
3322
WINDOWS_SDK_VERSION: v7.0
3423
PYTHON_HOME: C:\Python27-x64
3524
PYTHON_VERSION: '2.7'
3625
PYTHON_ARCH: '64'
3726

38-
- TOXENV: '3.4-cover,codecov'
39-
TOXPYTHON: C:\Python34\python.exe
40-
PYTHON_HOME: C:\Python34
41-
PYTHON_VERSION: '3.4'
42-
PYTHON_ARCH: '32'
43-
- TOXENV: '3.4-nocov'
27+
- TOXENV: 'py34,codecov'
4428
TOXPYTHON: C:\Python34\python.exe
4529
PYTHON_HOME: C:\Python34
4630
PYTHON_VERSION: '3.4'
4731
PYTHON_ARCH: '32'
4832

49-
- TOXENV: '3.4-cover,codecov'
50-
TOXPYTHON: C:\Python34-x64\python.exe
51-
WINDOWS_SDK_VERSION: v7.1
52-
PYTHON_HOME: C:\Python34-x64
53-
PYTHON_VERSION: '3.4'
54-
PYTHON_ARCH: '64'
55-
- TOXENV: '3.4-nocov'
33+
- TOXENV: 'py34,codecov'
5634
TOXPYTHON: C:\Python34-x64\python.exe
5735
WINDOWS_SDK_VERSION: v7.1
5836
PYTHON_HOME: C:\Python34-x64
5937
PYTHON_VERSION: '3.4'
6038
PYTHON_ARCH: '64'
6139

62-
- TOXENV: '3.5-cover,codecov'
63-
TOXPYTHON: C:\Python35\python.exe
64-
PYTHON_HOME: C:\Python35
65-
PYTHON_VERSION: '3.5'
66-
PYTHON_ARCH: '32'
67-
- TOXENV: '3.5-nocov'
40+
- TOXENV: 'py35,codecov'
6841
TOXPYTHON: C:\Python35\python.exe
6942
PYTHON_HOME: C:\Python35
7043
PYTHON_VERSION: '3.5'
7144
PYTHON_ARCH: '32'
7245

73-
- TOXENV: '3.5-cover,codecov'
46+
- TOXENV: 'py35,codecov'
7447
TOXPYTHON: C:\Python35-x64\python.exe
75-
WINDOWS_SDK_VERSION: v7.1
76-
PYTHON_HOME: C:\Python35-x64
77-
PYTHON_VERSION: '3.5'
78-
PYTHON_ARCH: '64'
79-
- TOXENV: '3.5-nocov'
80-
TOXPYTHON: C:\Python35-x64\python.exe
81-
WINDOWS_SDK_VERSION: v7.1
8248
PYTHON_HOME: C:\Python35-x64
8349
PYTHON_VERSION: '3.5'
8450
PYTHON_ARCH: '64'
@@ -100,5 +66,7 @@ on_failure:
10066
- ps: get-content .tox\*\log\*
10167
artifacts:
10268
- path: dist\*
103-
### To enable remote debugging uncomment this:
104-
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
69+
70+
### To enable remote debugging uncomment this (also, see: http://www.appveyor.com/docs/how-to/rdp-to-build-worker):
71+
# on_finish:
72+
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

Diff for: ci/appveyor-bootstrap.py

-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
GET_PIP_URL = "https://bootstrap.pypa.io/get-pip.py"
1919
GET_PIP_PATH = "C:\get-pip.py"
2020
URLS = {
21-
("2.6", "64"): BASE_URL + "2.6.6/python-2.6.6.amd64.msi",
22-
("2.6", "32"): BASE_URL + "2.6.6/python-2.6.6.msi",
2321
("2.7", "64"): BASE_URL + "2.7.10/python-2.7.10.amd64.msi",
2422
("2.7", "32"): BASE_URL + "2.7.10/python-2.7.10.msi",
2523
# NOTE: no .msi installer for 3.3.6
@@ -32,8 +30,6 @@
3230
}
3331
INSTALL_CMD = {
3432
# Commands are allowed to fail only if they are not the last command. Eg: uninstall (/x) allowed to fail.
35-
"2.6": [["msiexec.exe", "/L*+!", "install.log", "/qn", "/x", "{path}"],
36-
["msiexec.exe", "/L*+!", "install.log", "/qn", "/i", "{path}", "TARGETDIR={home}"]],
3733
"2.7": [["msiexec.exe", "/L*+!", "install.log", "/qn", "/x", "{path}"],
3834
["msiexec.exe", "/L*+!", "install.log", "/qn", "/i", "{path}", "TARGETDIR={home}"]],
3935
"3.3": [["msiexec.exe", "/L*+!", "install.log", "/qn", "/x", "{path}"],

0 commit comments

Comments
 (0)