diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 701ae7894..7abaaae41 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,9 +8,7 @@ on: branches: - 'master' - '0.10-develop' - - '0.10.*' - '0.11-develop' - - '0.11.*' env: GITHUB_TOKEN: ${{ secrets.COVERALLS_TOKEN }} @@ -29,7 +27,7 @@ jobs: - 6379:6379 strategy: matrix: - python: [3.7, 3.8, 3.9, '3.10', 3.11] + python: [3.8, 3.9, '3.10', 3.11, 3.12] steps: - uses: actions/checkout@v2 - name: Install os dependencies diff --git a/.readthedocs.yml b/.readthedocs.yml index f0b68e4b6..6df0f100d 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,3 +1,13 @@ +version: 2 + +build: + os: ubuntu-22.04 + tools: + python: "3.12" +sphinx: + configuration: misc/doc/sources/conf.py +formats: + - epub python: - extra_requirements: - - renku-sphinx-theme + install: + - requirements: misc/doc/requirements.txt diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 82796d136..d2eb06727 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM python:3-alpine +FROM python:3.11-alpine MAINTAINER Jookies LTD diff --git a/docker/Dockerfile.restapi.alpine b/docker/Dockerfile.restapi.alpine index b95cb11c5..a895e62f6 100644 --- a/docker/Dockerfile.restapi.alpine +++ b/docker/Dockerfile.restapi.alpine @@ -1,4 +1,4 @@ -FROM python:3-alpine +FROM python:3.11-alpine MAINTAINER Jookies LTD diff --git a/jasmin/__init__.py b/jasmin/__init__.py index 45638c3dc..7d1c65399 100644 --- a/jasmin/__init__.py +++ b/jasmin/__init__.py @@ -6,8 +6,8 @@ import re MAJOR = 0 -MINOR = 10 -PATCH = 14 +MINOR = 11 +PATCH = 0 META = '' diff --git a/misc/doc/requirements.txt b/misc/doc/requirements.txt new file mode 100644 index 000000000..33bc8706f --- /dev/null +++ b/misc/doc/requirements.txt @@ -0,0 +1 @@ +furo~=2023.9.10 diff --git a/misc/doc/sources/conf.py b/misc/doc/sources/conf.py index 468c356ed..2fe000fc4 100644 --- a/misc/doc/sources/conf.py +++ b/misc/doc/sources/conf.py @@ -36,9 +36,9 @@ # built documents. # # The short X.Y version. -version = "0.10" +version = "0.11" # The full version, including alpha/beta/rc tags. -release = "0.10.14" +release = "0.11.0" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -79,7 +79,7 @@ # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = "renku" +html_theme = "furo" # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the diff --git a/misc/doc/sources/index.rst b/misc/doc/sources/index.rst index f80faf77c..740b910f1 100644 --- a/misc/doc/sources/index.rst +++ b/misc/doc/sources/index.rst @@ -8,13 +8,6 @@ Based on strong message routing algorithms, Jasmin provides flexibility to defin Jasmin is written in Python and Twisted framework for serving highly scalable applications, SMS message delivery can be done through HTTP and SMPP protocols, intelligent routing can be configured in real-time through an API, cli interface or a web backend [1]_. -.. figure:: https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/PoweredByDO/DO_Powered_by_Badge_blue.svg - :target: https://www.digitalocean.com/ - :alt: Powered by DigitalOcean - :align: Center - :width: 210px - :scale: 80 % - Features ******** diff --git a/misc/pylint/pylintrc b/misc/pylint/pylintrc index ca9057946..18fc7e0a2 100644 --- a/misc/pylint/pylintrc +++ b/misc/pylint/pylintrc @@ -12,7 +12,7 @@ profile=no # Add files or directories to the blacklist. They should be base names, not # paths. -ignore=.gitignore,vendor,tests,test +ignore=.gitignore,vendor,tests,test,misc,kubernetes,docker # Pickle collected data for later comparisons. persistent=no @@ -33,7 +33,7 @@ load-plugins= # can either give multiple identifier separated by comma (,) or put this option # multiple time (only on the command line, not in the configuration file where # it should appear only once). -disable=E1101,E1102,E1103,E0601,R0801,R0902,R0903,R0904,R0913,W0614,W0232,W0613,W0201,W0703,W0511,W0233,W0702,W0150,W0104,R0911,W0221,E0611,F0401 +disable=E1101,E1102,E1103,E0601,R0801,R0902,R0903,R0904,R0913,W0614,W0613,W0201,W0703,W0511,W0233,W0702,W0150,W0104,R0911,W0221,E0611,F0401 [REPORTS] diff --git a/nfpm.yaml b/nfpm.yaml index ebff23269..c26780893 100644 --- a/nfpm.yaml +++ b/nfpm.yaml @@ -1,7 +1,7 @@ name: "jasmin-sms-gateway" arch: "amd64" platform: "linux" -version: "v0.10.14" +version: "v0.11.0" section: "default" priority: "extra" maintainer: "Jookies LTD " @@ -83,7 +83,7 @@ scripts: overrides: deb: depends: - - python3 (>= 3.7) + - python3 (>= 3.8) - adduser - python3-twisted - python3-dateutil @@ -108,7 +108,7 @@ overrides: rpm: depends: - epel-release - - python3 (>= 3.7) + - python3 (>= 3.8) - python3-twisted - python3-dateutil - python3-pyparsing diff --git a/requirements-test.txt b/requirements-test.txt index 2de617ed2..fa7b30a91 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,6 +1,8 @@ testfixtures>=3.0.0 sphinx>=1.1.0 -renku-sphinx-theme pylint coverage coveralls + +# Sphinx theme +furo~=2023.9.10 diff --git a/requirements.txt b/requirements.txt index 3b4d96d27..d080436aa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,36 +1,39 @@ -pyasn1~=0.4.8 -pyOpenSSL~=19.1.0 -Twisted~=22.1.0 -# install twisted requests since they changed how that all works -treq~=22.1.0 -pyparsing~=2.4.7 -python-dateutil~=2.8.1 -service_identity~=18.1.0 +pyasn1~=0.5.0 + +# @TODO: Upgrade on dependabot issue +# https://github.com/jookies/jasmin/security/dependabot/19 +Twisted~=23.10.0 + +treq~=23.11.0 +pyparsing~=3.1.1 +python-dateutil~=2.8.2 +service_identity~=23.1.0 lockfile~=0.12.2 -falcon~=2.0.0 +falcon~=3.1.1 txredisapi~=1.4.7 tabulate~=0.8.7 -txAMQP3~=0.9.3 +txAMQP3~=0.9.4 smpp.pdu3~=0.6 -smpp.twisted3~=0.7 +smpp.twisted3~=0.8 python-messaging~=0.5.13 -# Freezinng cryptography version because of a bug in >=38.0.0 -# https://github.com/pyca/cryptography/issues/7617 -cryptography~=37.0.4 +# Upgrade to min. 41.0.5 +# https://github.com/jookies/jasmin/security/dependabot/19 +cryptography~=41.0.5 +pyopenssl~=23.3.0 # Added in 0.9rc16: -celery>=4.0.0 -redis~=3.4.1 -requests~=2.23.0 +celery~=5.3.5 +redis~=5.0.1 + +# Upgraded on dependabot issue +# https://github.com/jookies/jasmin/security/dependabot/14 +requests~=2.31.0 # For REST API python-mimeparse~=1.6.0 # For /metrics (prometheus exporter) -prometheus-client~=0.14.1 - -# Documentation theme for readthedocs -renku-sphinx-theme~=0.2.2 +prometheus-client~=0.18.0 diff --git a/setup.py b/setup.py index 9c910bd3c..3f78ce302 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ def parse_requirements(filename): setup( name="jasmin", - version='0.10.14', + version='0.11.0', author="Jookies LTD", author_email="jasmin@jookies.net", url="https://www.jasminsms.com",