Fix Make file

pitbulk · pitbulk · commit 25b9e3f7267c · 2021-05-14T03:59:00.000+02:00
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -20,26 +20,11 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq swig python-dev libxml2-dev libxmlsec1-dev
-        pip install .
-        pip install -e ".[test]"
+        make install-req
+        make install-test
 
     - name: Test
       run: |
         make pytest
         make pycodestyle
         make flake8       
-
-    - name: Coveralls
-      uses: AndreMiras/coveralls-python-action@develop
-      with:
-        parallel: true
-        flag-name: Test
-
-  coveralls_finish:
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-    - name: Coveralls Finished
-      uses: AndreMiras/coveralls-python-action@develop
-      with:
-        parallel-finished: true
diff --git a/Makefile b/Makefile
@@ -3,29 +3,32 @@ PYTHON_MAJOR_VERSION=2
 PYTHON_MINOR_VERSION=7
 PYTHON_VERSION=$(PYTHON_MAJOR_VERSION).$(PYTHON_MINOR_VERSION)
 PYTHON_WITH_VERSION=python$(PYTHON_VERSION)
-PYTHON=$(VIRTUAL_ENV)/bin/python
-PIP=$(VIRTUAL_ENV)/bin/pip
-FLAKE8=$(VIRTUAL_ENV)/bin/flake8
-PYTEST=$(VIRTUAL_ENV)/bin/pytest
-PYCODESTYLE=$(VIRTUAL_ENV)/bin/pycodestyle
-COVERAGE=$(VIRTUAL_ENV)/bin/coverage
+PYTHON=python
+PIP=pip
+FLAKE8=flake8
+PYTEST=pytest
+PYCODESTYLE=pycodestyle
+COVERAGE=coverage
 COVERAGE_CONFIG=tests/coverage.rc
 PEP8_CONFIG=tests/pep8.rc
 MAIN_SOURCE=src/onelogin/saml2
 DEMOS=demo-django demo-flask
-TESTS=tests/src/OneLogin/saml2_test
+TESTS=tests/src/OneLogin/saml2_tests
 SOURCES=$(MAIN_SOURCE) $(DEMO) $(TESTS)
 
 $(VIRTUAL_ENV):
-	$(PYTHON_WITH_VERSION) -m venv $(VIRTUAL_ENV)
+	virtualenv $(VIRTUAL_ENV) --python=$(PYTHON_WITH_VERSION)
 
 virtualenv: $(VIRTUAL_ENV)
 
-install: $(PIP) install .
+install-req:
+	$(PIP) install --upgrade 'setuptools<45.0.0'
+	$(PIP) install .
 
-install-dev: $(PIP) install -e ".[test]" 
+install-test:
+	$(PIP) install -e ".[test]" 
 
-pytest: 
+pytest:
 	$(COVERAGE) run --source $(MAIN_SOURCE) --rcfile=$(COVERAGE_CONFIG) -m pytest
 	$(COVERAGE) report -m --rcfile=$(COVERAGE_CONFIG)
 
