From aaafd73a8adb6b8d2c6fc1a7f72718dd6e34f5cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Behmo?= <regis@behmo.com>
Date: Wed, 19 Jun 2019 12:14:49 +0200
Subject: [PATCH] Fix requirements for packaging

---
 Makefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index bd6998b..8ebac21 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,10 @@ compile-requirements: ## Compile requirements files
 	pip-compile -o requirements/base.txt requirements/base.in
 	pip-compile -o requirements/dev.txt requirements/dev.in
 	pip-compile -o requirements/docs.txt requirements/docs.in
+	
+package: ## Build a package ready to upload to pypi
+	pip install twine
+	python setup.py sdist
 
 test: test-lint test-unit test-format test-package ## Run all tests by decreasing order or priority
 
@@ -25,9 +29,8 @@ test-unit-core: ## Run unit tests on core
 test-unit-plugins: ## Run unit tests on plugins
 	python3 -m unittest discover plugins/minio/tests
 
-test-package: ## Test that package can be uploaded to pypi
-	python setup.py sdist
-	twine check dist/tutor-openedx*.tar.gz
+test-package: package ## Test that package can be uploaded to pypi
+	twine check dist/tutor-openedx-$(shell make version).tar.gz
 
 format: ## Format code automatically
 	black $(BLACK_OPTS)
@@ -103,9 +106,7 @@ ci-images: ## Build and push docker images to hub.docker.com
 	docker login -u "$$DOCKER_USERNAME" -p "$$DOCKER_PASSWORD"
 	tutor images push all
 
-ci-pypi: ## Push release to pypi
-	pip install twine
-	python setup.py sdist
+ci-pypi: package ## Push release to pypi
 	twine upload dist/*.tar.gz
 
 ###### Additional commands