From 48f080aed758e19f5c5d8339512abdd824f2136b Mon Sep 17 00:00:00 2001 From: Vasek Sraier Date: Sun, 24 Mar 2019 12:19:16 +0100 Subject: [PATCH] moved swagger_client dependency to another repository, removed Makefile (is now useless) --- Makefile | 31 ------------------------------- Pipfile | 1 + Pipfile.lock | 6 +++++- README.md | 4 +--- 4 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 824e6f1..0000000 --- a/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -GITEA_URL=https://try.gitea.io/swagger.v1.json -BUILDDIR=tmp - -build: swagger_client clean_builddir pipenv_sync - -swagger_client: - mkdir -p "${BUILDDIR}" - swagger-codegen generate -i "${GITEA_URL}" -l python -o "${BUILDDIR}/gitea_api" - mv "${BUILDDIR}/gitea_api/swagger_client" . - rm -rf "${BUILDDIR}/gitea_api" - - # Protoze ten generator psali nejaci dementi, neumi to cyklicke reference - # je proto potreba zakomentovat dva importy - sed -i 's/from swagger_client\.models\.gpg_key import GPGKey/#from swagger_client.models.gpg_key import GPGKey/' swagger_client/models/gpg_key.py - sed -i 's/from swagger_client\.models\.repository import Repository/#from swagger_client.models.repository import Repository/' swagger_client/models/repository.py - -.PHONY: pipenv_sync -pipenv_sync: - pipenv sync - -.PHONY: clean_builddir -clean_builddir: - rm -rf ${BUILDDIR} - -.PHONY: clean -clean: - rm -rf swagger_client/ - rm -rf click/ - pipenv --rm - - diff --git a/Pipfile b/Pipfile index 6e43da6..3198a08 100644 --- a/Pipfile +++ b/Pipfile @@ -12,6 +12,7 @@ beautifulsoup4 = "*" six = "*" termcolor = "*" lxml = "*" +swagger_client = { git = "https://gitea-gimli.kam.mff.cuni.cz/vasek/gitea-swagger-client" } [requires] python_version = "3" diff --git a/Pipfile.lock b/Pipfile.lock index c834ac3..b0ac0f3 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "b3919507bc0b38aec128ddc5d3e67bfa4ddce8ebfbee114635c50d1b0143b90d" + "sha256": "ee32788aeebfec6cf37be58728aa8f66afdc8783d61e401722317295a45b5e03" }, "pipfile-spec": 6, "requires": { @@ -109,6 +109,10 @@ ], "version": "==1.8" }, + "swagger-client": { + "git": "https://gitea-gimli.kam.mff.cuni.cz/vasek/gitea-swagger-client", + "ref": "db10cf7f02dc4b332647867a995dec3ffb6f415c" + }, "termcolor": { "hashes": [ "sha256:1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b" diff --git a/README.md b/README.md index 0861ace..a98cb29 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,9 @@ Určeno pro registraci organizátorů seminářů na MFF UK. ## Build Build má následující závislosti: -* Make -* swagger-codegen * pipenv -Spouští se prostým zavoláním `make` +Spouští se prostým zavoláním `pipenv sync` ## Spouštění