Skip to content

Commit 4459ca8

Browse files
authored
Merge pull request #6 from hugovk/drop-the-dot
Mostly docs updates
2 parents 96e683d + e7f8936 commit 4459ca8

File tree

8 files changed

+28
-35
lines changed

8 files changed

+28
-35
lines changed

.travis.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ install:
1515
- "TOX_ENV=${TRAVIS_PYTHON_VERSION/[0-9].[0-9]/py${TRAVIS_PYTHON_VERSION/.}}"
1616

1717

18-
branches:
19-
only:
20-
- master
21-
- develop
22-
- feature/travis
23-
24-
2518
before_success:
2619
- coverage erase
2720

CHANGELOG

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
1.5.1
77
-----
8-
* drop suport python 2.6
8+
* drop support python 2.6
99

1010
1.5
1111
---

README.rst

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ pytest-echo
44

55

66
.. image:: https://badge.fury.io/py/pytest-echo.svg
7-
:target: http://badge.fury.io/py/pytest-echo
7+
:target: https://pypi.org/project/pytest-echo/
88
:alt: PyPI package
99

1010

1111
Print environment variables, package version and generic attributes,
12-
as they are at the begining of the test.
12+
as they are at the beginning of the test.
1313

1414
Useful in the continuous integration to dump test
1515
configuration/environment and or to check if attributes are properly set
@@ -33,7 +33,7 @@ Dump environment variables
3333

3434
.. code-block:: sh
3535
36-
$ py.test --echo-env=HOME
36+
$ pytest --echo-env=HOME
3737
============================= test session starts =========================
3838
platform linux2 -- Python 2.7.4 -- py-1.4.22 -- pytest-2.6.0 -- /bin/python
3939
Environment:
@@ -46,7 +46,7 @@ Dump package version
4646

4747
.. code-block:: sh
4848
49-
$ py.test --echo-version=pytest_echo
49+
$ pytest --echo-version=pytest_echo
5050
============================= test session starts =========================
5151
platform linux2 -- Python 2.7.4 -- py-1.4.22 -- pytest-2.6.0 -- /bin/python
5252
Package version:
@@ -65,7 +65,7 @@ Dump attributes
6565

6666
.. code-block:: sh
6767
68-
$ py.test --echo-attr=django.conf.settings.DEBUG
68+
$ pytest --echo-attr=django.conf.settings.DEBUG
6969
============================= test session starts =========================
7070
platform linux2 -- Python 2.7.4 -- py-1.4.22 -- pytest-2.6.0 -- /bin/python
7171
Inspections
@@ -102,7 +102,7 @@ Example of use in a django project:
102102
103103
.. code-block:: sh
104104
105-
$ py.test
105+
$ pytest
106106
============================= test session starts =========================
107107
platform linux2 -- Python 2.7.4 -- py-1.4.22 -- pytest-2.6.0 -- /bin/python
108108
Environment:
@@ -130,7 +130,7 @@ as:
130130

131131
.. code-block:: sh
132132
133-
$ py.test --echo-version=pytest-* --echo-env=VIRTUAL*
133+
$ pytest --echo-version=pytest-* --echo-env=VIRTUAL*
134134
135135
or
136136

@@ -152,33 +152,33 @@ Links
152152
+--------------------+-----------------+---------------+----------------+
153153
| Development | |dev-build| | |dev-cov| | |dev-doc| |
154154
+--------------------+-----------------+---------------+----------------+
155-
| Project home page: | https://github.com/saxix/pytest-echo |
155+
| Project home page: | https://github.com/pytest-dev/pytest-echo |
156156
+--------------------+--------------------------------------------------+
157-
| Issue tracker: | https://github.com/saxix/pytest-echo/issues?sort |
157+
| Issue tracker: | https://github.com/pytest-dev/pytest-echo/issues |
158158
+--------------------+--------------------------------------------------+
159-
| CI: | https://travis-ci.org/saxix/pytest-echo |
159+
| CI: | https://travis-ci.org/pytest-dev/pytest-echo |
160160
+--------------------+--------------------------------------------------+
161-
| Download: | http://pypi.python.org/pypi/pytest-echo/ |
161+
| Download: | https://pypi.org/project/pytest-echo/ |
162162
+--------------------+--------------------------------------------------+
163-
| Documentation: | https://pytest-echo.readthedocs.org/en/latest/ |
163+
| Documentation: | https://pytest-echo.readthedocs.io/en/latest/ |
164164
+--------------------+--------------------------------------------------+
165165

