From 444c144a171574f29a382bf19dbfbb371c28f569 Mon Sep 17 00:00:00 2001 From: Michal Plichta Date: Fri, 17 Aug 2018 12:42:05 +0200 Subject: [PATCH 01/13] initial version of setup.py --- setup.py | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 setup.py diff --git a/setup.py b/setup.py new file mode 100644 index 000000000..9782e4e62 --- /dev/null +++ b/setup.py @@ -0,0 +1,76 @@ +from io import open +from os import path + +from setuptools import setup, find_packages + +here = path.abspath(path.dirname(__file__)) + +with open(path.join(here, 'README.md'), encoding='utf-8') as f: + long_description = f.read() + +setup( + name='moler', # Required + version='0.0.1', # Required + description='Moler is library to help in building automated tests', # Required + long_description=long_description, # Optional + long_description_content_type='text/markdown', # Optional (see note above) + url='https://github.com/nokia/moler', # Optional + author='Nokia', # Optional + classifiers=[ # Optional + 'Development Status :: 3 - Alpha', + + 'Environment :: Console', + + 'Intended Audience :: Developers', + 'Intended Audience :: System Administrators', + 'Intended Audience :: Telecommunications Industry', + 'Topic :: Software Development :: Build Tools', + + 'License :: OSI Approved :: BSD License', + + 'Operating System :: Microsoft :: Windows', + 'Operating System :: POSIX', + 'Operating System :: Unix', + + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + + 'Topic :: Software Development', + 'Topic :: Software Development :: Testing', + 'Topic :: System :: Networking' + ], + + keywords='testing development', # Optional + + # You can just specify package directories manually here if your project is + # simple. Or you can use find_packages(). + # + # Alternatively, if you just want to distribute a single Python file, use + # the `py_modules` argument instead as follows, which will expect a file + # called `my_module.py` to exist: + # + # py_modules=["my_module"], + # + packages=find_packages(exclude=['docs', 'tests']), # Required + + # This field lists other packages that your project depends on to run. + # Any package you put here will be installed by pip when your project is + # installed, so they must be valid existing projects. + # + # For an analysis of "install_requires" vs pip's requirements files see: + # https://packaging.python.org/en/latest/requirements.html + install_requires=['futures', + 'ptyprocess', + 'pyyaml', + 'six', + 'transitions'], # Optional + + project_urls={ # Optional + 'Bug Reports': 'https://github.com/nokia/moler/issues', + 'Source': 'https://github.com/nokia/moler', + }, +) From fdedd6c3f3dfdb90b4664ad312148d9ab0f5362f Mon Sep 17 00:00:00 2001 From: Michal Plichta Date: Fri, 17 Aug 2018 12:58:06 +0200 Subject: [PATCH 02/13] install futures only form py2.7 --- setup.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 9782e4e62..ffb37a53b 100644 --- a/setup.py +++ b/setup.py @@ -63,11 +63,12 @@ # # For an analysis of "install_requires" vs pip's requirements files see: # https://packaging.python.org/en/latest/requirements.html - install_requires=['futures', - 'ptyprocess', - 'pyyaml', - 'six', - 'transitions'], # Optional + install_requires=[ + 'futures >= 3.0.0; python_version == "2.7"', + 'ptyprocess', + 'pyyaml', + 'six', + 'transitions'], # Optional project_urls={ # Optional 'Bug Reports': 'https://github.com/nokia/moler/issues', From 8e7ea5203b8f36b1731fdc656c2ad271b9a95a94 Mon Sep 17 00:00:00 2001 From: Michal Plichta Date: Fri, 17 Aug 2018 12:59:02 +0200 Subject: [PATCH 03/13] match requirements file to setup.py --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9c18fdb34..849336f79 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -futures >= 3.0.0 ; python_version < '3.0' +futures >= 3.0.0; python_version == "2.7" ptyprocess pyyaml six From 0eb7b4b5134952735b2becf23ecdfeb075e06928 Mon Sep 17 00:00:00 2001 From: Michal Plichta Date: Fri, 17 Aug 2018 13:01:51 +0200 Subject: [PATCH 04/13] exclude some files from package --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ffb37a53b..2c1b88aba 100644 --- a/setup.py +++ b/setup.py @@ -55,7 +55,7 @@ # # py_modules=["my_module"], # - packages=find_packages(exclude=['docs', 'tests']), # Required + packages=find_packages(exclude=['docs', 'examples', 'images', 'test']), # Required # This field lists other packages that your project depends on to run. # Any package you put here will be installed by pip when your project is From ba77b1e56709469cf10c804c36f752613445884a Mon Sep 17 00:00:00 2001 From: Michal Plichta Date: Fri, 17 Aug 2018 13:07:55 +0200 Subject: [PATCH 05/13] keep requirements in only one file --- setup.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 2c1b88aba..4a9d6843a 100644 --- a/setup.py +++ b/setup.py @@ -8,6 +8,9 @@ with open(path.join(here, 'README.md'), encoding='utf-8') as f: long_description = f.read() +with open(path.join(here, 'requirements.txt'), encoding='utf-8') as f: + requires = f.read().splitlines() + setup( name='moler', # Required version='0.0.1', # Required @@ -63,12 +66,7 @@ # # For an analysis of "install_requires" vs pip's requirements files see: # https://packaging.python.org/en/latest/requirements.html - install_requires=[ - 'futures >= 3.0.0; python_version == "2.7"', - 'ptyprocess', - 'pyyaml', - 'six', - 'transitions'], # Optional + install_requires=requires, # Optional project_urls={ # Optional 'Bug Reports': 'https://github.com/nokia/moler/issues', From 244744788a503764f5767aae3f2baeb13900d122 Mon Sep 17 00:00:00 2001 From: Michal Plichta Date: Fri, 17 Aug 2018 13:12:26 +0200 Subject: [PATCH 06/13] add license field --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 4a9d6843a..5a9bf5ae9 100644 --- a/setup.py +++ b/setup.py @@ -19,6 +19,7 @@ long_description_content_type='text/markdown', # Optional (see note above) url='https://github.com/nokia/moler', # Optional author='Nokia', # Optional + license='BSD 3-Clause', classifiers=[ # Optional 'Development Status :: 3 - Alpha', From 6d38521ce84d17739ec1aa070457b80903bbb156 Mon Sep 17 00:00:00 2001 From: Michal Plichta Date: Fri, 17 Aug 2018 13:20:05 +0200 Subject: [PATCH 07/13] change imports --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 5a9bf5ae9..f50f19dae 100644 --- a/setup.py +++ b/setup.py @@ -1,14 +1,14 @@ from io import open -from os import path +from os.path import abspath, dirname, join from setuptools import setup, find_packages -here = path.abspath(path.dirname(__file__)) +here = abspath(dirname(__file__)) -with open(path.join(here, 'README.md'), encoding='utf-8') as f: +with open(join(here, 'README.md'), encoding='utf-8') as f: long_description = f.read() -with open(path.join(here, 'requirements.txt'), encoding='utf-8') as f: +with open(join(here, 'requirements.txt'), encoding='utf-8') as f: requires = f.read().splitlines() setup( From c3e7cc5b5597665e883a9acfdffe75c742acbf8b Mon Sep 17 00:00:00 2001 From: Michal Plichta Date: Wed, 3 Oct 2018 12:13:18 +0200 Subject: [PATCH 08/13] update version to 0.0.4 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f50f19dae..75811e329 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ setup( name='moler', # Required - version='0.0.1', # Required + version='0.0.4', # Required description='Moler is library to help in building automated tests', # Required long_description=long_description, # Optional long_description_content_type='text/markdown', # Optional (see note above) From bcea0fedbc05fbee2acc4189825deb7e045d0494 Mon Sep 17 00:00:00 2001 From: Michal Plichta Date: Thu, 4 Oct 2018 12:00:35 +0200 Subject: [PATCH 09/13] remove windows since is not fully supported --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 75811e329..8becccdb3 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,6 @@ 'License :: OSI Approved :: BSD License', - 'Operating System :: Microsoft :: Windows', 'Operating System :: POSIX', 'Operating System :: Unix', From b0749eb688e96c1cf1700a59c7849bd9c0afc761 Mon Sep 17 00:00:00 2001 From: Michal Plichta Date: Thu, 4 Oct 2018 12:07:29 +0200 Subject: [PATCH 10/13] improve better code external tool --- .bettercodehub.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.bettercodehub.yml b/.bettercodehub.yml index c82e788f9..fd23a518c 100644 --- a/.bettercodehub.yml +++ b/.bettercodehub.yml @@ -1,3 +1,7 @@ component_depth: 1 languages: -- python + - python +exclude: + - /Docs/ + - /examples/ + - /images/ From df75f9bb4c9b97f00efa89584d2c2edbd1c73126 Mon Sep 17 00:00:00 2001 From: Michal Plichta Date: Thu, 4 Oct 2018 15:39:00 +0200 Subject: [PATCH 11/13] tune bettercode --- .bettercodehub.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.bettercodehub.yml b/.bettercodehub.yml index fd23a518c..1cd9fd6b3 100644 --- a/.bettercodehub.yml +++ b/.bettercodehub.yml @@ -2,6 +2,6 @@ component_depth: 1 languages: - python exclude: - - /Docs/ - - /examples/ - - /images/ + - Docs/ + - examples/ + - images/ From 052fe3277f5609fcb5c8bbd5f31dc30efa70d979 Mon Sep 17 00:00:00 2001 From: Michal Plichta Date: Fri, 5 Oct 2018 12:30:30 +0200 Subject: [PATCH 12/13] change import --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 8becccdb3..4522d3c84 100644 --- a/setup.py +++ b/setup.py @@ -1,14 +1,14 @@ -from io import open +import io from os.path import abspath, dirname, join from setuptools import setup, find_packages here = abspath(dirname(__file__)) -with open(join(here, 'README.md'), encoding='utf-8') as f: +with io.open(join(here, 'README.md'), encoding='utf-8') as f: long_description = f.read() -with open(join(here, 'requirements.txt'), encoding='utf-8') as f: +with io.open(join(here, 'requirements.txt'), encoding='utf-8') as f: requires = f.read().splitlines() setup( From 38390abaec68db9256ecc4ea5194b6fb9b6f552c Mon Sep 17 00:00:00 2001 From: Michal Plichta Date: Mon, 15 Oct 2018 16:18:25 +0200 Subject: [PATCH 13/13] update version to 0.5.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4522d3c84..40b7369cd 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ setup( name='moler', # Required - version='0.0.4', # Required + version='0.5.0', # Required description='Moler is library to help in building automated tests', # Required long_description=long_description, # Optional long_description_content_type='text/markdown', # Optional (see note above)