rpms / python-django

Clone
Source Code
GIT

#9 Update to 3.0a0
Merged 4 years ago by mrunge. Opened 4 years ago by churchyard.
rpms/ churchyard/python-django 3  into  master

file modified
+1 
@@ -15,3 +15,4 @@ 
 

  /Django-2.2.3.tar.gz
 

  /Django-2.2.4.tar.gz
 

  /Django-2.2.5.tar.gz
 

+ /Django-3.0a1.tar.gz

file modified
+29 -105 
@@ -1,52 +1,44 @@ 
 

- %{?python_enable_dependency_generator}
 

- # Turn off the brp-python-bytecompile script
 

- %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 

- 

- %global         pkgname Django
 

- 

- 

- # Tests requiring Internet connections are disabled by default
 

- # pass --with internet to run them (e.g. when doing a local rebuild
 

- # for sanity checks before committing)
 

- %bcond_with internet
 

- 

  Name:           python-django
 

- 

- Version:        2.2.5
 

+ %global         pkgname Django
 

+ %global         ver 3.0
 

+ %global         pre a1
 

+ %global         real_version %{ver}%{?pre:%{pre}}
 

+ Version:        %{ver}%{?pre:~%{pre}}
 

  Release:        1%{?dist}
 

  Summary:        A high-level Python Web framework
 

  

  License:        BSD
 

- URL:            http://www.djangoproject.com/
 

- Source0:        https://files.pythonhosted.org/packages/source/D/Django/Django-%{version}.tar.gz
 

- 

+ URL:            https://www.djangoproject.com/
 

+ Source0:        %{pypi_source %{pkgname} %{real_version}}
 

  

  # skip tests requiring network connectivity
 

- Patch000: Django-2.0-skip-net-tests.patch
 

- 

+ Patch000:       Django-2.0-skip-net-tests.patch
 

  

  BuildArch:      noarch
 

  

- 

- 

- %description
 

