diff --git a/requirements.nix b/requirements.nix index 5700690..f0d2f26 100644 --- a/requirements.nix +++ b/requirements.nix @@ -214,17 +214,16 @@ let }; "django" = python.mkDerivation { - name = "django-2.2.9"; + name = "django-2.1.15"; src = pkgs.fetchurl { - url = "https://files.pythonhosted.org/packages/2c/0d/2aa8e58c791d2aa65658fa26f2b035a9da13a6a34d1b2d991912c8a33729/Django-2.2.9.tar.gz"; - sha256 = "662a1ff78792e3fd77f16f71b1f31149489434de4b62a74895bd5d6534e635a5"; + url = "https://files.pythonhosted.org/packages/a5/ea/a3424e68851acb44a1f8f823dc32ee3eb10b7fda474b03d527f7e666b443/Django-2.1.15.tar.gz"; + sha256 = "a794f7a2f4b7c928eecfbc4ebad03712ff27fb545abe269bf01aa8500781eb1c"; }; doCheck = commonDoCheck; format = "setuptools"; buildInputs = commonBuildInputs ++ [ ]; propagatedBuildInputs = [ self."pytz" - self."sqlparse" ]; meta = with pkgs.stdenv.lib; { homepage = "https://www.djangoproject.com/"; @@ -1062,23 +1061,6 @@ let }; }; - "sqlparse" = python.mkDerivation { - name = "sqlparse-0.3.0"; - src = pkgs.fetchurl { - url = "https://files.pythonhosted.org/packages/63/c8/229dfd2d18663b375975d953e2bdc06d0eed714f93dcb7732f39e349c438/sqlparse-0.3.0.tar.gz"; - sha256 = "7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873"; -}; - doCheck = commonDoCheck; - format = "setuptools"; - buildInputs = commonBuildInputs ++ [ ]; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://github.com/andialbrecht/sqlparse"; - license = licenses.bsdOriginal; - description = "Non-validating SQL parser"; - }; - }; - "tablib" = python.mkDerivation { name = "tablib-1.0.0"; src = pkgs.fetchurl { diff --git a/requirements.txt b/requirements.txt index 982f957..fd81d4b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ djangocms-picture>=2.3,<2.4 djangocms-bootstrap4>=1.5,<1.6 easy_thumbnails django-filer>=1.3 -Django<2.3 +Django<2.2 django-classy-tags>=0.9 django-sekizai>=1.0 django-mptt>0.9 diff --git a/requirements_frozen.txt b/requirements_frozen.txt index 5db42b6..6678e09 100644 --- a/requirements_frozen.txt +++ b/requirements_frozen.txt @@ -5,7 +5,7 @@ certifi==2019.11.28 chardet==3.0.4 cssselect==1.1.0 cssutils==1.0.2 -Django==2.2.9 +Django==2.1.15 django-absolute==0.3 django-appconf==1.0.3 django-classy-tags==1.0.0 @@ -47,7 +47,6 @@ pytz==2019.3 requests==2.22.0 setuptools-scm==3.4.3 six==1.14.0 -sqlparse==0.3.0 tablib==1.0.0 Unidecode==1.0.23 urllib3==1.25.8