Skip to content

Commit 76cdb6c

Browse files
author
Thomas Grainger
committedJan 10, 2017
configure tox, wheels, lint and fix py.test config
the tests directory should not contain an "__init__.py"
·
0.5.1
1 parent 4135ef4 commit 76cdb6c

12 files changed

+137
-26
lines changed
 

‎.gitignore

+94-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,96 @@
1-
# Compiled python modules.
2-
*.pyc
1+
# Created by https://www.gitignore.io/api/python
32

4-
# Setuptools distribution folder.
5-
/dist/
3+
### Python ###
4+
# Byte-compiled / optimized / DLL files
5+
__pycache__/
6+
*.py[cod]
7+
*$py.class
68

7-
# Python egg metadata, regenerated from source files by setuptools.
8-
/*.egg-info
9+
# C extensions
10+
*.so
11+
12+
# Distribution / packaging
13+
.Python
14+
env/
15+
build/
16+
develop-eggs/
17+
dist/
18+
downloads/
19+
eggs/
20+
.eggs/
21+
lib/
22+
lib64/
23+
parts/
24+
sdist/
25+
var/
26+
wheels/
27+
*.egg-info/
28+
.installed.cfg
29+
*.egg
30+
31+
# PyInstaller
32+
# Usually these files are written by a python script from a template
33+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
34+
*.manifest
35+
*.spec
36+
37+
# Installer logs
38+
pip-log.txt
39+
pip-delete-this-directory.txt
40+
41+
# Unit test / coverage reports
42+
htmlcov/
43+
.tox/
44+
.coverage
45+
.coverage.*
46+
.cache
47+
nosetests.xml
48+
coverage.xml
49+
*,cover
50+
.hypothesis/
51+
52+
# Translations
53+
*.mo
54+
*.pot
55+
56+
# Django stuff:
57+
*.log
58+
local_settings.py
59+
60+
# Flask stuff:
61+
instance/
62+
.webassets-cache
63+
64+
# Scrapy stuff:
65+
.scrapy
66+
67+
# Sphinx documentation
68+
docs/_build/
69+
70+
# PyBuilder
71+
target/
72+
73+
# Jupyter Notebook
74+
.ipynb_checkpoints
75+
76+
# pyenv
77+
.python-version
78+
79+
# celery beat schedule file
80+
celerybeat-schedule
81+
82+
# dotenv
83+
.env
84+
85+
# virtualenv
86+
.venv/
87+
venv/
88+
ENV/
89+
90+
# Spyder project settings
91+
.spyderproject
92+
93+
# Rope project settings
94+
.ropeproject
95+
96+
# End of https://www.gitignore.io/api/python

‎.travis.yml

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
language: python
2-
python:
3-
- "2.7"
4-
- "3.6"
5-
cache: pip
6-
install:
7-
- pip install -r requirements.txt
8-
- pip install nose
9-
script:
10-
- py.test
2+
python: 3.6
3+
env:
4+
- TOX_ENV=py27
5+
- TOX_ENV=py35
6+
- TOX_ENV=py36
7+
- TOX_ENV=lint
8+
install: pip install tox
9+
script: tox -e $TOX_ENV

‎requirements.txt

-2
This file was deleted.

‎setup.cfg

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[bdist_wheel]
2+
universal=1

‎setup.py

+12-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
from setuptools import setup, find_packages
2+
23
setup(
3-
name="docker_registry_client",
4-
version="0.4",
4+
name="docker-registry-client",
5+
version="0.4.0",
56
description='Client for Docker Registry V1',
67
author='John Downs',
78
author_email='john.downs@yodle.com',
@@ -11,9 +12,15 @@
1112
'Intended Audience :: Developers',
1213
'Topic :: System :: Software Distribution',
1314
'License :: OSI Approved :: Apache Software License',
14-
'Programming Language :: Python :: 2.7'],
15+
'Programming Language :: Python :: 2',
16+
'Programming Language :: Python :: 2.7'
17+
'Programming Language :: Python :: 3',
18+
'Programming Language :: Python :: 3.5',
19+
'Programming Language :: Python :: 3.6',
20+
],
1521
keywords='docker docker-registry REST',
1622
packages=find_packages(),
17-
install_requires=['requests>=2.4.3',
18-
'flexmock'],
23+
install_requires=[
24+
'requests>=2.4.3, <3.0.0',
25+
],
1926
)

‎tests/__init__.py ‎tests/drc_test_utils/__init__.py

File renamed without changes.

‎tests/mock_registry.py ‎tests/drc_test_utils/mock_registry.py

File renamed without changes.

‎tests/test_base_client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from __future__ import absolute_import
22

33
from docker_registry_client._BaseClient import BaseClientV1, BaseClientV2
4-
from tests.mock_registry import (mock_v1_registry,
4+
from drc_test_utils.mock_registry import (mock_v1_registry,
55
mock_v2_registry,
66
TEST_NAME,
77
TEST_TAG)

‎tests/test_dockerregistryclient.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from docker_registry_client.Repository import BaseRepository
55
import pytest
66
from requests import HTTPError
7-
from tests.mock_registry import (mock_registry,
7+
from drc_test_utils.mock_registry import (mock_registry,
88
mock_v2_registry,
99
TEST_NAMESPACE,
1010
TEST_REPO,

‎tests/test_image.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from docker_registry_client.Image import Image
44
from docker_registry_client._BaseClient import BaseClientV1
5-
from tests.mock_registry import mock_v1_registry
5+
from drc_test_utils.mock_registry import mock_v1_registry
66

77

88
class TestImage(object):

‎tests/test_repository.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from docker_registry_client.Repository import Repository
44
from docker_registry_client._BaseClient import BaseClientV1, BaseClientV2
5-
from tests.mock_registry import (mock_v1_registry,
5+
from drc_test_utils.mock_registry import (mock_v1_registry,
66
mock_v2_registry,
77
TEST_NAMESPACE,
88
TEST_REPO,

‎tox.ini

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[tox]
2+
envlist = py{27,35,36}, lint
3+
4+
[testenv]
5+
commands = py.test {posargs}
6+
deps =
7+
flexmock==0.10.2
8+
pytest==3.0.5
9+
10+
[testenv:lint]
11+
deps =
12+
flake8==3.2.1
13+
commands=flake8 docker_registry_client tests setup.py
14+
15+
[flake8]
16+
ignore = E128,W293,E265,W291,W391
17+
max-line-length = 115

0 commit comments

Comments
 (0)
Please sign in to comment.