diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1723d7772df9d8b0ad5fe6c0551619aebb38da5..aa5552e707101636495e7dc7d23727def1c22a44 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
# Official language image. Look for the different tagged releases at:
# 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
# only cache local items.
@@ -15,7 +15,6 @@ variables:
cache:
paths:
- .cache/pip
- - venv/
before_script:
- pip install virtualenv
@@ -26,14 +25,57 @@ before_script:
stages: # List of stages for jobs, and their order of execution
- test
+ - check-warnings
- build
- deploy
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
script:
- 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
+
pylint-test-job:
stage: test
script:
@@ -44,6 +86,34 @@ pyflakes-test-job:
script:
- 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
+
+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
+
build-job:
stage: build
script:
@@ -105,4 +175,4 @@ pages:
- public
only:
- master
- - devel
\ No newline at end of file
+ - devel
diff --git a/Makefile b/Makefile
index 7c909961b76bd9050c869d6bc6ba1127722a37e0..d248c5ef0ba7e5d67a5475368c1556d55648a307 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ help:
show-version: FORCE
- @PYTHONPATH=lib python3 -c "import ipranges; print(ipranges.__version__);"
+ @PYTHONPATH=lib python -c "import ipranges; print(ipranges.__version__);"
#-------------------------------------------------------------------------------
@@ -108,13 +108,13 @@ deps: deps-python deps-python-dev
deps-python-dev: FORCE
@echo "\n$(GREEN)*** Installing Python development dependencies ***$(NC)\n"
- @pip3 --version
- @pip3 install -r requirements-dev.pip
+ @pip --version
+ @pip install -r requirements-dev.pip
deps-python: FORCE
@echo "\n${GREEN}*** Installing Python dependencies ***${NC}\n"
@echo "\nThis project does not have any dependencies, nothing to do here...\n"
- @#pip3 install -r requirements.pip --upgrade
+ @#pip install -r requirements.pip --upgrade
#-------------------------------------------------------------------------------
@@ -138,11 +138,11 @@ pyflakes:
pyflakes-lib: FORCE
@echo "\n${GREEN}*** Checking code with pyflakes ***${NC}\n"
- -@python3 -m pyflakes ipranges.py
+ -@python -m pyflakes ipranges.py
pyflakes-test: FORCE
@echo "\n${GREEN}*** Checking test files with pyflakes ***${NC}\n"
- -@python3 -m pyflakes test_ipranges.py
+ -@python -m pyflakes test_ipranges.py
#pylint: pylint-lib pylint-test
pylint:
@@ -150,15 +150,15 @@ pylint:
pylint-lib: FORCE
@echo "\n${GREEN}*** Checking code with pylint ***${NC}\n"
- -@python3 -m pylint ipranges.py --rcfile .pylintrc-lib
+ -@python -m pylint ipranges.py --rcfile .pylintrc-lib
pylint-test: FORCE
@echo "\n${GREEN}*** Checking test files with pylint ***${NC}\n"
- -@python3 -m pylint test_ipranges.py --rcfile .pylintrc-test
+ -@python -m pylint test_ipranges.py --rcfile .pylintrc-test
test: FORCE
@echo "\n${GREEN}*** Checking code with nosetests ***${NC}\n"
- @nosetests test_ipranges.py
+ @python -W always::DeprecationWarning -m nose2 --junit-xml
#-------------------------------------------------------------------------------
@@ -172,11 +172,11 @@ archive: FORCE
bdist: FORCE
@echo "\n${GREEN}*** Building Python packages ***${NC}\n"
- @python3 setup.py sdist bdist_wheel --universal
+ @python setup.py sdist bdist_wheel --universal
install: FORCE
@echo "\n${GREEN}*** Performing local installation ***${NC}\n"
- @pip3 install dist/ipranges*.whl --upgrade
+ @pip install dist/ipranges*.whl --upgrade
deploy: FORCE
@echo "\n${GREEN}*** Deploying packages to PyPI ***${NC}\n"
diff --git a/README.rst b/README.rst
index c90044609c3576289d6ce3e29d2471a908d7feb7..bfae84ae1052d6b22d6e5d132bd4b9971446469c 100644
--- a/README.rst
+++ b/README.rst
@@ -23,3 +23,19 @@ Copyright
| Author: Pavel Kácha <pavel.kacha@cesnet.cz>
| Use of this package is governed by the ISC license, see LICENSE file.
|
+
+
+
+
+Changelog
+--------------------------------------------------------------------------------
+
+
+Version 0.1.11
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Released 2022-06-27
+
+- Added a config file for GitLab CI/CD.
+- Updated the repository information.
+- Updated packages versions.
diff --git a/ipranges.py b/ipranges.py
index bda70af326380ffdfd094223de49d580f75be864..4b341d78234e466e06f3659f0a5b611a8d7befa2 100644
--- a/ipranges.py
+++ b/ipranges.py
@@ -4,7 +4,7 @@
# Copyright (c) 2016, CESNET, z. s. p. o.
# Use of this source is governed by an ISC license, see LICENSE file.
-__version__ = '0.1.10'
+__version__ = '0.1.11'
__author__ = 'Pavel Kácha <pavel.kacha@cesnet.cz>'
import socket
diff --git a/nose2.cfg b/nose2.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..a7850f000fd8fb9a4b96d43d4bb81e8122cdc388
--- /dev/null
+++ b/nose2.cfg
@@ -0,0 +1,2 @@
+[unittest]
+plugins = nose2.plugins.junitxml
diff --git a/requirements-dev.pip b/requirements-dev.pip
index e92d9cb3c7fc873c0b1fe2936e839410bac9f1ed..67caa2415dccb8ca41123a036f0e606d547b4c1d 100644
--- a/requirements-dev.pip
+++ b/requirements-dev.pip
@@ -2,8 +2,8 @@ setuptools
wheel
twine
docutils<0.18
-nose==1.3.7
-pyflakes==2.1.0
-pylint==2.2.2
-sphinx==1.8.4
-sphinx-rtd-theme==0.4.2
+nose2
+pyflakes
+pylint
+sphinx
+sphinx-rtd-theme
diff --git a/setup.py b/setup.py
index c85243e0c900ebdf9117c33dc3e6518e3633f088..2b4564aeafd43cec48f9f1a3dd198307b769fcd7 100644
--- a/setup.py
+++ b/setup.py
@@ -46,14 +46,15 @@ setup(
'Programming Language :: Python',
],
keywords = 'library',
- url = 'https://homeproj.cesnet.cz/git/ipranges.git',
+ url = 'https://pypi.org/project/ipranges/',
+ project_urls={
+ 'Documentation': 'https://709.gitlab-pages.cesnet.cz/warden/ipranges/master/html/manual.html',
+ 'Source': 'https://gitlab.cesnet.cz/709/warden/ipranges',
+ 'Tracker': 'https://gitlab.cesnet.cz/709/warden/ipranges/-/issues'
+ },
author = 'Pavel Kacha',
author_email = 'pavel.kacha@cesnet.cz',
license = 'ISC',
py_modules = ['ipranges'],
- test_suite = 'nose.collector',
- tests_require = [
- 'nose'
- ],
zip_safe = True
)