Release 0.5 (python 3.9 / Django 4.0)

open-risk · Mar 1, 2022 · a4c0a2e · a4c0a2e
1 parent fff1d21
commit a4c0a2e
Show file tree

Hide file tree

Showing 35 changed files with 77 additions and 79 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,6 +3,10 @@ ChangeLog
 PLEASE NOTE THIS IS ONLY A PLANNING RELEASE.
 THE OPENNPL API IS STILL UNSTABLE
 
+v0.5 (01-03-2022)
+------------------
+* Upgrade to Python 3.9 and Django 4.0
+
 v0.4 (07-06-2021)
 -------------------
 * Functionality: Completed POST verbs for all current REST endpoints

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Open Risk (https://www.openriskmanagement.com)
+Copyright (c) 2020-2021 Open Risk (https://www.openriskmanagement.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,4 +1,3 @@
-[![Gitter](https://badges.gitter.im/open-risk/openNPL.svg)](https://gitter.im/open-risk/openNPL?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Documentation Status](https://readthedocs.org/projects/opennpl/badge/?version=latest)](https://opennpl.readthedocs.io/en/latest/?badge=latest)
 
 # openNPL overview
@@ -63,8 +62,8 @@ Manual installation from the repository source files requires some familiarity w
 
 ### Prerequisites
 - openNPL requires a working Python 3 installation (including pip)
-- Python >= 3.6
-- Django >= 3.0
+- Python >= 3.9
+- Django >= 4.0
 - The precise python library dependencies are listed in the :doc:`requirements`.txt file.
 - Note: The current User Interface (UI) is desktop oriented and might not work properly in smaller mobile screens
 - openNPL may work with earlier versions of these packages but this has not been tested
@@ -104,7 +103,7 @@ At the Docker Hub you can get a ready to run [Docker Image of openNPL](https://h
 We welcome your feedback and support, raise a github issue if you want to report a bug or request a new feature. We are glad to help.
 
 - [Contribute on Issues](<https://github.com/open-risk/openNPL/issues>)
-- Chat with the community [Gitter](<https://gitter.im/open-risk/Lobby>)
+- Chat with the community [Open Risk Commons](<https://www.openriskcommons.org/c/open-source/opennpl/13>)
 - For customisations, support or any other collaboration, email <[email protected]>
 - Need commercial support? [Contact](https://www.openriskmanagement.com/contact/)
 

diff --git a/description_short.rst b/description_short.rst
@@ -3,13 +3,13 @@ The openNPL platform
 
 **openNPL** is a Python / Django powered platform for working with detailed (*loan level*) data with a particular emphasis on capturing non-performing loan information.
 
-The source code is available in the `Open Risk Repository<https://github.com/open-risk/openNPL.git>`_.
+The source code is available in the `Open Risk Repository <https://github.com/open-risk/openNPL>`_.
 
 * Author: `Open Risk <http://www.openriskmanagement.com>`_
 * License: MIT
 * Code Documentation: `Read The Docs <https://opennpl.readthedocs.io/en/latest/>`_
 * Domain Documentation: `Open Risk Manual Loan Data <https://www.openriskmanual.org/wiki/EBA_NPL_Template>`_
 * Development Website: `Github <https://github.com/open-risk/openNPL>`_
-* Project Discussion: `Gitter <https://gitter.im/open-risk/openNPL>`_
+* Project Discussion: `Open Risk Commons <https://www.openriskcommons.org/c/open-source/opennpl/13>`_
 * Docker Image: `Docker <https://hub.docker.com/repository/docker/openrisk/opennpl_web>`_
 * Training: `Open Risk Academy <https://www.openriskacademy.com/login/index.php>`_
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -27,7 +27,7 @@
 # -- Project information -----------------------------------------------------
 
 project = 'openNPL'
-copyright = '2020 - 2021, Open Risk'
+copyright = '2020 - 2022, Open Risk'
 author = 'Open Risk'
 
 # The short X.Y version

diff --git a/docs/source/installation.rst b/docs/source/installation.rst
@@ -64,8 +64,8 @@ Dependencies / Requirements
 .. note:: A Linux based system is recommended but with minor tweaks it is in principle also possible to deploy in Windows systems
 
 - openNPL requires a working Python 3 installation (including pip)
-- Python >= 3.6
-- Django >= 3.0
+- Python >= 3.9
+- Django >= 4.0
 - The precise python library dependencies are listed in the :doc:`requirements`.txt file.
 - openNPL may work with earlier versions of these packages but this has not been tested
 - A linux based system is recommended. Some tweaks are required for Windows but is in principle also possible to deploy there

diff --git a/npl_portfolio/admin.py b/npl_portfolio/admin.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/npl_portfolio/counterparty.py b/npl_portfolio/counterparty.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/npl_portfolio/counterparty_choices.py b/npl_portfolio/counterparty_choices.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/npl_portfolio/counterparty_group.py b/npl_portfolio/counterparty_group.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/npl_portfolio/counterparty_group_choices.py b/npl_portfolio/counterparty_group_choices.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/npl_portfolio/enforcement.py b/npl_portfolio/enforcement.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/npl_portfolio/enforcement_choices.py b/npl_portfolio/enforcement_choices.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/npl_portfolio/external_collection.py b/npl_portfolio/external_collection.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/npl_portfolio/external_collection_choices.py b/npl_portfolio/external_collection_choices.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/npl_portfolio/forbearance.py b/npl_portfolio/forbearance.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/npl_portfolio/forbearance_choices.py b/npl_portfolio/forbearance_choices.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/npl_portfolio/loan.py b/npl_portfolio/loan.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/npl_portfolio/loan_choices.py b/npl_portfolio/loan_choices.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/npl_portfolio/models.py b/npl_portfolio/models.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/npl_portfolio/non_property_collateral.py b/npl_portfolio/non_property_collateral.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/npl_portfolio/non_property_collateral_choices.py b/npl_portfolio/non_property_collateral_choices.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/npl_portfolio/property_collateral.py b/npl_portfolio/property_collateral.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/npl_portfolio/property_collateral_choices.py b/npl_portfolio/property_collateral_choices.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/npl_portfolio/urls.py b/npl_portfolio/urls.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -18,31 +18,31 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from django.conf.urls import url
+from django.urls import re_path
 from openNPL import views
 
 app_name = 'npl_portfolio'
 
 urlpatterns = [
-    # url(r'^$', views.npl_api_root, name='npl_api_root'),
-    url(r'^counterparty_groups$', views.npl_counterparty_group_api, name='npl_counterparty_group_api'),
-    url(r'^counterparty_groups/(?P<pk>[0-9]+)/$', views.npl_counterparty_group_detail,
+    # re_path(r'^$', views.npl_api_root, name='npl_api_root'),
+    re_path(r'^counterparty_groups$', views.npl_counterparty_group_api, name='npl_counterparty_group_api'),
+    re_path(r'^counterparty_groups/(?P<pk>[0-9]+)/$', views.npl_counterparty_group_detail,
         name='npl_counterparty_group_detail'),
-    url(r'^counterparties$', views.npl_counterparty_api, name='npl_counterparty_api'),
-    url(r'^counterparties/(?P<pk>[0-9]+)/$', views.npl_counterparty_detail, name='npl_counterparty_detail'),
-    url(r'^property_collateral$', views.npl_property_collateral_api, name='npl_property_collateral_api'),
-    url(r'^property_collateral/(?P<pk>[0-9]+)/$', views.npl_property_collateral_detail,
+    re_path(r'^counterparties$', views.npl_counterparty_api, name='npl_counterparty_api'),
+    re_path(r'^counterparties/(?P<pk>[0-9]+)/$', views.npl_counterparty_detail, name='npl_counterparty_detail'),
+    re_path(r'^property_collateral$', views.npl_property_collateral_api, name='npl_property_collateral_api'),
+    re_path(r'^property_collateral/(?P<pk>[0-9]+)/$', views.npl_property_collateral_detail,
         name='npl_property_collateral_detail'),
-    url(r'^loans$', views.npl_loan_api, name='npl_loan_api'),
-    url(r'^loans/(?P<pk>[0-9]+)/$', views.npl_loan_detail, name='npl_loan_detail'),
-    url(r'^enforcement$', views.npl_enforcement_api, name='npl_enforcement_api'),
-    url(r'^enforcement/(?P<pk>[0-9]+)/$', views.npl_enforcement_detail, name='npl_enforcement_detail'),
-    url(r'^forbearance$', views.npl_forbearance_api, name='npl_forbearance_api'),
-    url(r'^forbearance/(?P<pk>[0-9]+)/$', views.npl_forbearance_detail, name='npl_forbearance_detail'),
-    url(r'^nonproperty_collateral$', views.npl_nonproperty_collateral_api, name='npl_nonproperty_collateral_api'),
-    url(r'^nonproperty_collateral/(?P<pk>[0-9]+)/$', views.npl_nonproperty_collateral_detail,
+    re_path(r'^loans$', views.npl_loan_api, name='npl_loan_api'),
+    re_path(r'^loans/(?P<pk>[0-9]+)/$', views.npl_loan_detail, name='npl_loan_detail'),
+    re_path(r'^enforcement$', views.npl_enforcement_api, name='npl_enforcement_api'),
+    re_path(r'^enforcement/(?P<pk>[0-9]+)/$', views.npl_enforcement_detail, name='npl_enforcement_detail'),
+    re_path(r'^forbearance$', views.npl_forbearance_api, name='npl_forbearance_api'),
+    re_path(r'^forbearance/(?P<pk>[0-9]+)/$', views.npl_forbearance_detail, name='npl_forbearance_detail'),
+    re_path(r'^nonproperty_collateral$', views.npl_nonproperty_collateral_api, name='npl_nonproperty_collateral_api'),
+    re_path(r'^nonproperty_collateral/(?P<pk>[0-9]+)/$', views.npl_nonproperty_collateral_detail,
         name='npl_nonproperty_collateral_detail'),
-    url(r'^external_collection$', views.npl_external_collection_api, name='npl_external_collection_api'),
-    url(r'^external_collection/(?P<pk>[0-9]+)/$', views.npl_external_collection_detail,
+    re_path(r'^external_collection$', views.npl_external_collection_api, name='npl_external_collection_api'),
+    re_path(r'^external_collection/(?P<pk>[0-9]+)/$', views.npl_external_collection_detail,
         name='npl_external_collection_detail'),
 ]
diff --git a/openNPL/asgi.py b/openNPL/asgi.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/openNPL/serializers.py b/openNPL/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/openNPL/settings.py b/openNPL/settings.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,6 @@
 """
 
 import os
-
 import grappelli
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -97,7 +96,6 @@
 
 WSGI_APPLICATION = 'openNPL.wsgi.application'
 
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',

diff --git a/openNPL/urls.py b/openNPL/urls.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -35,8 +35,7 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.urls import path, include
-from django.conf.urls import url
+from django.urls import path, include, re_path
 
 from . import views, settings
 
@@ -64,9 +63,9 @@
     path('', include('start.urls')),  # start URLS
     path(r'api/', views.api_root, name='api_root'),  # API root
     path(r'api/npl_data/', include(('npl_portfolio.urls', 'npl_portfolio'), namespace='npl_portfolio')),  # NPL data
-    url(r'^api/swagger(?P<format>\.json|\.yaml)$', schema_view.without_ui(cache_timeout=0), name='schema-json'),
-    url(r'^api/swagger/$', schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
-    url(r'^api/redoc/$', schema_view.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
+    re_path(r'^api/swagger(?P<format>\.json|\.yaml)$', schema_view.without_ui(cache_timeout=0), name='schema-json'),
+    re_path(r'^api/swagger/$', schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
+    re_path(r'^api/redoc/$', schema_view.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
 ]
 
 if settings.DEBUG:

diff --git a/openNPL/views.py b/openNPL/views.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/openNPL/wsgi.py b/openNPL/wsgi.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Open Risk (https://www.openriskmanagement.com)
+# Copyright (c) 2020 - 2022 Open Risk (https://www.openriskmanagement.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/requirements.txt b/requirements.txt
@@ -1,8 +1,7 @@
-Django>=3.1.9
-django-debug-toolbar>=2.2.1
-django-grappelli>=2.14.2
-djangorestframework>=3.11.2
-Sphinx>=3.1.1
-sphinx-rtd-theme>=0.5.0
-drf-yasg>=1.20.0
-
+Django
+django-debug-toolbar
+django-grappelli
+djangorestframework
+Sphinx
+sphinx-rtd-theme
+drf-yasg
diff --git a/setup.cfg b/setup.cfg
@@ -1,7 +1,7 @@
 [metadata]
 license_file = LICENSE
 name = openNPL
-version = 0.3.2
+version = 0.5
 description = Open source platform for the management of non-performing loans
 long_description = file:description_short.rst
 url = https://github.com/open-risk/openNPL
@@ -13,7 +13,7 @@ classifiers =
     License :: OSI Approved :: MIT License
     Operating System :: OS Independent
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.9
     Programming Language :: Python :: Implementation :: CPython
     Topic :: Scientific/Engineering
     Topic :: Scientific/Engineering :: Information Analysis
@@ -36,8 +36,8 @@ max-complexity = 10
 
 [options]
 include_package_data = true
-python_requires = >=3.6
+python_requires = >=3.9
 setup_requires =
     setuptools >= 38.3.0
 install_requires =
-    Django>=2.2
+    Django>=4.0