From ac3276fccdbef320bc9e0bcb059b5e62e8a0f6bc Mon Sep 17 00:00:00 2001 From: Carl Wilson Date: Fri, 22 Nov 2019 15:01:34 +0000 Subject: [PATCH] RC - Release candidate 1.4.0rc1 - moved to semantic versioning, e.g. `major`.`minor`.`patch`; - added `rc1` suffix for release candidate; - added `extras_require` entry to `setup.py`; and - deleted redundant `sonar-project.properties`. The `extras_require` entry allows `testing` and `setup` packges to be installed, for example `pip install -e .[testing]` will install fido with its `tests_require` packages also. `pip install -e .[setup]` installs the `setup_requires` packages. `pip install -e .[testing,setup]` works as you'd hope :). --- fido/__init__.py | 2 +- setup.py | 5 +++++ sonar-project.properties | 6 ------ 3 files changed, 6 insertions(+), 7 deletions(-) mode change 100644 => 100755 setup.py delete mode 100644 sonar-project.properties diff --git a/fido/__init__.py b/fido/__init__.py index 64806cb7..5dce2057 100644 --- a/fido/__init__.py +++ b/fido/__init__.py @@ -14,7 +14,7 @@ from six.moves import input as rinput -__version__ = '1.4' +__version__ = '1.4.0rc1' CONFIG_DIR = join(abspath(dirname(__file__)), 'conf') diff --git a/setup.py b/setup.py old mode 100644 new mode 100755 index 06734e2a..bb35d23f --- a/setup.py +++ b/setup.py @@ -41,6 +41,10 @@ def find_version(*file_paths): 'pytest', ] +EXTRAS = { + 'testing': tests_require, + 'setup': setup_requires, +} setup( name='opf-fido', @@ -53,6 +57,7 @@ def find_version(*file_paths): install_requires=install_requires, setup_requires=setup_requires, tests_require=tests_require, + extras_require=EXTRAS, packages=['fido'], package_data={'fido': ['*.*', 'conf/*.*']}, entry_points={'console_scripts': [ diff --git a/sonar-project.properties b/sonar-project.properties deleted file mode 100644 index 858343b6..00000000 --- a/sonar-project.properties +++ /dev/null @@ -1,6 +0,0 @@ -sonar.projectKey=org.opf-labs:fido -sonar.projectName=Fido -sonar.projectVersion=1.3 -sonar.sources=fido -sonar.language=py -sonar.sourceEncoding=UTF-8