diff --git a/README.md b/README.md index a75f4a2..9040cb2 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,7 @@ which is available now. The directory structure of your new project looks like this: ``` +├── LICENSE ├── Makefile <- Makefile with commands like `make data` or `make train` ├── README.md <- The top-level README for developers using this project. ├── data diff --git a/ccds.json b/ccds.json index c454221..68013c2 100644 --- a/ccds.json +++ b/ccds.json @@ -26,5 +26,5 @@ "none", "basic" ], - "open_source_license": ["MIT", "BSD-3-Clause", "No license file"] + "open_source_license": ["No license file", "MIT", "BSD-3-Clause"] } diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index 2c2d611..3609e6b 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -34,7 +34,7 @@ def write_dependencies(): if dependencies == 'requirements.txt': with open(dependencies, 'w') as f: lines = sorted(packages + pip_only_packages) - + lines += [ "" "-e ." @@ -75,4 +75,4 @@ def write_dependencies(): f.write("\n".join(lines)) -write_dependencies() \ No newline at end of file +write_dependencies() diff --git a/setup.py b/setup.py index 11aa4a3..7af2459 100644 --- a/setup.py +++ b/setup.py @@ -30,19 +30,20 @@ setup( 'Intended Audience :: Science/Research', # Pick your license as you wish (should match "license" above) - 'License :: OSI Approved :: MIT License', + # 'License :: OSI Approved :: MIT License', + 'License :: No license file' # Specify the Python versions you support here. In particular, ensure # that you indicate whether you support Python 2, Python 3 or both. 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', 'Topic :: Scientific/Engineering', 'Topic :: Scientific/Engineering :: Artificial Intelligence', ], - python_requires='>=3.5', + python_requires='>=3.6', install_requires=['cookiecutter', 'click'], entry_points={ 'console_scripts': [ diff --git a/tests/conftest.py b/tests/conftest.py index 7eb6945..038ef79 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -18,7 +18,7 @@ default_args = { 'module_name': 'project_module', 'author_name': 'DrivenData', 'description': 'A test project', - 'open_source_license' : 'MIT', + 'open_source_license' : 'No license file', 'dataset_storage': {"azure": {"container": "container-name"}}, } @@ -73,4 +73,4 @@ def bake_project(config): yield temp / config['repo_name'] # cleanup after - shutil.rmtree(temp) \ No newline at end of file + shutil.rmtree(temp) diff --git a/tests/test_creation.py b/tests/test_creation.py index 6227ffc..5718da2 100644 --- a/tests/test_creation.py +++ b/tests/test_creation.py @@ -77,6 +77,8 @@ def verify_files(root, config): expected_files = [ 'Makefile', 'README.md', + 'pyproject.toml', + 'setup.cfg', 'setup.py', ".env", ".gitignore",