Revert 3.5 support (#123)

* Revert "allow python 3.5 minimally (#119)"

This reverts commit 6827a1c.

* Revert "Add missing classifier (#121)"

This reverts commit 75bce12.

Co-authored-by: Anton Benkevich <[email protected]>

Author: anton-b

.travis.yml

@@ -6,7 +6,7 @@ jobs:
   include:
   - stage: test
     name: 'Run python tests '
-    python: 3.5
+    python: 3.8
     install: pip install -U tox-travis
     script: tox
   - python: 3.6
@@ -15,14 +15,12 @@ jobs:
   - python: 3.7
     install: pip install -U tox-travis
     script: tox
-  - python: 3.8
-    install: pip install -U tox-travis
-    script: tox
   - python: 3.8
     install:
       - pip install ./
     script: python scripts/validate_my_definition.py -d alsdkdefs/apis/assets_query/
-  - language: sh
+  - stage: test_other_os
+    language: sh
     python: 3
     before_install:
       - choco install python3

alsdkdefs/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: future_fstrings -*-
 import os
 from os.path import join as pjoin
 import glob

requirements.txt

@@ -1,4 +1,3 @@
 jsonschema[format_nongpl]==3.2.0
 pyyaml==5.1.2
-requests>=2.18
-future_fstrings
+requests>=2.18

scripts/validate_my_definition.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: future_fstrings -*-
 
 from yaml import YAMLError
 from jsonschema.exceptions import ValidationError, RefResolutionError
@@ -9,6 +8,7 @@
 import alsdkdefs
 import os
 
+
 def validate_definition(definition_file):
     print(f"Validating {definition_file}")
     try:

scripts/validate_my_definition.sh

@@ -9,8 +9,6 @@ elif command -v python3.7; then
   PYTHON=python3.7
 elif command -v python3.6; then
   PYTHON=python3.6
-elif command -v python3.5; then
-  PYTHON=python3.5
 elif command -v python3; then
   PYTHON=python3
 else

setup.py

@@ -3,7 +3,7 @@
 with open('README.md') as readme_file:
     readme = readme_file.read()
 
-requirements = ['jsonschema[format_nongpl]==3.2.0', 'pyyaml==5.1.2', 'requests>=2.18', 'future_fstrings']
+requirements = ['jsonschema[format_nongpl]==3.2.0', 'pyyaml==5.1.2', 'requests>=2.18']
 
 setup(
     name='alertlogic-sdk-definitions',
@@ -13,13 +13,12 @@
     license='MIT license',
     author='Alert Logic Inc.',
     author_email='[email protected]',
-    python_requires='>=3.5',
+    python_requires='>=3.6',
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8'
@@ -28,6 +27,8 @@
     long_description=readme,
     long_description_content_type='text/markdown',
     scripts=[],
+    # yeah yeah i know, circular dependency, but we need it for test now, later i'll think how to decouple
+    # definitions parsing/loading and client
     tests_require=requirements,
     packages=find_packages(exclude=['contrib', 'docs', 'tests*', 'troubleshooting']),
     include_package_data=True,

tests/test_apis_validate.py

@@ -1,10 +1,10 @@
 #!/usr/bin/env python
-# -*- coding: future_fstrings -*-
 """Tests for `alertlogic-sdk-definitions` package."""
 
 import unittest
 import alsdkdefs
 
+
 class TestServiceDefs(unittest.TestCase):
     def setUp(self):
         """Setup"""

tox.ini

@@ -6,14 +6,12 @@ python =
     3.8: py38
     3.7: py37
     3.6: py36
-    3.5: py35
 
 [testenv]
 deps =
     requests
     PyYaml
     jsonschema
-    future_fstrings
 setenv =
     PYTHONPATH = {toxinidir}