Skip to content

Commit 98d7564

Browse files
Merge branch 'master' into expect_one_of
2 parents 4a99ba9 + 73edaa7 commit 98d7564

35 files changed

+696
-229
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: pending-review
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**Runtime versions**
14+
Please run:
15+
16+
```
17+
$ python --version
18+
$ chaos info core
19+
$ chaos info extensions
20+
```
21+
22+
**To Reproduce**
23+
Steps to reproduce the behavior.
24+
25+
**Expected behavior**
26+
A clear and concise description of what you expected to happen.
27+
28+
**Additional context**
29+
Add any other context about the problem here.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: pending-review
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

.github/workflows/build.yaml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Build
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
test:
7+
runs-on: ubuntu-16.04
8+
strategy:
9+
matrix:
10+
python-version: [3.6, 3.7, 3.8]
11+
steps:
12+
- uses: actions/checkout@v2
13+
- name: Set up Python ${{ matrix.python-version }}
14+
uses: actions/setup-python@v1
15+
with:
16+
python-version: ${{ matrix.python-version }}
17+
- name: Install dependencies
18+
run: |
19+
python -m pip install --upgrade pip setuptools wheel
20+
pip install -r requirements.txt -r requirements-dev.txt
21+
- name: Checking the code syntax
22+
run: |
23+
pylama chaoslib
24+
- name: Run tests
25+
run: |
26+
pip install -e .
27+
pytest tests/
28+
29+
build:
30+
runs-on: ubuntu-16.04
31+
steps:
32+
- uses: actions/checkout@v2
33+
- name: Set up Python
34+
uses: actions/setup-python@v1
35+
with:
36+
python-version: '3.6'
37+
- name: Install dependencies
38+
run: |
39+
python -m pip install --upgrade pip setuptools wheel
40+
- name: Build the choastoolkit-lib package
41+
run : |
42+
python3 setup.py build

