Unbump the version and use PyPI release of django-composite-foreignkey

Andrey-Skvortsov · Mar 10, 2018 · da47ae0 · da47ae0
1 parent 5d7ac0e
commit da47ae0
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,7 +35,7 @@ before_install:
 - pip install codecov
 install:
 - pip install -U pip wheel setuptools
-- pip install -e git+https://github.com/onysos/django-composite-foreignkey.git@7ac6b5fa7a54ddc6f527f648d87fec87540ea00e#egg=django-composite-foreignkey-1.0.1
+- pip install django-composite-foreignkey
 - travis_retry pip install $DJANGO -e .
 script:
 - coverage run --rcfile=.coveragerc runtests.py

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,13 +1,6 @@
 Changelog
 =========
 
-Changes in 1.10.0 (2018-02-19)
------------------------------
-
-* Add support select related for transalted models with active and default languages
-* Add force_select_related_translations to QuerySet
-
-
 Changes in 1.9.2 (2018-02-12)
 -----------------------------
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -62,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.10.0'
+version = '1.9.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.10.0'
+release = '1.9.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/parler/__init__.py b/parler/__init__.py
@@ -1,5 +1,5 @@
 # following PEP 440
-__version__ = "1.10.0"
+__version__ = "1.9.2"
 
 __all__ = (
     'is_multilingual_project',

diff --git a/setup.py b/setup.py
@@ -40,7 +40,7 @@ def find_version(*parts):
 
     install_requires=[
         'Django (>=1.7)',
-        'django-composite-foreignkey (==1.0.1)',
+        'django-composite-foreignkey (>=1.0.1)',
     ],
 
     description='Simple Django model translations without nasty hacks, featuring nice admin integration.',
@@ -55,7 +55,7 @@ def find_version(*parts):
     packages=find_packages(exclude=('example*',)),
     include_package_data=True,
 
-    test_suite = 'runtests',
+    test_suite='runtests',
 
     zip_safe=False,
     classifiers=[
@@ -81,7 +81,4 @@ def find_version(*parts):
         'Topic :: Software Development :: Libraries :: Application Frameworks',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
-    dependency_links=[
-        'git+https://github.com/onysos/django-composite-foreignkey.git@7ac6b5fa7a54ddc6f527f648d87fec87540ea00e#egg=django-composite-foreignkey-1.0.1'
-    ]
 )
diff --git a/tox.ini b/tox.ini
@@ -12,7 +12,7 @@ envlist=
 [testenv]
 deps =
     django-polymorphic
-    django-composite-foreignkey: https://github.com/onysos/django-composite-foreignkey.git == 1.0.1
+    django-composite-foreignkey: >= 1.0.1
     django17: Django >= 1.7,<1.8
     django18: Django >= 1.8,<1.9
     django19: Django >= 1.9,<1.10