Skip to content

Commit 7e2f921

Browse files
authored
Merge pull request #868 from moreati/cleanup
Bump version, streamline output from tests, misc cleanups
2 parents 680fa81 + e76eefb commit 7e2f921

16 files changed

+34
-27
lines changed

.ci/ansible_install.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44

55
batches = [
66
[
7-
# Must be installed separately, as PyNACL indirect requirement causes
8-
# newer version to be installed if done in a single pip run.
9-
# Separately install ansible based on version passed in from azure-pipelines.yml or .travis.yml
10-
'pip install "pycparser<2.19" "idna<2.7"',
117
'pip install '
128
'-r tests/requirements.txt '
139
'-r tests/ansible/requirements.txt',

.ci/ansible_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def pause_if_interactive():
7070
with ci_lib.Fold('ansible'):
7171
playbook = os.environ.get('PLAYBOOK', 'all.yml')
7272
try:
73-
run('./run_ansible_playbook.py %s -i "%s" -vvv %s',
73+
run('./run_ansible_playbook.py %s -i "%s" %s',
7474
playbook, HOSTS_DIR, ' '.join(sys.argv[1:]))
7575
except:
7676
pause_if_interactive()

.ci/azure-pipelines.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
# Add steps that analyze code, save the dist with the build record, publish to a PyPI-compatible index, and more:
44
# https://docs.microsoft.com/azure/devops/pipelines/languages/python
55

6+
# User defined variables are also injected as environment variables
7+
# https://docs.microsoft.com/en-us/azure/devops/pipelines/process/variables#environment-variables
8+
#variables:
9+
#ANSIBLE_VERBOSITY: 3
10+
611
jobs:
712

813
- job: Mac

.ci/ci_lib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def get_output(s, *args, **kwargs):
167167

168168
def exists_in_path(progname):
169169
"""
170-
Return True if proganme exists in $PATH.
170+
Return True if progname exists in $PATH.
171171
172172
>>> exists_in_path('echo')
173173
True

.ci/debops_common_install.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77

88
ci_lib.run_batches([
99
[
10-
# Must be installed separately, as PyNACL indirect requirement causes
11-
# newer version to be installed if done in a single pip run.
12-
'pip install "pycparser<2.19"',
1310
'pip install -qqq "debops[ansible]==2.1.2" "ansible-base<2.10.14" "ansible=={}"'.format(ci_lib.ANSIBLE_VERSION),
1411
],
1512
[

.ci/localhost_ansible_install.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44

55
batches = [
66
[
7-
# Must be installed separately, as PyNACL indirect requirement causes
8-
# newer version to be installed if done in a single pip run.
9-
# Separately install ansible based on version passed in from azure-pipelines.yml or .travis.yml
10-
# Don't set -U as that will upgrade Paramiko to a non-2.6 compatible version.
11-
'pip install "pycparser<2.19" "idna<2.7" virtualenv',
127
'pip install '
138
'-r tests/requirements.txt '
149
'-r tests/ansible/requirements.txt',

.ci/localhost_ansible_tests.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@
4646

4747
if os.path.expanduser('~mitogen__user1') == '~mitogen__user1':
4848
os.chdir(IMAGE_PREP_DIR)
49-
run("ansible-playbook -c local -i localhost, _user_accounts.yml -vvv")
49+
run("ansible-playbook -c local -i localhost, _user_accounts.yml")
5050

5151

5252
with ci_lib.Fold('ansible'):
5353
os.chdir(TESTS_DIR)
5454
playbook = os.environ.get('PLAYBOOK', 'all.yml')
55-
run('./run_ansible_playbook.py %s -l target %s -vvv',
55+
run('./run_ansible_playbook.py %s -l target %s',
5656
playbook, ' '.join(sys.argv[1:]))

.ci/mitogen_install.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
batches = [
66
[
7-
'pip install "pycparser<2.19" "idna<2.7"',
87
'pip install -r tests/requirements.txt',
98
]
109
]

docs/changelog.rst

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,13 @@ Release Notes
1717
To avail of fixes in an unreleased version, please download a ZIP file
1818
`directly from GitHub <https://github.com/dw/mitogen/>`_.
1919

20-
v0.3.0 (unreleased)
21-
--------------------
20+
21+
v0.3.1.dev0 (unreleased)
22+
------------------------
23+
24+
25+
v0.3.0 (2021-11-24)
26+
-------------------
2227

2328
This release separates itself from the v0.2.X releases. Ansible's API changed too much to support backwards compatibility so from now on, v0.2.X releases will be for Ansible < 2.10 and v0.3.X will be for Ansible 2.10+.
2429
`See here for details <https://github.com/dw/mitogen pull/715#issuecomment-750697248>`_.
@@ -30,7 +35,7 @@ This release separates itself from the v0.2.X releases. Ansible's API changed to
3035
* :gh:issue:`847` Removed historic Continuous Integration reverse shell
3136

3237

33-
v0.2.10 (unreleased)
38+
v0.2.10 (2021-11-24)
3439
--------------------
3540

3641
* :gh:issue:`597` mitogen does not support Ansible 2.8 Python interpreter detection

docs/howitworks.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ executes under the runtime importer lock, ensuring :py:keyword:`import`
813813
statements executing in local threads are serialized.
814814

815815
.. note::
816-
816+
817817
In Python 2, :py:exc:`ImportError` is raised when :py:keyword:`import` is
818818
attempted while the runtime import lock is held by another thread,
819819
therefore imports must be serialized by only attempting them from the main

0 commit comments

Comments
 (0)