From f0842f0534913ee9ba34ee9d42bef2760ebde9c5 Mon Sep 17 00:00:00 2001
From: Val Neekman <val@neekware.com>
Date: Wed, 8 Mar 2017 11:45:04 -0500
Subject: [PATCH 1/5] test

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 0a55552..95a39d4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
 Django>=1.8
-python-slugify>=1.2.0
+python-slugify>=1.2.1

From d1ae1e8b423b8fa73a2af4e8b476557f36221b65 Mon Sep 17 00:00:00 2001
From: slei99 <steffn@gmx.at>
Date: Wed, 4 Dec 2019 16:54:27 +0100
Subject: [PATCH 2/5] switch to six for django3 compatibility (#24)

* switch to six for django3 compatibility

* update travis matrix for django3

* fix excludes

* exclude legacy py versions for django3

* python-slugify dependency  supports 2.7 and 3.5 and above only
---
 .gitignore       |  7 +++++++
 .travis.yml      | 23 +++++++++++++++--------
 requirements.txt |  1 +
 uuslug/uuslug.py |  2 +-
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index ba74660..fcdbec5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,10 @@ docs/_build/
 
 # PyBuilder
 target/
+
+# VSCode
+/.vscode/
+
+# Pipenv
+Pipfile
+Pipfile.lock
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index a943cc4..a416c5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,7 @@ language: python
 
 python:
   - "3.5"
-  - "3.4"
-  - "3.3"
+  - "3.7"
   - "2.7"
   - pypy
 
@@ -12,6 +11,7 @@ env:
   - DJANGO="django==1.10.6"
   - DJANGO="django==1.9.12"
   - DJANGO="django==1.8.17"
+  - DJANGO="django==3.0"
 
 install:
   - pip install $DJANGO
@@ -27,12 +27,19 @@ before_script:
 
 matrix:
   exclude:
-   - python: "3.3"
-     env: DJANGO="django==1.10.6"
-   - python: "3.3"
-     env: DJANGO="django==1.9.12"
+    - python: "3.7"
+      env: DJANGO="django==1.10.6"
+    - python: "3.7"
+      env: DJANGO="django==1.9.12"
+    - python: "2.7"
+      env: DJANGO="django==3.0"
+    - python: "3.3"
+      env: DJANGO="django==3.0"
+    - python: "3.5"
+      env: DJANGO="django==3.0"
+    - python: pypy
+      env: DJANGO="django==3.0"
 
 script: coverage run --source=uuslug manage.py test
 
-after_success:
-  coveralls
+after_success: coveralls
diff --git a/requirements.txt b/requirements.txt
index 95a39d4..4728a47 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
 Django>=1.8
 python-slugify>=1.2.1
+six>=1.13.0
\ No newline at end of file
diff --git a/uuslug/uuslug.py b/uuslug/uuslug.py
index 8b331ae..215ddb3 100644
--- a/uuslug/uuslug.py
+++ b/uuslug/uuslug.py
@@ -1,6 +1,6 @@
 from django.db.models.base import ModelBase
 from slugify import slugify as pyslugify
-from django.utils import six
+import six
 if six.PY3:
     from django.utils.encoding import smart_str
 else:

From d83281ecb8f99e5fac84803ce4b049dfd5dc2910 Mon Sep 17 00:00:00 2001
From: Val Neekman <val@neekware.com>
Date: Sun, 8 Dec 2019 17:28:01 -0500
Subject: [PATCH 3/5] up version packages, remove old Django supports

---
 .travis.yml             | 22 ++++++++++------------
 CHANGELOG.md            |  6 ++++++
 pep8.sh => formatter.sh |  2 +-
 requirements_dev.txt    |  1 +
 uuslug/__init__.py      |  2 +-
 5 files changed, 19 insertions(+), 14 deletions(-)
 rename pep8.sh => formatter.sh (79%)
 create mode 100644 requirements_dev.txt

diff --git a/.travis.yml b/.travis.yml
index a416c5a..87ffaeb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,21 +3,21 @@ language: python
 
 python:
   - "3.5"
+  - "3.6"
   - "3.7"
   - "2.7"
   - pypy
 
 env:
-  - DJANGO="django==1.10.6"
-  - DJANGO="django==1.9.12"
-  - DJANGO="django==1.8.17"
   - DJANGO="django==3.0"
+  - DJANGO="django==2.2.28"
+  - DJANGO="django==1.11.26"
 
 install:
   - pip install $DJANGO
   - pip install -r requirements.txt
+  - pip install -r requirements_dev.txt
   - pip install -e .
-  - pip install pep8
   - pip install https://github.com/un33k/pyflakes/tarball/master
   - pip install coveralls
 
@@ -27,16 +27,14 @@ before_script:
 
 matrix:
   exclude:
-    - python: "3.7"
-      env: DJANGO="django==1.10.6"
-    - python: "3.7"
-      env: DJANGO="django==1.9.12"
-    - python: "2.7"
-      env: DJANGO="django==3.0"
-    - python: "3.3"
-      env: DJANGO="django==3.0"
     - python: "3.5"
       env: DJANGO="django==3.0"
+    - python: "2.7"
+      env: DJANGO="django==2.2.28"
+    - python: "2.7"
+      env: DJANGO="django==3.0"
+    - python: pypy
+      env: DJANGO="django==2.2.28"
     - python: pypy
       env: DJANGO="django==3.0"
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f071047..2eb14ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.2.0
+
+Maintenance:
+
+  - Up version python-slugify, remove support for old Django versions
+  
 ## 1.1.8
 
 Maintenance:
diff --git a/pep8.sh b/formatter.sh
similarity index 79%
rename from pep8.sh
rename to formatter.sh
index 4ace0ea..830cc1f 100755
--- a/pep8.sh
+++ b/formatter.sh
@@ -7,5 +7,5 @@
 #  -- E225 missing whitespace around operator
 #  -- E501 line too long
 
-pep8 --exclude=migrations --ignore=E128,E225,E501 .
+pycodestyle --exclude=migrations --ignore=E128,E225,E501 .
 
diff --git a/requirements_dev.txt b/requirements_dev.txt
new file mode 100644
index 0000000..6e6cead
--- /dev/null
+++ b/requirements_dev.txt
@@ -0,0 +1 @@
+pycodestyle>=2.5.0
\ No newline at end of file
diff --git a/uuslug/__init__.py b/uuslug/__init__.py
index 3db1ea3..5f4115c 100644
--- a/uuslug/__init__.py
+++ b/uuslug/__init__.py
@@ -2,6 +2,6 @@ from .uuslug import *
 
 __author__ = 'Val Neekman @ Neekware Inc. [@vneekman]'
 __description__ = 'A Python slugify application that also handles Unicode'
-__version__ = '1.1.8'
+__version__ = '1.2.0'
 
 default_app_config = 'uuslug.apps.AppConfig'

From 33f4b9aec7169955aba13bc6cde7b55a0d0652bb Mon Sep 17 00:00:00 2001
From: Val Neekman <val@neekware.com>
Date: Sun, 8 Dec 2019 17:30:12 -0500
Subject: [PATCH 4/5] fix travis config

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 87ffaeb..aca2266 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ install:
   - pip install coveralls
 
 before_script:
-  - "pep8 --exclude=migrations --ignore=E501,E225,E128 ."
+  - "pycodestyle --exclude=migrations --ignore=E501,E225,E128 ."
   - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pyflakes -x W uuslug; fi
 
 matrix:

From 454808a0f922e0695c328d0f441447de058225ae Mon Sep 17 00:00:00 2001
From: Val Neekman <val@neekware.com>
Date: Sun, 8 Dec 2019 17:32:01 -0500
Subject: [PATCH 5/5] fix django version in travis config

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aca2266..c801996 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ python:
 
 env:
   - DJANGO="django==3.0"
-  - DJANGO="django==2.2.28"
+  - DJANGO="django==2.2.8"
   - DJANGO="django==1.11.26"
 
 install:
@@ -30,11 +30,11 @@ matrix:
     - python: "3.5"
       env: DJANGO="django==3.0"
     - python: "2.7"
-      env: DJANGO="django==2.2.28"
+      env: DJANGO="django==2.2.8"
     - python: "2.7"
       env: DJANGO="django==3.0"
     - python: pypy
-      env: DJANGO="django==2.2.28"
+      env: DJANGO="django==2.2.8"
     - python: pypy
       env: DJANGO="django==3.0"