diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f164adf..916d5f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,20 +26,14 @@ cache: linter: stage: test - needs: [] allow_failure: true script: - tox -e linter test: stage: test - needs: [] script: - tox -e py37 - artifacts: - when: always - reports: - junit: report.xml build: stage: build @@ -67,7 +61,10 @@ release: integrate: stage: integration test script: echo test - needs: [build] + needs: + - linter + - test + - build deploy: stage: deploy diff --git a/Makefile b/Makefile index cc303f9..8fffb31 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ uninstall: pip uninstall cicflowmeter -y clean: - rm -rf *.egg-info build dist + rm -rf *.egg-info build dist report.xml build: python setup.py sdist bdist_wheel --universal diff --git a/setup.py b/setup.py index c36d1e6..999065b 100644 --- a/setup.py +++ b/setup.py @@ -14,14 +14,8 @@ AUTHOR = "Le Hieu" REQUIRES_PYTHON = ">=3.7.0" VERSION = None -# What packages are required for this module to be executed? REQUIRED = ["numpy", "scipy", "scapy"] -# What packages are optional? -EXTRAS = { - # 'fancy feature': ['django'], -} - # The rest you shouldn't have to touch too much :) # ------------------------------------------------ # Except, perhaps the License and Trove Classifiers! @@ -60,13 +54,10 @@ setup( url=URL, packages=find_packages("src"), package_dir={"cicflowmeter": "src/cicflowmeter"}, - # If your package is a single module, use this instead of 'packages': - # py_modules=['mypackage'], entry_points={ "console_scripts": ["cicflowmeter=cicflowmeter.sniffer:main"], }, install_requires=REQUIRED, - extras_require=EXTRAS, include_package_data=True, license="MIT", classifiers=[