.github/workflows/release.yaml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Release
2+
3+
on:
4+
pull_request:
5+
branches-ignore:
6+
- 'master'
7+
push:
8+
tags:
9+
- '[0-9]+.[0-9]+.[0-9]+'
10+
- '[0-9]+.[0-9]+.[0-9]+rc[0-9]+'
11+
12+
jobs:
13+
release-to-pypi:
14+
runs-on: ubuntu-16.04
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Set up Python
18+
uses: actions/setup-python@v1
19+
with:
20+
python-version: '3.6'
21+
- name: Install dependencies
22+
run: |
23+
python -m pip install --upgrade pip
24+
pip install -U setuptools wheel twine
25+
- name: Build and publish
26+
env:
27+
TWINE_USERNAME: chaostoolkit
28+
TWINE_PASSWORD: ${{ secrets.PYPI_PWD }}
29+
run: |
30+
python3 setup.py release
31+
twine upload dist/*
32+
# push artifacts for other jobs to use
33+
- name: Upload packages as artifacts
34+
uses: actions/upload-artifact@v2-preview
35+
with:
36+
name: chaostoolkit-packages
37+
path: dist/chaostoolkit-lib-*

.travis.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 123 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,129 @@
22

33
## [Unreleased][]
44

5-
[Unreleased]: https://github.com/chaostoolkit/chaostoolkit-lib/compare/1.15.0...HEAD
5+
[Unreleased]: https://github.com/chaostoolkit/chaostoolkit-lib/compare/1.19.0...HEAD
6+
7+
## [1.19.0][] - 2021-02-16
8+
9+
[1.19.0]: https://github.com/chaostoolkit/chaostoolkit-lib/compare/1.18.3...1.19.0
10+
11+
### Changed
12+
13+
- Library now requires Python 3.6 [#208][ctk208]
14+
15+
[ctk208]: https://github.com/chaostoolkit/chaostoolkit/issues/208
16+
17+
## [1.18.3][] - 2021-02-16
18+
19+
[1.18.3]: https://github.com/chaostoolkit/chaostoolkit-lib/compare/1.18.2...1.18.3
20+
21+
### Changed
22+
23+
- Fix typo in `setup.cfg` from `install_require` to `install_requires`
24+
25+
## [1.18.2][] - 2021-02-16
26+
27+
[1.18.2]: https://github.com/chaostoolkit/chaostoolkit-lib/compare/1.18.1...1.18.2
28+
29+
### Changed
30+
31+
- Fix release workflow by updating to latest setuptools
32+
33+
## [1.18.1][] - 2021-02-16
34+
35+
[1.18.1]: https://github.com/chaostoolkit/chaostoolkit-lib/compare/1.18.0...1.18.1
36+
37+
### Changed
38+
39+
- Fix release package
40+
41+
## [1.18.0][] - 2021-02-16
42+
43+
[1.18.0]: https://github.com/chaostoolkit/chaostoolkit-lib/compare/1.17.0...1.18.0
44+
45+
### Changed
46+
47+
- Moved from setup.py to declarative setup.cfg [#204][204]
48+
- Moved to pylama from pycodestyle [#205][205]
49+
50+
[204]: https://github.com/chaostoolkit/chaostoolkit-lib/issues/204
51+
[205]: https://github.com/chaostoolkit/chaostoolkit-lib/issues/205
52+
53+
## [1.17.0][] - 2021-02-15
54+
55+
[1.17.0]: https://github.com/chaostoolkit/chaostoolkit-lib/compare/1.16.0...1.17.0
56+
57+
### Added
58+
59+
- Activities can be requested not to be executed on a per activity basis, not
60+
just as all or none. This can be used by a control to dynamically make
61+
a decision on what to run.
62+
- Test that demonstrate how to wrap controls into decorators [#197][197]
63+
64+
[197]: https://github.com/chaostoolkit/chaostoolkit-lib/issues/197
65+
66+
### Changed
67+
68+
- Moved from TravisCI to GitHub Workflows [#201][201]
69+
70+
[201]: https://github.com/chaostoolkit/chaostoolkit-lib/issues/201
71+
72+
## [1.16.0][] - 2020-12-02
73+
74+
[1.16.0]: https://github.com/chaostoolkit/chaostoolkit-lib/compare/1.15.1...1.16.0
75+
76+
### Changed
77+
78+
- Allow substitution to keep its original type when done in isolation.
79+
[#180][180] [#195][195]. So let's assume we have the following configuration:
80+
81+
```json
82+
"configuration": {
83+
"value": 8
84+
}
85+
```
86+
87+
We can now use it as an argument of an action:
88+
89+
```json
90+
"provider": {
91+
"arguments": {
92+
"quantity": "${value}"
93+
}
94+
}
95+
```
96+
97+
Now, the `quantity` argument will indeed be an integer, when it was converted
98+
to string until now. This works with any support Python objects, whether they
99+
are scalars or nested.
100+
101+
If, you have something like this however
102+
103+
104+
```json
105+
"provider": {
106+
"arguments": {
107+
"quantity": "I want ${value} apples"
108+
}
109+
}
110+
```
111+
112+
This will always remain a string.
113+
114+
115+
[180]: https://github.com/chaostoolkit/chaostoolkit-lib/issues/180
116+
[195]: https://github.com/chaostoolkit/chaostoolkit-lib/issues/195
117+
118+
## [1.15.1][] - 2020-11-02
119+
120+
[1.15.1]: https://github.com/chaostoolkit/chaostoolkit-lib/compare/1.15.0...1.15.1
121+
122+
### Changed
123+
124+
- Fixed a regression where the extra vars were not passed onto configuration
125+
and secrets for overriding substitution [#192][192]
126+
127+
[192]: https://github.com/chaostoolkit/chaostoolkit-lib/issues/192
6128

7129
### Added
8130

CODE_OF_CONDUCT.md

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# Chaos Toolkit Code Of Conduct
2+
3+
Chaos Toolkit adopts Debian project's Code Of Conduct for its
4+
participants and contributors.
5+
6+
## Be respectful
7+
8+
In the Chaos Toolkit project, inevitably there will be people with whom you
9+
may disagree, or find it difficult to cooperate. Accept that, but even
10+
so, remain respectful. Disagreement is no excuse for poor behaviour or
11+
personal attacks, and a community in which people feel threatened is
12+
not a healthy community.
13+
14+
## Assume good faith
15+
16+
Chaos Toolkit contributors have many ways of reaching our common goal
17+
of an open API for Chaos Engineering which may differ from your
18+
ways. Assume that other people are working towards this goal.
19+
20+
Note that many of our Contributors are from around the globe, not
21+
native English speakers and may have different cultural backgrounds.
22+
23+
## Be Collaborative
24+
25+
Chaos Toolkit is a large project; there is always more to learn within
26+
it. It's good to ask for help when you need it. Similarly, offers for
27+
help should be seen in the context of our shared goal of improving
28+
Chaos Toolkit.
29+
30+
When you make something for the benefit of the project, be willing to
31+
explain to others how it works, so that they can build on your work to
32+
make it even better.
33+
34+
## Try to be concise
35+
36+
Keep in mind that what you write once will be read by hundreds of
37+
people. Writing a short email means people can understand the
38+
conversation as efficiently as possible. When a long explanation is
39+
necessary, consider adding a summary.
40+
41+
Try to bring new arguments to a conversation so that each mail adds
42+
something unique to the thread, keeping in mind that the rest of the
43+
thread still contains the other messages with arguments that have
44+
already been made.
45+
46+
Try to stay on topic, especially in discussions that are already fairly large.
47+
48+
## Be open
49+
50+
Most ways of communication used within Chaos Toolkit allow for public
51+
and private communication. You should use public methods of
52+
communication for Chaos Toolkit related messages, unless posting
53+
something sensitive.
54+
55+
## In case of problems
56+
57+
While this code of conduct should be adhered to by participants, we
58+
recognize that sometimes people may have a bad day, or be unaware of
59+
some of the guidelines in this code of conduct. When that happens, you
60+
may reply to them and point out this code of conduct. Instances of
61+
otherwise unacceptable behavior may be reported by contacting team at
62+
contact@chaostoolkit.org. All complaints will be reviewed and
63+
investigated and will result in a response that is appropriate to the
64+
circumstances.
65+
66+
67+
## Attribution
68+
69+
This Code of Conduct is adapted from the [Debian Code Of Conduct][homepage], version 1.0
70+
71+
[homepage]: https://www.debian.org/code_of_conduct

MANIFEST.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ include requirements.txt
33
include requirements-dev.txt
44
include LICENSE
55
include CHANGELOG.md
6-
include pytest.ini

0 commit comments

Comments
 (0)