diff --git a/Jenkinsfile b/Jenkinsfile index a009577..673d24b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ pipeline { steps { sh 'pip install pipenv' sh 'pipenv shell --python 3.9' - sh 'pipenv install' + sh 'pipenv run pip install -r requirements.txt' } } stage('test') { @@ -15,4 +15,4 @@ pipeline { } } } -JENKINSFILE + diff --git a/Pipfile b/Pipfile index 4598098..cbe3cde 100644 --- a/Pipfile +++ b/Pipfile @@ -6,6 +6,7 @@ name = "pypi" [packages] pyqt5 = "*" flask = "*" +pipfile-requirements = "*" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index 2d77bb5..7e7c947 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "7e109b2e422fd8f28df61e91f17d440ba73c639918c3c4ad685bc8188a76fc7e" + "sha256": "d986f44bfa27a57188fed41e7e43825d0bc692e044d329c780330a8b4a3c597f" }, "pipfile-spec": 6, "requires": { @@ -87,6 +87,30 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.1.1" }, + "packaging": { + "hashes": [ + "sha256:05af3bb85d320377db281cf254ab050e1a7ebcbf5410685a9a407e18a1f81236", + "sha256:eb41423378682dadb7166144a4926e443093863024de508ca5c9737d6bc08376" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==20.7" + }, + "pipfile-requirements": { + "hashes": [ + "sha256:d47591d46d8bfecf9257967992feae31fa83aff7ab6417373c7de5ea92ab849f", + "sha256:dc2ff7515ce35f8b37a500e87e7b9cd39f0f5c18eb6024543366eb6d4226869b" + ], + "index": "pypi", + "version": "==0.3.0" + }, + "pyparsing": { + "hashes": [ + "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1", + "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b" + ], + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==2.4.7" + }, "pyqt5": { "hashes": [ "sha256:29889845688a54d62820585ad5b2e0200a36b304ff3d7a555e95599f110ba4ce", @@ -125,6 +149,14 @@ "markers": "python_version >= '3.5'", "version": "==12.8.1" }, + "toml": { + "hashes": [ + "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b", + "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f" + ], + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==0.10.2" + }, "werkzeug": { "hashes": [ "sha256:2de2a5db0baeae7b2d2664949077c2ac63fbd16d98da0ff71837f7d1dea3fd43", diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..0dbb26a --- /dev/null +++ b/requirements.txt @@ -0,0 +1,15 @@ +################################################################################ +# This requirements file has been automatically generated from `Pipfile` with +# `pipenv-to-requirements` +# +# +# This has been done to maintain backward compatibility with tools and services +# that do not support `Pipfile` yet. +# +# Do NOT edit it directly, use `pipenv install [-d]` to modify `Pipfile` and +# `Pipfile.lock` and then regenerate `requirements*.txt`. +################################################################################ + +flask +pipfile-requirements +pyqt5