package/python-django: bump to version 3.0
PATCH 1/2 package/python-django: bump to version 3.0
From: Adam Duskett <[email protected]>
Other changes:
- Select BR2_PACKAGE_PYTHON_ASGIREF as a new runtime dependency.
- Select BR2_PACKAGE_PYTHON_SQLPARSE as a new runtime dependency.
--- package/python-django/Config.in | 3 +++ package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-)
package/python-django/Config.in +3 -0
@@ -3,8 +3,11 @@ config BR2_PACKAGE_PYTHON_DJANGO depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_UNICODEDATA select BR2_PACKAGE_PYTHON3_PYEXPAT + select BR2_PACKAGE_PYTHON_ASGIREF # runtime select BR2_PACKAGE_PYTHON_PYTZ # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime + select BR2_PACKAGE_PYTHON_SQLPARSE # runtime + help Django is a high-level Python Web framework that encourages rapid development and clean, pragmatic design. It takes your
package/python-django/python-django.hash +2 -2
@@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 57d965818410a4e00e2267eef66aa9c9 Django-2.2.8.tar.gz -sha256 a4ad4f6f9c6a4b7af7e2deec8d0cbff28501852e5010d6c2dc695d3d1fae7ca0 Django-2.2.8.tar.gz +md5 bd2aebfa7c1106755544f7f217d2acde Django-3.0.tar.gz +sha256 d98c9b6e5eed147bc51f47c014ff6826bd1ab50b166956776ee13db5a58804ae Django-3.0.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE
package/python-django/python-django.mk +2 -2
@@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 2.2.8 +PYTHON_DJANGO_VERSION = 3.0 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/1c/aa/f618f346b895123be44739b276099a2b418b45b2b7afb5e1071403e8d2e9 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/f8/46/b3b8c61f867827fff2305db40659495dcd64fb35c399e75c53f23c113871 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_SETUP_TYPE = setuptools
Signature · 1 line
2.23.0
PATCH 2/2 support/testing: add python-django test
From: Adam Duskett <[email protected]>
This test comprises of four simple steps:
1: Start a new simple project called testsite.
2: Run ./manage.py migrate on the new testsite.
3: Run ./manage.py runserver 0.0.0.0:1234 & sleep 30
- The sleep 30 is necessary as it may take several seconds for the django server to fully start.
4: Run netstat to ensure the server opened port 1234.
--- .gitlab-ci.yml | 1 + .../tests/package/sample_python_django.py | 1 + .../tests/package/test_python_django.py | 35 +++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 support/testing/tests/package/sample_python_django.py create mode 100644 support/testing/tests/package/test_python_django.py
.gitlab-ci.yml +1 -0
@@ -448,6 +448,7 @@ tests.package.test_python_constantly.TestPythonPy3Constantly: { extends: .runtim tests.package.test_python_crossbar.TestPythonPy3Crossbar: { extends: .runtime_test } tests.package.test_python_cryptography.TestPythonPy2Cryptography: { extends: .runtime_test } tests.package.test_python_cryptography.TestPythonPy3Cryptography: { extends: .runtime_test } +tests.package.test_python_django.TestPythonPy3Django: { extends: .runtime_test } tests.package.test_python_incremental.TestPythonPy2Incremental: { extends: .runtime_test } tests.package.test_python_incremental.TestPythonPy3Incremental: { extends: .runtime_test } tests.package.test_python_passlib.TestPythonPy2Passlib: { extends: .runtime_test }
support/testing/tests/package/sample_python_django.py new file +1 -0
@@ -0,0 +1 @@ +import django # noqa: F401
support/testing/tests/package/test_python_django.py new file +35 -0
@@ -0,0 +1,35 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonDjango(TestPythonPackageBase): + config = TestPythonPackageBase.config + sample_scripts = ["tests/package/sample_python_django.py"] + + def run_sample_scripts(self): + cmd = "cd /opt && /usr/bin/django-admin startproject testsite" + _, exit_code = self.emulator.run(cmd, timeout=30) + self.assertEqual(exit_code, 0) + + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py migrate" + output, exit_code = self.emulator.run(cmd, timeout=30) + self.assertIn("Operations to perform:", output[0]) + self.assertEqual(exit_code, 0) + + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 & " + # give some time to setup the server + cmd += "sleep 30" + _, exit_code = self.emulator.run(cmd, timeout=35) + self.assertEqual(exit_code, 0) + + cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + +class TestPythonPy3Django(TestPythonDjango): + __test__ = True + config = TestPythonDjango.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_DJANGO=y + BR2_PACKAGE_PYTHON3_SQLITE=y + """
Signature · 1 line
2.23.0
PATCH 2/2 support/testing: add python-django test
support/testing/tests/package/test_python_django.py line 11
Quoted 4 lines · On Wed, 4 Dec 2019 12:06:29 -0800 aduskett at gmail.com wrote:
support/testing/tests/package/test_python_django.py new file +4
-0+ def run_sample_scripts(self): + cmd = "cd /opt && /usr/bin/django-admin startproject testsite" + _, exit_code = self.emulator.run(cmd, timeout=30) + self.assertEqual(exit_code, 0)
These last two lines can be simplified to:
self.assertRunOk(cmd, timeout=30)
so I used that in the 3 places where it was possible, and I've applied to master.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 2/2 support/testing: add python-django test
In reply to aduskett at gmail.comsupport/testing/tests/package/test_python_django.py line 27
Quoted 3 lines · aduskett at gmail.com
support/testing/tests/package/test_python_django.py new file +3
-0+ _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) +
flake8 complained about a missing empty line here, so I pushed a fixup commit.
Please run flake8 before submitting :-)
Regards,
Arnout
Quoted 4 lines
support/testing/tests/package/test_python_django.py new file +4
-0+class TestPythonPy3Django(TestPythonDjango): + __test__ = True + config = TestPythonDjango.config + \ + """
Thomas Petazzoni
AppliedPATCH 1/2 package/python-django: bump to version 3.0
In reply to aduskett at gmail.comQuoted 6 lines · On Wed, 4 Dec 2019 12:06:28 -0800 aduskett at gmail.com wrote:
From: Adam Duskett <[email protected]>
Other changes:
- SelectBR2_PACKAGE_PYTHON_ASGIREFas a new runtime dependency.
- SelectBR2_PACKAGE_PYTHON_SQLPARSEas a new runtime dependency.
Quoted 6 lines
Signed-off-by Adam Duskett <[email protected]>--- package/python-django/Config.in | 3 +++ package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com