166166

167-
.. |master-build| image:: https://secure.travis-ci.org/saxix/pytest-echo.png?branch=master
168-
:target: http://travis-ci.org/saxix/pytest-echo/
167+
.. |master-build| image:: https://travis-ci.org/pytest-dev/pytest-echo.svg?branch=master
168+
:target: https://travis-ci.org/pytest-dev/pytest-echo
169169

170-
.. |master-cov| image:: https://codecov.io/gh/saxix/pytest-echo/branch/master/graph/badge.svg
171-
:target: https://codecov.io/gh/saxix/pytest-echo
170+
.. |master-cov| image:: https://codecov.io/gh/pytest-dev/pytest-echo/branch/master/graph/badge.svg
171+
:target: https://codecov.io/gh/pytest-dev/pytest-echo
172172

173173
.. |master-doc| image:: https://readthedocs.org/projects/pytest-echo/badge/?version=stable
174-
:target: http://pytest-echo.readthedocs.io/en/stable/
174+
:target: https://pytest-echo.readthedocs.io/en/stable/
175175

176-
.. |dev-build| image:: https://secure.travis-ci.org/saxix/pytest-echo.png?branch=develop
177-
:target: http://travis-ci.org/saxix/pytest-echo/
176+
.. |dev-build| image:: https://travis-ci.org/pytest-dev/pytest-echo.svg?branch=develop
177+
:target: https://travis-ci.org/pytest-dev/pytest-echo
178178

179-
.. |dev-cov| image:: https://codecov.io/gh/saxix/pytest-echo/branch/develop/graph/badge.svg
180-
:target: https://codecov.io/gh/saxix/pytest-echo
179+
.. |dev-cov| image:: https://codecov.io/gh/pytest-dev/pytest-echo/branch/develop/graph/badge.svg
180+
:target: https://codecov.io/gh/pytest-dev/pytest-echo
181181

182182
.. |dev-doc| image:: https://readthedocs.org/projects/pytest-echo/badge/?version=latest
183-
:target: http://pytest-echo.readthedocs.io/en/latest/
183+
:target: https://pytest-echo.readthedocs.io/en/latest/
184184

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# What Python version is installed where:
2-
# http://www.appveyor.com/docs/installed-software#python
2+
# https://www.appveyor.com/docs/build-environment/#python
33

44
environment:
55
matrix:

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,4 +243,4 @@
243243

244244

245245
# Example configuration for intersphinx: refer to the Python standard library.
246-
intersphinx_mapping = {'http://docs.python.org/': None}
246+
intersphinx_mapping = {'https://docs.python.org/': None}

pytest_echo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def get_module_attribute(path):
6666
The `attribute` can be either a module attribute (ie. os.path.curdir)
6767
or a object attribute (ie. linecache.cache.__class__)
6868
69-
Warning: Be careful when use thi function as it load any module in the path
69+
Warning: Be careful when use this function as it load any module in the path
7070
and this will execute any module's level code
7171
7272
:param path: full path to the attribute

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
version=__version__,
1313
author='Stefano Apostolico',
1414
author_email='[email protected]',
15-
url='https://github.com/saxix/pytest-echo',
15+
url='https://github.com/pytest-dev/pytest-echo',
1616
py_modules=['pytest_echo'],
1717
entry_points={'pytest11': ['echo = pytest_echo']},
1818
install_requires=['pytest>=2.2'],

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ deps =
1515

1616
commands =
1717
pip install -e .
18-
coverage run -m py.test -vv test_echo.py pytest_echo.py
18+
coverage run -m pytest -vv test_echo.py pytest_echo.py
1919
coverage report
2020
coverage html
2121

0 commit comments

Comments
 (0)