diff options
| author | Joe Curtin <jcurtin@stsci.edu> | 2020-05-27 12:55:28 -0400 |
|---|---|---|
| committer | Joe Curtin <jcurtin@stsci.edu> | 2020-05-27 12:55:28 -0400 |
| commit | f1b70d453de3e8a93769252bb075b7c5a946ebd9 (patch) | |
| tree | 2d203f6a91f033be20eade34050e13314bf9f1fa /django | |
| parent | f937f8c5e138ddb18a3eaa5ce2c06b4e9e982c55 (diff) | |
| download | astroconda-etc-f1b70d453de3e8a93769252bb075b7c5a946ebd9.tar.gz | |
Updated build to include Django 2.2.12 LTS
Diffstat (limited to 'django')
| -rw-r--r-- | django/libgdal.patch | 4 | ||||
| -rw-r--r-- | django/libgeos.patch | 4 | ||||
| -rw-r--r-- | django/meta.yaml | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/django/libgdal.patch b/django/libgdal.patch index 56b6906..01c8651 100644 --- a/django/libgdal.patch +++ b/django/libgdal.patch @@ -1,5 +1,5 @@ ---- Django-2.0.orig/django/contrib/gis/gdal/libgdal.py 2017-12-02 12:36:16.000000000 -0200 -+++ Django-2.0/django/contrib/gis/gdal/libgdal.py 2017-12-06 08:14:42.730016198 -0200 +--- django/contrib/gis/gdal/libgdal.py 2017-12-02 12:36:16.000000000 -0200 ++++ django/contrib/gis/gdal/libgdal.py 2017-12-06 08:14:42.730016198 -0200 @@ -1,5 +1,6 @@ import logging import os diff --git a/django/libgeos.patch b/django/libgeos.patch index 6c8c8d6..e7bdae0 100644 --- a/django/libgeos.patch +++ b/django/libgeos.patch @@ -1,5 +1,5 @@ ---- Django-2.0.orig/django/contrib/gis/geos/libgeos.py 2017-12-02 12:36:16.000000000 -0200 -+++ Django-2.0/django/contrib/gis/geos/libgeos.py 2017-12-06 08:12:35.806014360 -0200 +--- django/contrib/gis/geos/libgeos.py 2017-12-02 12:36:16.000000000 -0200 ++++ django/contrib/gis/geos/libgeos.py 2017-12-06 08:12:35.806014360 -0200 @@ -8,8 +8,8 @@ """ import logging diff --git a/django/meta.yaml b/django/meta.yaml index 9aa227a..f415231 100644 --- a/django/meta.yaml +++ b/django/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "2.2.9" %} +{% set version = "2.2.12" %} package: name: django @@ -6,7 +6,7 @@ package: source: url: https://pypi.io/packages/source/D/Django/Django-{{ version }}.tar.gz - sha256: 662a1ff78792e3fd77f16f71b1f31149489434de4b62a74895bd5d6534e635a5 + sha256: 69897097095f336d5aeef45b4103dceae51c00afa6d3ae198a2a18e519791b7a patches: # Hard-code gdal and geos' paths to the corresponding conda packages. - libgdal.patch @@ -14,8 +14,8 @@ source: build: number: 0 - skip: True # [py2k] - script: "{{ PYTHON }} -m pip install . --no-deps -vv" + skip: true # [py2k] + script: {{ PYTHON }} -m pip install . --no-deps -vv entry_points: - django-admin = django.core.management:execute_from_command_line @@ -26,10 +26,11 @@ requirements: run: - python - pytz - - sqlparse + - sqlparse >=0.2.2 test: requires: + - pip # Test optional dependency. - psycopg2 # [not win] imports: @@ -155,7 +156,6 @@ test: - django.contrib.staticfiles - django.contrib.staticfiles.management - django.contrib.staticfiles.management.commands - - django.contrib.staticfiles.templatetags - django.contrib.syndication - django.core - django.core.checks @@ -175,7 +175,6 @@ test: - django.db.backends.dummy - django.db.backends.mysql - django.db.backends.oracle - - django.db.backends.postgresql_psycopg2 # [not win] - django.db.backends.sqlite3 - django.db.migrations - django.db.migrations.operations @@ -197,13 +196,14 @@ test: - django.views.decorators - django.views.generic commands: + - pip check - django-admin --help about: home: http://www.djangoproject.com/ - license: BSD 3-Clause + license: BSD-3-Clause license_file: LICENSE - summary: 'A high-level Python Web framework that encourages rapid development and clean, pragmatic design.' + summary: A high-level Python Web framework that encourages rapid development and clean, pragmatic design. dev_url: https://github.com/django/django doc_url: http://www.djangoproject.com/ |