From f81f1e4f8c0ec59bdc88ee761b76729584706f57 Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Oct 31 2017 09:25:19 +0000 Subject: Initial PyPI release --- diff --git a/.gitignore b/.gitignore index 3fa71e9..d0bddba 100644 --- a/.gitignore +++ b/.gitignore @@ -18,8 +18,7 @@ lib64 # Installer logs pip-log.txt -# Mr Developer -.mr.developer.cfg +# Developer .project .pydevproject .spyderproject @@ -29,5 +28,4 @@ pip-log.txt .cache .venv .mbs_local_build.db - -tests/openshift-template.yml +.tox diff --git a/Pipfile b/Pipfile index 4fc5f46..4b8233d 100644 --- a/Pipfile +++ b/Pipfile @@ -7,10 +7,10 @@ verify_ssl = true [dev-packages] pytest = "*" -six = "*" +wheel = "*" +tox = "*" [packages] -# Runtime dependencies should go in src/setup.py rather than here -fedmod = {editable = true, path = "src"} +fedmod = {editable = true, path = "src"} \ No newline at end of file diff --git a/Pipfile.lock b/Pipfile.lock index 53f29f9..1833e25 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "65629a979a8af096bf2e21c52c0b0ad16b9f7a80006bbd74e10bec82ab03fcda" + "sha256": "c8b195d7ecf9a5ea7f3736ff779bb3377a619378e9362e9eabc464dc5741192f" }, "host-environment-markers": { "implementation_name": "cpython", @@ -9,9 +9,9 @@ "os_name": "posix", "platform_machine": "x86_64", "platform_python_implementation": "CPython", - "platform_release": "4.13.5-200.fc26.x86_64", + "platform_release": "4.13.9-200.fc26.x86_64", "platform_system": "Linux", - "platform_version": "#1 SMP Thu Oct 5 16:53:13 UTC 2017", + "platform_version": "#1 SMP Mon Oct 23 13:52:45 UTC 2017", "python_full_version": "3.6.2", "python_version": "3.6", "sys_platform": "linux" @@ -32,6 +32,12 @@ } }, "develop": { + "pluggy": { + "hashes": [ + "sha256:bd60171dbb250fdebafad46ed16d97065369da40568ae948ef7117eee8536e94" + ], + "version": "==0.5.2" + }, "py": { "hashes": [ "sha256:2ccb79b01769d99115aa600d7eed99f524bf752bba8f041dc1c184853514655a", @@ -52,6 +58,28 @@ "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9" ], "version": "==1.11.0" + }, + "tox": { + "hashes": [ + "sha256:8af30fd835a11f3ff8e95176ccba5a4e60779df4d96a9dfefa1a1704af263225", + "sha256:752f5ec561c6c08c5ecb167d3b20f4f4ffc158c0ab78855701a75f5cef05f4b8" + ], + "version": "==2.9.1" + }, + "virtualenv": { + "hashes": [ + "sha256:39d88b533b422825d644087a21e78c45cf5af0ef7a99a1fc9fbb7b481e5c85b0", + "sha256:02f8102c2436bb03b3ee6dede1919d1dac8a427541652e5ec95171ec8adbc93a" + ], + "markers": "python_version != '3.2'", + "version": "==15.1.0" + }, + "wheel": { + "hashes": [ + "sha256:e721e53864f084f956f40f96124a74da0631ac13fbbd1ba99e8e2b5e9cafdf64", + "sha256:9515fe0a94e823fd90b08d22de45d7bde57c90edce705b22f5e1ecf7e1b653c8" + ], + "version": "==0.30.0" } } } diff --git a/README.md b/README.md index 6e833ba..02ab2a8 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ Currently, this consists of: ## Project status -`fedmod` is not yet released, but can already generate basic draft modules from -a local development checkout: +`fedmod` is not yet released as an RPM, but can already generate basic draft +modules from a local development checkout: $ pipenv run fedmod fetch-metadata $ pipenv run fedmod rpm2module graphite-web @@ -27,6 +27,11 @@ current directory. See the local development instructions below for info on setting up the execution environment with `pipenv`. +Note: while an initial release is available from +[PyPI](https://pypi.org/project/fedmod/), the dependency on the system level +`dnf` and `solv` libraries means it can't be usefully installed with `pipsi` +(as attempting to import those dependencies will fail at runtime). + ## Interim alternative `fedmod` aims to generate draft module definitions based on the same repository diff --git a/src/setup.cfg b/src/setup.cfg new file mode 100644 index 0000000..dd38343 --- /dev/null +++ b/src/setup.cfg @@ -0,0 +1,2 @@ +[bdist_wheel] +python-tag = py3 diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..205c090 --- /dev/null +++ b/tox.ini @@ -0,0 +1,15 @@ +[tox] +envlist = py36 +skip_missing_interpreters = True +setupdir = src + +[testenv] +# Need site-packages access for dnf and libsolv bindings +# This means we may pick up an external copy of pytest as well +sitepackages = True +changedir = tests +whitelist_externals = + pytest +deps = + pytest +commands = pytest {posargs}