diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 92c767d..34b8b0f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,10 +38,9 @@ jobs: cache: pip - name: Requirements - working-directory: tests run: | pip install --upgrade pip setuptools wheel - pip install -r requirements.txt + pip install .[tests] - name: Pytest run: pytest tests/ diff --git a/pyproject.toml b/pyproject.toml index ac3aea9..483f817 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,56 @@ [project] name = "galactory" -version = "0.10.0" +version = "0.10.1-dev0" +authors = [ + {name = "Brian Scholer"}, +] +maintainers = [ + {name = "Brian Scholer"}, +] +license = {file = "LICENSE"} +description = "Ansible Galaxy proxy using Artifactory as a backend" +readme = {file = "README.md", content-type = "text/markdown"} +keywords = [ + "ansible", + "galaxy", + "artifactory", +] +classifiers = [ + "Development Status :: 4 - Beta", + "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", +] +requires-python = ">=3.8" + +dependencies = [ + "dohq-artifactory>=0.9,<0.10", + "Flask>=2.1,<3", + "semver>=2,<4", + "base64io>=1,<2", + "ConfigArgParse>=1.5,<2", + "requests>=2.26.0,<3", + "brotli>=1,<2", +] + +[project.optional-dependencies] +tests = [ + "pytest>=7.1,<8", + "pytest-cov", + "coverage", + # "pytest-docker-compose", + # "ansible-runner", + # "ansible-core", +] + +[project.urls] +Repository = "https://github.com/briantist/galactory" +Changelog = "https://github.com/briantist/galactory/blob/main/CHANGELOG.rst" +Issues = "https://github.com/briantist/galactory/issues" [build-system] requires = ["setuptools", "wheel"] diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 42c9200..0000000 --- a/requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -dohq-artifactory>=0.9,<0.10 -Flask>=2.1,<3 -semver>=2,<4 -base64io>=1,<2 -ConfigArgParse>=1.5,<2 -requests>=2.26.0,<3 -brotli>=1,<2 diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index af7636a..0000000 --- a/setup.cfg +++ /dev/null @@ -1,37 +0,0 @@ -[metadata] -# specify these in pyproject.toml otherwise it fails ??? -# name = galactory -# version = 0.6.0 -url = https://github.com/briantist/galactory -author = Brian Scholer -license = GPLv3+ -license_files = LICENSE -description = Ansible Galaxy proxy using Artifactory as a backend -long_description = file: README.md -long_description_content_type = text/markdown -keywords = - ansible - galaxy - artifactory -classifiers = - Development Status :: 4 - Beta - License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+) - Programming Language :: Python :: 3 - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - -[options] -zip_safe = True -include_package_data = True -python_requires = >= 3.6 -install_requires = - dohq-artifactory>=0.9,<0.10 - Flask>=2.1,<3 - semver>=2,<4 - base64io>=1,<2 - ConfigArgParse>=1.5,<2 - requests>=2.26.0,<3 - brotli>=1,<2 diff --git a/tests/requirements.txt b/tests/requirements.txt deleted file mode 100644 index 935616c..0000000 --- a/tests/requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ --r ../requirements.txt -pytest>=7.1,<8 -pytest-cov -# pytest-docker-compose -coverage -# ansible-runner -# ansible-core