Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • 713/warden/idea
1 result
Show changes
Commits on Source (14)
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ 3bfeeb64
# Official language image. Look for the different tagged releases at: # Official language image. Look for the different tagged releases at:
# https://hub.docker.com/r/library/python/tags/ # https://hub.docker.com/r/library/python/tags/
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/python:3.6 image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/python:latest
# Change pip's cache directory to be inside the project directory since we can # Change pip's cache directory to be inside the project directory since we can
# only cache local items. # only cache local items.
...@@ -15,7 +15,6 @@ variables: ...@@ -15,7 +15,6 @@ variables:
cache: cache:
paths: paths:
- .cache/pip - .cache/pip
- venv/
before_script: before_script:
- pip install virtualenv - pip install virtualenv
...@@ -26,14 +25,78 @@ before_script: ...@@ -26,14 +25,78 @@ before_script:
stages: # List of stages for jobs, and their order of execution stages: # List of stages for jobs, and their order of execution
- test - test
- check-warnings
- build - build
- deploy - deploy
unit-test-job: unit-test-job:
stage: test
script:
- make test 2>&1 | tee errors.log
artifacts:
when: always
paths:
- errors.log
reports:
junit: nose2-junit.xml
unit-test-2.7-job:
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/python:2.7
stage: test stage: test
script: script:
- make test - make test
unit-test-3.7-job:
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/python:3.7
stage: test
script:
- make test 2>&1 | tee errors-3.7.log
artifacts:
when: always
paths:
- errors-3.7.log
unit-test-3.8-job:
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/python:3.8
stage: test
script:
- make test 2>&1 | tee errors-3.8.log
artifacts:
when: always
paths:
- errors-3.8.log
unit-test-3.9-job:
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/python:3.9
stage: test
script:
- make test 2>&1 | tee errors-3.9.log
artifacts:
when: always
paths:
- errors-3.9.log
check-deprecation-warnings-3.7:
before_script: []
stage: check-warnings
script:
- "if [[ $(grep DeprecationWarning errors-3.7.log) ]]; then cat errors-3.7.log; exit 1; fi"
allow_failure: true
check-deprecation-warnings-3.8:
before_script: []
stage: check-warnings
script:
- "if [[ $(grep DeprecationWarning errors-3.8.log) ]]; then cat errors-3.8.log; exit 1; fi"
allow_failure: true
check-deprecation-warnings-3.9:
before_script: []
stage: check-warnings
script:
- "if [[ $(grep DeprecationWarning errors-3.9.log) ]]; then cat errors-3.9.log; exit 1; fi"
allow_failure: true
pylint-test-job: pylint-test-job:
stage: test stage: test
script: script:
...@@ -44,6 +107,13 @@ pyflakes-test-job: ...@@ -44,6 +107,13 @@ pyflakes-test-job:
script: script:
- make pyflakes - make pyflakes
check-deprecation-warnings:
before_script: []
stage: check-warnings
script:
- "if [[ $(grep DeprecationWarning errors.log) ]]; then cat errors.log; exit 1; fi"
allow_failure: true
build-job: build-job:
stage: build stage: build
script: script:
...@@ -105,4 +175,4 @@ pages: ...@@ -105,4 +175,4 @@ pages:
- public - public
only: only:
- master - master
- devel - devel
\ No newline at end of file
Makefile
View file @ 3bfeeb64
...@@ -99,7 +99,7 @@ help: ...@@ -99,7 +99,7 @@ help:
show-version: FORCE show-version: FORCE
@PYTHONPATH=lib python3 -c "import idea; print(idea.__version__);" @PYTHONPATH=lib python -c "import idea; print(idea.__version__);"
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
...@@ -109,12 +109,12 @@ deps: deps-python deps-python-dev ...@@ -109,12 +109,12 @@ deps: deps-python deps-python-dev
deps-python-dev: FORCE deps-python-dev: FORCE
@echo "\n$(GREEN)*** Installing Python development dependencies ***$(NC)\n" @echo "\n$(GREEN)*** Installing Python development dependencies ***$(NC)\n"
@pip3 install -r requirements-dev.pip @pip install --no-cache-dir -r requirements-dev.pip
deps-python: FORCE deps-python: FORCE
@echo "\n${GREEN}*** Installing Python dependencies ***${NC}\n" @echo "\n${GREEN}*** Installing Python dependencies ***${NC}\n"
@pip3 install -r requirements.pip --upgrade @pip install --no-cache-dir -r requirements.pip --upgrade
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
...@@ -138,11 +138,11 @@ pyflakes: ...@@ -138,11 +138,11 @@ pyflakes:
pyflakes-lib: FORCE pyflakes-lib: FORCE
@echo "\n${GREEN}*** Checking code with pyflakes ***${NC}\n" @echo "\n${GREEN}*** Checking code with pyflakes ***${NC}\n"
-@python3 -m pyflakes $(DIR_LIB)/*.py -@python -m pyflakes $(DIR_LIB)/*.py
pyflakes-test: FORCE pyflakes-test: FORCE
@echo "\n${GREEN}*** Checking test files with pyflakes ***${NC}\n" @echo "\n${GREEN}*** Checking test files with pyflakes ***${NC}\n"
-@python3 -m pyflakes bench_idea.py test_idea.py -@python -m pyflakes bench_idea.py test_idea.py
#pylint: pylint-lib pylint-test #pylint: pylint-lib pylint-test
pylint: pylint:
...@@ -150,15 +150,15 @@ pylint: ...@@ -150,15 +150,15 @@ pylint:
pylint-lib: FORCE pylint-lib: FORCE
@echo "\n${GREEN}*** Checking code with pylint ***${NC}\n" @echo "\n${GREEN}*** Checking code with pylint ***${NC}\n"
-@python3 -m pylint $(DIR_LIB)/*.py --rcfile .pylintrc-lib -@python -m pylint $(DIR_LIB)/*.py --rcfile .pylintrc-lib
pylint-test: FORCE pylint-test: FORCE
@echo "\n${GREEN}*** Checking test files with pylint ***${NC}\n" @echo "\n${GREEN}*** Checking test files with pylint ***${NC}\n"
-@python3 -m pylint bench_idea.py test_idea.py --rcfile .pylintrc-test -@python -m pylint bench_idea.py test_idea.py --rcfile .pylintrc-test
test: FORCE test: FORCE
@echo "\n${GREEN}*** Checking code with nosetests ***${NC}\n" @echo "\n${GREEN}*** Checking code with nosetests ***${NC}\n"
@nosetests test_idea.py @python -W always::DeprecationWarning -m nose2 --junit-xml
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
...@@ -172,11 +172,11 @@ archive: FORCE ...@@ -172,11 +172,11 @@ archive: FORCE
bdist: FORCE bdist: FORCE
@echo "\n${GREEN}*** Building Python packages ***${NC}\n" @echo "\n${GREEN}*** Building Python packages ***${NC}\n"
@python3 setup.py sdist bdist_wheel --universal @python setup.py sdist bdist_wheel --universal
install: FORCE install: FORCE
@echo "\n${GREEN}*** Performing local installation ***${NC}\n" @echo "\n${GREEN}*** Performing local installation ***${NC}\n"
@pip3 install dist/idea*.whl --upgrade @pip install dist/idea*.whl --upgrade
deploy: FORCE deploy: FORCE
@echo "\n${GREEN}*** Deploying packages to PyPI ***${NC}\n" @echo "\n${GREEN}*** Deploying packages to PyPI ***${NC}\n"
......
README.rst
View file @ 3bfeeb64
...@@ -23,3 +23,18 @@ Copyright ...@@ -23,3 +23,18 @@ Copyright
| Author: Pavel Kácha <pavel.kacha@cesnet.cz> | Author: Pavel Kácha <pavel.kacha@cesnet.cz>
| Use of this package is governed by the ISC license, see LICENSE file. | Use of this package is governed by the ISC license, see LICENSE file.
| |
Changelog
--------------------------------------------------------------------------------
Version 0.1.14
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Released 2022-06-28
- Fixed raw string in a regular expression.
- Added a config file for GitLab CI/CD.
- Updated the repository information.
- Updated packages versions.
idea/__init__.py
View file @ 3bfeeb64
...@@ -4,5 +4,5 @@ ...@@ -4,5 +4,5 @@
# Copyright (c) since 2016, CESNET, z. s. p. o. # Copyright (c) since 2016, CESNET, z. s. p. o.
# Use of this source is governed by an ISC license, see LICENSE file. # Use of this source is governed by an ISC license, see LICENSE file.
__version__ = '0.1.13' __version__ = '0.1.14'
__author__ = 'Pavel Kácha <pavel.kacha@cesnet.cz>' __author__ = 'Pavel Kácha <pavel.kacha@cesnet.cz>'
idea/base.py
View file @ 3bfeeb64
...@@ -26,7 +26,7 @@ event_tag_re = re.compile(r"^[a-zA-Z0-9_-]+(?:\.[a-zA-Z0-9_-]+)?$") ...@@ -26,7 +26,7 @@ event_tag_re = re.compile(r"^[a-zA-Z0-9_-]+(?:\.[a-zA-Z0-9_-]+)?$")
tag_re = re.compile(r"^[a-zA-Z0-9_-]+$") tag_re = re.compile(r"^[a-zA-Z0-9_-]+$")
timestamp_re = re.compile(r"^([0-9]{4})-([0-9]{2})-([0-9]{2})[Tt ]([0-9]{2}):([0-9]{2}):([0-9]{2})(?:\.([0-9]+))?([Zz]|(?:[+-][0-9]{2}:[0-9]{2}))$") timestamp_re = re.compile(r"^([0-9]{4})-([0-9]{2})-([0-9]{2})[Tt ]([0-9]{2}):([0-9]{2}):([0-9]{2})(?:\.([0-9]+))?([Zz]|(?:[+-][0-9]{2}:[0-9]{2}))$")
duration_re = re.compile("(?:([0-9]+)[Dd])?([0-9]{2}):([0-9]{2}):([0-9]{2})(?:\.([0-9]+))?$") duration_re = re.compile(r"(?:([0-9]+)[Dd])?([0-9]{2}):([0-9]{2}):([0-9]{2})(?:\.([0-9]+))?$")
def source_target_dict_typedef(flavour, list_flavour, addon=None): def source_target_dict_typedef(flavour, list_flavour, addon=None):
......
nose2.cfg 0 → 100644
View file @ 3bfeeb64
[unittest]
plugins = nose2.plugins.junitxml
requirements-dev.pip
View file @ 3bfeeb64
...@@ -4,8 +4,8 @@ setuptools ...@@ -4,8 +4,8 @@ setuptools
wheel wheel
twine twine
docutils<0.18 docutils<0.18
nose==1.3.7 nose2
pyflakes==2.1.0 pyflakes
pylint==2.2.2 pylint
sphinx==1.8.4 sphinx
sphinx-rtd-theme==0.4.2 sphinx-rtd-theme
setup.py
View file @ 3bfeeb64
...@@ -46,15 +46,16 @@ setup( ...@@ -46,15 +46,16 @@ setup(
'Programming Language :: Python', 'Programming Language :: Python',
], ],
keywords = 'library', keywords = 'library',
url = 'https://homeproj.cesnet.cz/git/idea.git', url = 'https://pypi.org/project/idea-format/',
project_urls={
'Documentation': 'https://709.gitlab-pages.cesnet.cz/warden/idea/master/html/manual.html',
'Source': 'https://gitlab.cesnet.cz/709/warden/idea',
'Tracker': 'https://gitlab.cesnet.cz/709/warden/idea/-/issues'
},
author = 'Pavel Kacha', author = 'Pavel Kacha',
author_email = 'pavel.kacha@cesnet.cz', author_email = 'pavel.kacha@cesnet.cz',
license = 'ISC', license = 'ISC',
packages = ['idea'], packages = ['idea'],
test_suite = 'nose.collector',
tests_require = [
'nose'
],
install_requires=[ install_requires=[
'ipranges', 'ipranges',
'typedcols' 'typedcols'
......