+ %global _description %{expand:
 

  Django is a high-level Python Web framework that encourages rapid
 

  development and a clean, pragmatic design. It focuses on automating as
 

  much as possible and adhering to the DRY (Don't Repeat Yourself)
 

- principle.
 

+ principle.}
 

+ 

+ %description %_description
 

+ 

  

  %package bash-completion
 

- Summary:        bash completion files for Django
 

+ Summary:        Bash completion files for Django
 

  BuildRequires:  bash-completion
 

- 

+ Requires:       bash-completion
 

  

  %description bash-completion
 

- This package contains the bash completion files form Django high-level
 

+ This package contains the Bash completion files form Django high-level
 

  Python Web framework.
 

  

+ 

  %package -n python3-django-doc
 

  Summary:        Documentation for Django
 

- Requires:       python3-django = %{version}-%{release}
 

+ %{?python_provide:%python_provide python3-django-doc}
 

+ Suggests:       python3-django = %{version}-%{release}
 

  BuildRequires:  python3-sphinx
 

  BuildRequires:  python3-psycopg2
 

  
@@ -54,6 +46,7 @@ 
 

  This package contains the documentation for the Django high-level
 

  Python Web framework.
 

  

+ 

  %package -n python3-django
 

  Summary:        A high-level Python Web framework
 

  %{?python_provide:%python_provide python3-django}
 
@@ -64,6 +57,7 @@ 
 

  BuildRequires:  python3-bcrypt
 

  # test requirements
 

  #BuildRequires: python3-py-bcrypt
 

+ BuildRequires:  python3-asgiref >= 3
 

  BuildRequires:  python3-docutils
 

  BuildRequires:  python3-jinja2
 

  BuildRequires:  python3-mock
 
@@ -78,79 +72,10 @@ 
 

  Provides: bundled(jquery) = 2.2.3
 

  Provides: bundled(xregexp) = 2.0.0
 

  

- # /usr/bin/django-admin moved from the python2 package
 

- Conflicts:   python2-django < 2
 

- Conflicts:   python-django < 2
 

- 

- # Removed when F28 was rawhide, keep this till F30:
 

- Obsoletes:   python-django-devserver < 0.8.0-8
 

- Obsoletes:   python2-django-devserver < 0.8.0-8
 

- Obsoletes:   python-django-extra-form-fields < 0.0.1-16
 

- Obsoletes:   python2-django-extra-form-fields < 0.0.1-16
 

- Obsoletes:   python-django-profiles < 0.2-16
 

- Obsoletes:   python2-django-profiles < 0.2-16
 

- Obsoletes:   python-django-model-utils < 3.1.1-3
 

- Obsoletes:   python2-django-model-utils < 3.1.1-3
 

- Obsoletes:   python3-django-model-utils < 3.1.1-3
 

- Obsoletes:   python-django-netjsongraph < 0.2.2-5
 

- Obsoletes:   python2-django-netjsongraph < 0.2.2-5
 

- Obsoletes:   python3-django-netjsongraph < 0.2.2-5
 

- Obsoletes:   python-django-dynamite < 0.4.1-16
 

- Obsoletes:   python2-django-dynamite < 0.4.1-16
 

- Obsoletes:   python-django-flash < 1.8-18
 

- Obsoletes:   python2-django-flash < 1.8-18
 

- Obsoletes:   python-django-followit < 0.0.3-16
 

- Obsoletes:   python2-django-followit < 0.0.3-16
 

- Obsoletes:   python-django-socialregistration < 0.5.10-11
 

- Obsoletes:   python2-django-socialregistration < 0.5.10-11
 

- Obsoletes:   python-django-staticfiles < 1.2.1-13
 

- Obsoletes:   python2-django-staticfiles < 1.2.1-13
 

- Obsoletes:   python-django-sekizai-doc < 0.8.1-12
 

- Obsoletes:   python-django-sekizai < 0.8.1-12
 

- Obsoletes:   python2-django-sekizai < 0.8.1-12
 

- Obsoletes:   python3-django-sekizai-doc < 0.8.1-12
 

- Obsoletes:   python3-django-sekizai < 0.8.1-12
 

- Obsoletes:   python-django-south < 1.0.2-3
 

- Obsoletes:   python2-django-south < 1.0.2-3
 

- Obsoletes:   python3-django-south < 1.0.2-3
 

- Obsoletes:   python-django-pgjson < 0.3.1-7
 

- Obsoletes:   python2-django-pgjson < 0.3.1-7
 

- Obsoletes:   python3-django-pgjson < 0.3.1-7
 

- Obsoletes:   python-django-ckeditor < 5.3.0-4
 

- Obsoletes:   python2-django-ckeditor < 5.3.0-4
 

- Obsoletes:   python3-django-ckeditor < 5.3.0-4
 

- Obsoletes:   python-django-extensions < 1.7.3-6
 

- Obsoletes:   python2-django-extensions < 1.7.3-6
 

- Obsoletes:   python3-django-extensions < 1.7.3-6
 

- Obsoletes:   python-django-extensions-doc < 1.7.3-6
 

- Obsoletes:   python-django-helpdesk < 0.2.1-3
 

- Obsoletes:   python2-django-helpdesk < 0.2.1-3
 

- Obsoletes:   python3-django-helpdesk < 0.2.1-3
 

- Obsoletes:   python-django-openid-auth < 0.14-4
 

- Obsoletes:   python2-django-openid-auth < 0.14-4
 

- Obsoletes:   python3-django-openid-auth < 0.14-4
 

- Obsoletes:   python-django-pylibmc < 0.6.1-6
 

- Obsoletes:   python2-django-pylibmc < 0.6.1-6
 

- Obsoletes:   python3-django-pylibmc < 0.6.1-6
 

- Obsoletes:   python-django-select2 < 5.8.10-4
 

- Obsoletes:   python2-django-select2 < 5.8.10-4
 

- Obsoletes:   python3-django-select2 < 5.8.10-4
 

- Obsoletes:   python-django-setuptest < 0.2.1-6
 

- Obsoletes:   python2-django-setuptest < 0.2.1-6
 

- Obsoletes:   python3-django-setuptest < 0.2.1-6
 

- Obsoletes:   python-django-federated-login < 1.0.0-16
 

- Obsoletes:   python2-django-federated-login < 1.0.0-16
 

- Obsoletes:   python3-django-federated-login < 1.0.0-16
 

- 

- 

- %description -n python3-django
 

- Django is a high-level Python Web framework that encourages rapid
 

- development and a clean, pragmatic design. It focuses on automating as
 

- much as possible and adhering to the DRY (Don't Repeat Yourself)
 

- principle.
 

+ %description -n python3-django %_description
 

  

  %prep
 

- %autosetup -p1 -n %{pkgname}-%{version}
 

+ %autosetup -p1 -n %{pkgname}-%{real_version}
 

  

  # hard-code python3 in django-admin
 

  pushd django
 
@@ -165,10 +90,6 @@ 
 

  %install
 

  %py3_install
 

  

- # Manually invoke the python byte compile macro for each path that needs byte
 

- # compilation.
 

- %py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}
 

- 

  %find_lang django
 

  %find_lang djangojs
 

  # append djangojs.lang to django.lang
 
@@ -176,7 +97,6 @@ 
 

  

  

  # build documentation
 

- export SPHINXBUILD=sphinx-build-3
 

  (cd docs && mkdir djangohtml && mkdir -p _build/{doctrees,html} && make html)
 

  cp -ar docs ..
 

  
@@ -203,7 +123,7 @@ 
 

  find $RPM_BUILD_ROOT -name "*.po" | xargs rm -f
 

  

  %check
 

- cd %{_builddir}/%{pkgname}-%{version}
 

+ cd %{_builddir}/%{pkgname}-%{real_version}
 

  export PYTHONPATH=$(pwd)
 

  cd tests
 

  
@@ -375,7 +295,7 @@ 
 

  %{python3_sitelib}/django/conf/urls/
 

  %{python3_sitelib}/django/conf/locale/*/*.py*
 

  %{python3_sitelib}/django/conf/locale/*.py*
 

- %{python3_sitelib}/%{pkgname}-%{version}-py%{python3_version}.egg-info
 

+ %{python3_sitelib}/%{pkgname}-%{real_version}-py%{python3_version}.egg-info
 

  %{python3_sitelib}/django/__pycache__
 

  %{python3_sitelib}/django/bin/__pycache__
 

  %{python3_sitelib}/django/conf/__pycache__
 
@@ -394,6 +314,10 @@ 
 

  

  

  %changelog
 

+ * Fri Oct 04 2019 Miro Hrončok <mhroncok@redhat.com> - 3.0~a1-1
 

+ - Update to 3.0a0 (rhbz#1750709)
 

+ - https://fedoraproject.org/wiki/Changes/Django3
 

+ 

  * Thu Sep 05 2019 Matthias Runge <mrunge@redhat.com> - 2.2.5-1
 

  - bugfix release 2.2.5 (rhbz#1747876)

file modified
+1 -1 
@@ -1,1 +1,1 @@ 
 

- SHA512 (Django-2.2.5.tar.gz) = a90752d0485b6800bba7f4b1938eb2d093252ea3ea8a5592a80c5a1ba519b137bbdea2f0eed10752b3374708ecc8adacd7fb66b0a20eff6daa119a5657af2cf2
 

+ SHA512 (Django-3.0a1.tar.gz) = aab553db2d47b538e59bb494efe82eb46e4bac7f0ef21d6d1b0e6fdd9cf1cea7494173d9b802250b9def7362e6c6be34a37b234739c41401cc0e913eb1862870

Edited 4 years ago by churchyard

rebased onto 82a96b9
4 years ago

python-django-debreach, python-djangoql, python-whitenoise failed with Django 3 but not with 2.

python-django-debreach

ERROR: debreach.tests (unittest.loader._FailedTest)
----------------------------------------------------------------------
ImportError: Failed to import test module: debreach.tests
Traceback (most recent call last):
  File "/usr/lib64/python3.8/unittest/loader.py", line 436, in _find_test_path
    module = self._get_module_from_name(name)
  File "/usr/lib64/python3.8/unittest/loader.py", line 377, in _get_module_from_name
    __import__(name)
  File "/builddir/build/BUILD/django-debreach-1.5.2/debreach/tests.py", line 17, in <module>
    from debreach.context_processors import csrf
  File "/builddir/build/BUILD/django-debreach-1.5.2/debreach/context_processors.py", line 9, in <module>
    from django.utils.six import text_type
ModuleNotFoundError: No module named 'django.utils.six'

python-djangoql

+ /usr/bin/python3 test_project/manage.py test core.tests
Creating test database for alias 'default'...
Destroying test database for alias 'default'...
Traceback (most recent call last):
  File "test_project/manage.py", line 22, in <module>
    execute_from_command_line(sys.argv)
  File "/usr/lib/python3.8/site-packages/django/core/management/__init__.py", line 401, in execute_from_command_line
    utility.execute()
  File "/usr/lib/python3.8/site-packages/django/core/management/__init__.py", line 395, in execute
    self.fetch_command(subcommand).run_from_argv(self.argv)
  File "/usr/lib/python3.8/site-packages/django/core/management/commands/test.py", line 23, in run_from_argv
    super().run_from_argv(argv)
  File "/usr/lib/python3.8/site-packages/django/core/management/base.py", line 328, in run_from_argv
    self.execute(*args, **cmd_options)
  File "/usr/lib/python3.8/site-packages/django/core/management/base.py", line 369, in execute
    output = self.handle(*args, **options)
  File "/usr/lib/python3.8/site-packages/django/core/management/commands/test.py", line 53, in handle
    failures = test_runner.run_tests(test_labels)
  File "/usr/lib/python3.8/site-packages/django/test/runner.py", line 687, in run_tests
    self.run_checks()
  File "/usr/lib/python3.8/site-packages/django/test/runner.py", line 625, in run_checks
    call_command('check', verbosity=self.verbosity)
  File "/usr/lib/python3.8/site-packages/django/core/management/__init__.py", line 168, in call_command
    return command.execute(*args, **defaults)
  File "/usr/lib/python3.8/site-packages/django/core/management/base.py", line 369, in execute
    output = self.handle(*args, **options)
  File "/usr/lib/python3.8/site-packages/django/core/management/commands/check.py", line 59, in handle
    self.check(
  File "/usr/lib/python3.8/site-packages/django/core/management/base.py", line 392, in check
    all_issues = self._run_checks(
  File "/usr/lib/python3.8/site-packages/django/core/management/base.py", line 382, in _run_checks
    return checks.run_checks(**kwargs)
  File "/usr/lib/python3.8/site-packages/django/core/checks/registry.py", line 72, in run_checks
    new_errors = check(app_configs=app_configs)
  File "/usr/lib/python3.8/site-packages/django/core/checks/urls.py", line 13, in check_url_config
    return check_resolver(resolver)
  File "/usr/lib/python3.8/site-packages/django/core/checks/urls.py", line 23, in check_resolver
    return check_method()
  File "/usr/lib/python3.8/site-packages/django/urls/resolvers.py", line 406, in check
    for pattern in self.url_patterns:
  File "/usr/lib/python3.8/site-packages/django/utils/functional.py", line 48, in __get__
    res = instance.__dict__[self.name] = self.func(instance)
  File "/usr/lib/python3.8/site-packages/django/urls/resolvers.py", line 587, in url_patterns
    patterns = getattr(self.urlconf_module, "urlpatterns", self.urlconf_module)
  File "/usr/lib/python3.8/site-packages/django/utils/functional.py", line 48, in __get__
    res = instance.__dict__[self.name] = self.func(instance)
  File "/usr/lib/python3.8/site-packages/django/urls/resolvers.py", line 580, in urlconf_module
    return import_module(self.urlconf_name)
  File "/usr/lib64/python3.8/importlib/__init__.py", line 127, in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
  File "<frozen importlib._bootstrap>", line 1014, in _gcd_import
  File "<frozen importlib._bootstrap>", line 991, in _find_and_load
  File "<frozen importlib._bootstrap>", line 975, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 671, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 783, in exec_module
  File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
  File "/builddir/build/BUILD/djangoql-0.13.0/test_project/test_project/urls.py", line 20, in <module>
    from core.views import completion_demo
  File "/builddir/build/BUILD/djangoql-0.13.0/test_project/core/views.py", line 4, in <module>
    from django.shortcuts import render_to_response
ImportError: cannot import name 'render_to_response' from 'django.shortcuts' (/usr/lib/python3.8/site-packages/django/shortcuts.py)

python-whitenoise

+ python3 -m unittest discover
Traceback (most recent call last):
  File "/usr/lib64/python3.8/runpy.py", line 192, in _run_module_as_main
    return _run_code(code, main_globals, None,
  File "/usr/lib64/python3.8/runpy.py", line 85, in _run_code
    exec(code, run_globals)
  File "/usr/lib64/python3.8/unittest/__main__.py", line 18, in <module>
    main(module=None)
  File "/usr/lib64/python3.8/unittest/main.py", line 100, in __init__
    self.parseArgs(argv)
  File "/usr/lib64/python3.8/unittest/main.py", line 124, in parseArgs
    self._do_discovery(argv[2:])
  File "/usr/lib64/python3.8/unittest/main.py", line 244, in _do_discovery
    self.createTests(from_discovery=True, Loader=Loader)
  File "/usr/lib64/python3.8/unittest/main.py", line 154, in createTests
    self.test = loader.discover(self.start, self.pattern, self.top)
  File "/usr/lib64/python3.8/unittest/loader.py", line 349, in discover
    tests = list(self._find_tests(start_dir, pattern))
  File "/usr/lib64/python3.8/unittest/loader.py", line 414, in _find_tests
    yield from self._find_tests(full_path, pattern, namespace)
  File "/usr/lib64/python3.8/unittest/loader.py", line 405, in _find_tests
    tests, should_recurse = self._find_test_path(
  File "/usr/lib64/python3.8/unittest/loader.py", line 460, in _find_test_path
    return self.loadTestsFromModule(module, pattern=pattern), False
  File "/usr/lib64/python3.8/unittest/loader.py", line 123, in loadTestsFromModule
    if isinstance(obj, type) and issubclass(obj, case.TestCase):
  File "/usr/lib/python3.8/site-packages/django/utils/functional.py", line 224, in inner
    self._setup()
  File "/usr/lib/python3.8/site-packages/django/contrib/staticfiles/storage.py", line 500, in _setup
    self._wrapped = get_storage_class(settings.STATICFILES_STORAGE)()
  File "/usr/lib/python3.8/site-packages/django/contrib/staticfiles/storage.py", line 379, in __init__
    self.hashed_files = self.load_manifest()
  File "/usr/lib/python3.8/site-packages/django/contrib/staticfiles/storage.py", line 389, in load_manifest
    content = self.read_manifest()
  File "/usr/lib/python3.8/site-packages/django/contrib/staticfiles/storage.py", line 383, in read_manifest
    with self.open(self.manifest_name) as manifest:
  File "/usr/lib/python3.8/site-packages/django/core/files/storage.py", line 36, in open
    return self._open(name, mode)
  File "/usr/lib/python3.8/site-packages/django/core/files/storage.py", line 231, in _open
    return File(open(self.path(name), mode))
NotADirectoryError: [Errno 20] Not a directory: '/dev/null/staticfiles.json'

Change approved. I propose we merge this and then open bugreports for the 3 packages.
Edited 4 years ago by churchyard

Thank you @churchyard. Feel free to open up a bug for those packages. I've created an issue with the upstream.
https://github.com/ivelum/djangoql/issues/51

python-djangoql updated on rawhide to 0.13.1 with Django 3.0 support.
https://bodhi.fedoraproject.org/updates/FEDORA-2019-63f34c7fa0

Awesome, thank you all!

Let's move forward here.

Pull-Request has been merged by mrunge
4 years ago
Changes Summary 3
+1 -0
file changed
.gitignore
+29 -105
file changed
python-django.spec
+1 -1
file changed
sources
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.