Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update codebase for Django 3 and Python 3.8 #62

Merged
merged 4 commits into from
Mar 2, 2020
Merged

Update codebase for Django 3 and Python 3.8 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa1aacc
Update codebase for Django 3 and Python 3.8
WayneLambert Feb 29, 2020
4dd561b
Update codebase for Django 3 and Python 3.8
WayneLambert Feb 29, 2020
72a13c9
Update codebase for Django 3 and Python 3.8
WayneLambert Feb 29, 2020
2598849
Update codebase for Django 3 and Python 3.8
WayneLambert Feb 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ jobs:
env: TOXENV=py36-dj20
- python: '3.6'
env: TOXENV=py36-dj21
- python: '3.6'
env: TOXENV=py36-dj30
- python: '3.7'
env: TOXENV=py37-dj111
- python: '3.7'
Expand All @@ -30,6 +32,12 @@ jobs:
env: TOXENV=py37-dj21
- python: '3.7'
env: TOXENV=py37-dj22
- python: '3.7'
env: TOXENV=py37-dj30
- python: '3.8'
env: TOXENV=py38-dj22
- python: '3.8'
env: TOXENV=py38-dj30

- python: '3.6'
env: TOXENV=lint
Expand Down
8 changes: 6 additions & 2 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
Changelog
=========
4.4.1
----------
# Add Django 3.0 and Python 3.8 support

4.4.0
----------
# Add django 2.2+ support, drop support for python 2
Expand All @@ -26,7 +30,7 @@ Changelog

4.3.5
----------
#.Remove self referal traffic
#.Remove self referral traffic

4.3.4
----------
Expand Down Expand Up @@ -91,7 +95,7 @@ Changelog

2.1.0
-----
#. Allow uip to be overriden using custom header
#. Allow uip to be overridden using custom header

2.0.3
-----
Expand Down
6 changes: 4 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def read(*parts):

setup(
name='django-google-analytics-app',
version='4.4.0',
version='4.4.1',
description=('Django Google Analytics app allowing for server side/non-js '
'tracking.'),
long_description=read('README.rst'),
Expand All @@ -23,7 +23,7 @@ def read(*parts):
url='http://github.com/praekelt/django-google-analytics',
packages=find_packages(),
install_requires=[
'Django>=2.2.5,<2.3',
'Django>=2.2.5,<3.1',
'django-celery',
'celery<4.0',
'requests',
Expand All @@ -48,7 +48,9 @@ def read(*parts):
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
],
keywords=['django', 'google', 'analytics'],
zip_safe=False,
)
3 changes: 3 additions & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
envlist =
py{35,36,37}-dj{111}
py{35,36,37}-dj{20,21}
py{35,36,37,38}-dj{22}
py{36,37,38}-dj{30,31}
lint

[testenv]
Expand All @@ -10,6 +12,7 @@ deps =
dj20: Django>=2.0,<2.1
dj21: Django>=2.1,<2.2
dj22: Django>=2.2,<2.3
dj30: Django>=3.0,<3.1
coverage
extras = test
setenv =
Expand Down