Commit Graph

21 Commits (2fe9a0f2979cf85159a29d80bb791ce645c1e905)

Author SHA1 Message Date
Emmanuelle Vargas-Gonzalez 99a8f9e871 Merge branch 'master' into issue-148
# Conflicts:
#	stix2/test/test_datastore.py
#	tox.ini
2018-04-23 11:04:28 -04:00
Chris Lenk 1d22c757ef Improve Tox test harness
- No need for both pycodestyle and flake8; flake8 includes the former.
- Use the proper pytest invocation.
2018-04-11 15:40:52 -04:00
Emmanuelle Vargas-Gonzalez 4d35cc6f28 WIP: Update tox.ini 2018-04-06 14:25:06 -04:00
Greg Back a1ad90d43f
Merge pull request #150 from oasis-open/38-workbench
Create Workbench layer
2018-04-05 10:09:23 -05:00
Emmanuelle Vargas-Gonzalez c518533275 Update stix2 setup configuration
# Remove taxii2-client as a requirement to install stix2
# Add taxii2-client to the Tox configuration instead
# Re-factor the version and description loading
2018-04-02 07:51:51 -04:00
Chris Lenk 4424809225 Fix tox config (coverage was incorrectly reported) 2018-03-30 12:02:27 -04:00
Chris Lenk 5285934034 Make Workbench use implicit ObjectFactory
This is needed to implement functions like `set_default_creator`.

The changes to Tox are so that the wrapping we do in workbench doesn't
affect the rest of our tests. If we test them all in one go, pytest will
import all the tests before running any of them. This will cause the
workbench versions of the SDO classes to be used in all tests.
2018-03-30 12:02:27 -04:00
Greg Back c0669d7a5f Drop support for Python 3.3 2017-11-29 22:11:40 +00:00
Emmanuelle Vargas-Gonzalez 04450112bf Small change to tox.ini 2017-09-11 10:28:46 -04:00
Chris Lenk 42962e6675 Improve markings tests
- Test markings functions with both dictionaries and our _STIXBase-derived
  classes as input.
- Slightly improve test coverage.
- Drop Python 2.6 support.
2017-09-01 16:41:16 -04:00
clenk 5c5903179d Fix import sort order 2017-07-14 16:02:29 -04:00
clenk 229ab5d323 Fix import order 2017-06-01 17:17:03 -04:00
clenk 61c1e07433 Move codecov invocation from Tox to Travis
This avoids errors when running Tox locally.
Also display line numbers missing test coverage.
2017-06-01 17:00:22 -04:00
clenk 67935d08fe Fix isort settings, rename Observable to clarify
it's an internal class
2017-05-09 18:03:46 -04:00
clenk bdd18be6c3 Switch to isort for checking import order
because it has a pre-commit hook
2017-05-09 15:10:53 -04:00
Greg Back 85b5a1971b Merge pull request #2 from MISP/testing
Add code coverage report
2017-05-05 10:17:51 -05:00
clenk cd815bfe84 Fix import order, add flake8-import-order plugin
to Tox
2017-04-24 18:29:56 -04:00
Raphaël Vinot 83997b1135 Add code coverage report 2017-04-18 10:58:39 +02:00
Greg Back 1517eb899b Move fixtures to conftest.py 2017-04-07 15:36:42 -05:00
Greg Back 116c784d5c Add flake8 checks to tox config 2017-03-22 08:13:14 -05:00
Greg Back 3bcc327813 Add tox support. 2017-02-02 10:28:16 -06:00