Skip to content
Snippets Groups Projects
Commit 408cad71 authored by Rajmund Hruška's avatar Rajmund Hruška
Browse files

Merge branch 'devel' into 'master'

0.1.11

See merge request 709/warden/ipranges!6
parents bcd0b04a 80a06097
Branches
Tags
1 merge request!60.1.11
Pipeline #1869 passed
# 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:
......
......@@ -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"
......
......@@ -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.
......@@ -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
......
[unittest]
plugins = nose2.plugins.junitxml
......@@ -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
......@@ -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
)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment