diff --git a/facsimile/VERSION b/Ctl/VERSION similarity index 100% rename from facsimile/VERSION rename to Ctl/VERSION diff --git a/Ctl/config.yml b/Ctl/config.yml new file mode 100644 index 0000000..d3fa263 --- /dev/null +++ b/Ctl/config.yml @@ -0,0 +1,18 @@ +ctl: + permissions: + - namespace: "ctl" + permission: "r" + + plugins: + - name: this_repo + type: git + config: + repo_url: git@github.com:20c/pytest-filedata.git + + - name: version + type: version + config: + branch_dev: master + branch_release: master + repositories: + - this_repo diff --git a/facsimile/requirements-test.txt b/Ctl/requirements-test.txt similarity index 100% rename from facsimile/requirements-test.txt rename to Ctl/requirements-test.txt diff --git a/facsimile/requirements.txt b/Ctl/requirements.txt similarity index 100% rename from facsimile/requirements.txt rename to Ctl/requirements.txt diff --git a/MANIFEST.in b/MANIFEST.in index 3133152..6021ac7 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ include LICENSE -recursive-include facsimile *.txt +recursive-include Ctl *.txt recursive-include pytest_filedata *.py -include facsimile/VERSION +include Ctl/VERSION diff --git a/setup.py b/setup.py index 44242b6..9f7f280 100644 --- a/setup.py +++ b/setup.py @@ -2,18 +2,25 @@ from setuptools import find_packages, setup -version = open('facsimile/VERSION').read().strip() -requirements = open('facsimile/requirements.txt').read().split("\n") -test_requirements = open('facsimile/requirements-test.txt').read().split("\n") +def read_file(name): + with open(name) as fobj: + return fobj.read().strip() + + +LONG_DESCRIPTION = read_file("README.md") +VERSION = read_file("Ctl/VERSION") +REQUIREMENTS = read_file("Ctl/requirements.txt").split('\n') +TEST_REQUIREMENTS = read_file("Ctl/requirements-test.txt").split('\n') setup( name='pytest_filedata', - version=version, + version=VERSION, author='20C', author_email='code@20c.com', description='easily load data from files', - long_description='', + long_description=LONG_DESCRIPTION, + long_description_content_type="text/markdown", license='LICENSE.txt', classifiers=[ 'Development Status :: 4 - Beta', @@ -30,10 +37,10 @@ packages = find_packages(), include_package_data=True, url='https://github.com/20c/pytest-filedata', - download_url='https://github.com/20c/pytest-filedata/%s' % version, + download_url='https://github.com/20c/pytest-filedata/archive/{}.zip'.format(VERSION), - install_requires=requirements, - test_requires=test_requirements, + install_requires=REQUIREMENTS, + test_requires=TEST_REQUIREMENTS, zip_safe=True, entry_points={ diff --git a/tox.ini b/tox.ini index fa9c0bc..b1640cb 100644 --- a/tox.ini +++ b/tox.ini @@ -8,10 +8,10 @@ passenv = CI TRAVIS* deps = pytest3: pytest>=3, <4 pytest4: pytest>=4, <5 - -r{toxinidir}/facsimile/requirements.txt - -r{toxinidir}/facsimile/requirements-test.txt + -r{toxinidir}/Ctl/requirements.txt + -r{toxinidir}/Ctl/requirements-test.txt commands = pytest --cov-report=term-missing --cov-report=xml --cov={envsitepackagesdir}/pytest_filedata [pytest] -norecursedirs = .facsimile data gen .tox +norecursedirs = Ctl data gen .tox