Merge upstream fork (0.9.1) (#4)

* Fix pycontracts incompatibility with pyparsing v3 (closes snowplow#255)

* Update python versions in run-tests script (closes snowplow#256)

* Prepare for release

* Removing deprecation text from readme

* Removing deprecation text from readme

Co-authored-by: adatzer <ada@snowplowanalytics.com>

CHANGES.txt

@@ -1,3 +1,8 @@
+Version 0.9.1 (2021-10-26)
+--------------------------
+Update python versions in run-tests script (#256)
+Fix pycontracts incompatibility with pyparsing v3 (#255)
+
 Version 0.9.0 (2021-04-23)
 --------------------------
 Fix items default value issue in track_ecommerce_transaction (#252)

README.rst

@@ -1,5 +1,5 @@
 ======================================================
-Python Analytics for Snowplow [Deprecated]
+Python Analytics for Snowplow
 ======================================================
 .. image:: https://img.shields.io/static/v1?style=flat&label=Snowplow&message=Early%20Release&color=014477&labelColor=9ba0aa&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAeFBMVEVMaXGXANeYANeXANZbAJmXANeUANSQAM+XANeMAMpaAJhZAJeZANiXANaXANaOAM2WANVnAKWXANZ9ALtmAKVaAJmXANZaAJlXAJZdAJxaAJlZAJdbAJlbAJmQAM+UANKZANhhAJ+EAL+BAL9oAKZnAKVjAKF1ALNBd8J1AAAAKHRSTlMAa1hWXyteBTQJIEwRgUh2JjJon21wcBgNfmc+JlOBQjwezWF2l5dXzkW3/wAAAHpJREFUeNokhQOCA1EAxTL85hi7dXv/E5YPCYBq5DeN4pcqV1XbtW/xTVMIMAZE0cBHEaZhBmIQwCFofeprPUHqjmD/+7peztd62dWQRkvrQayXkn01f/gWp2CrxfjY7rcZ5V7DEMDQgmEozFpZqLUYDsNwOqbnMLwPAJEwCopZxKttAAAAAElFTkSuQmCC
     :alt: Early Release
@@ -23,9 +23,6 @@ Python Analytics for Snowplow [Deprecated]
     :alt: Monthly Downloads
     :target: https://pypi.org/project/snowplow-tracker/
 
-Deprecated
-########################
-Recommend using the original Python SDK as they recently updated the dependency issue we had.
 
 
 Update Package (Gemfury)
@@ -82,7 +79,7 @@ Assuming pyenv_ is installed
 
    host$ git clone git@github.com:snowplow/snowplow-python-tracker.git
    host$ cd snowplow-python-tracker
-   host$ pyenv install 2.7.18 && pyenv install 3.5.10 && pyenv install 3.6.13 && pyenv install 3.7.10 && pyenv install 3.8.9 && pyenv install 3.9.2
+   host$ pyenv install 2.7.18 && pyenv install 3.5.10 && pyenv install 3.6.14 && pyenv install 3.7.11 && pyenv install 3.8.11 && pyenv install 3.9.6
    host$ ./run-tests.sh deploy
    host$ ./run-tests.sh test
 

run-tests.sh

@@ -15,7 +15,7 @@ eval "$(pyenv init -)"
 eval "$(pyenv virtualenv-init -)"
 
 function deploy {
-  # pyenv install 2.7.15
+  # pyenv install 2.7.18
   if [ ! -e ~/.pyenv/versions/tracker27 ]; then
     pyenv virtualenv 2.7.18 tracker27
     pyenv activate tracker27
@@ -49,68 +49,68 @@ function deploy {
     source deactivate
   fi
 
-  # pyenv install 3.6.12
+  # pyenv install 3.6.14
   if [ ! -e ~/.pyenv/versions/tracker36 ]; then
-    pyenv virtualenv 3.6.12 tracker36
+    pyenv virtualenv 3.6.14 tracker36
     pyenv activate tracker36
     pip install .
     pip install -r requirements-test.txt
     source deactivate
   fi
 
   if [ ! -e ~/.pyenv/versions/tracker36redis ]; then
-    pyenv virtualenv 3.6.12 tracker36redis
+    pyenv virtualenv 3.6.14 tracker36redis
     pyenv activate tracker36redis
     pip install .[redis]
     pip install -r requirements-test.txt
     source deactivate
   fi
 
-  # pyenv install 3.7.9
+  # pyenv install 3.7.11
   if [ ! -e ~/.pyenv/versions/tracker37 ]; then
-    pyenv virtualenv 3.7.9 tracker37
+    pyenv virtualenv 3.7.11 tracker37
     pyenv activate tracker37
     pip install .
     pip install -r requirements-test.txt
     source deactivate
   fi
 
   if [ ! -e ~/.pyenv/versions/tracker37redis ]; then
-    pyenv virtualenv 3.7.9 tracker37redis
+    pyenv virtualenv 3.7.11 tracker37redis
     pyenv activate tracker37redis
     pip install .[redis]
     pip install -r requirements-test.txt
     source deactivate
   fi
 
-  # pyenv install 3.8.6
+  # pyenv install 3.8.11
   if [ ! -e ~/.pyenv/versions/tracker38 ]; then
-    pyenv virtualenv 3.8.6 tracker38
+    pyenv virtualenv 3.8.11 tracker38
     pyenv activate tracker38
     pip install .
     pip install -r requirements-test.txt
     source deactivate
   fi
 
   if [ ! -e ~/.pyenv/versions/tracker38redis ]; then
-    pyenv virtualenv 3.8.6 tracker38redis
+    pyenv virtualenv 3.8.11 tracker38redis
     pyenv activate tracker38redis
     pip install .[redis]
     pip install -r requirements-test.txt
     source deactivate
   fi
 
-  # pyenv install 3.9.0
+  # pyenv install 3.9.6
   if [ ! -e ~/.pyenv/versions/tracker39 ]; then
-    pyenv virtualenv 3.9.0 tracker39
+    pyenv virtualenv 3.9.6 tracker39
     pyenv activate tracker39
     pip install .
     pip install -r requirements-test.txt
     source deactivate
   fi
 
   if [ ! -e ~/.pyenv/versions/tracker39redis ]; then
-    pyenv virtualenv 3.9.0 tracker39redis
+    pyenv virtualenv 3.9.6 tracker39redis
     pyenv activate tracker39redis
     pip install .[redis]
     pip install -r requirements-test.txt

setup.py

@@ -45,7 +45,7 @@
 
 setup(
     name='snowplow-tracker',
-    version='0.9.0',
+    version='0.9.1',
     author=authors_str,
     author_email=authors_email_str,
     packages=['snowplow_tracker', 'snowplow_tracker.test', 'snowplow_tracker.redis', 'snowplow_tracker.celery'],
@@ -73,8 +73,8 @@
 
     install_requires=[
         "requests>=2.25.1,<3.0",
-        "pycontracts>=1.8.12,<2.0",
-        "decorator>=4.4,<5.0;python_version<'3.6'",
+        "pycontracts>=1.8.12;python_version<'3.0'",
+        "pycontracts3>=3.0.2;python_version>='3.0'",
         "six>=1.9.0,<2.0"
     ],
 

snowplow_tracker/_version.py

@@ -20,6 +20,6 @@
 """
 
 
-__version_info__ = (0, 9, 0)
+__version_info__ = (0, 9, 1)
 __version__ = ".".join(str(x) for x in __version_info__)
 __build_version__ = __version__ + ''