setup.py: move requirements to top-level dir

as it's the common location and easier to find for new developers.
htm-community · Sep 24, 2019 · 46514b2 · dkeeney · Sep 24, 2019 · breznak
1 parent c100cfe
commit 46514b2
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -85,8 +85,6 @@ jobs:
           name: Installing python dependencies
           command: |
             python -m pip install --user --upgrade pip setuptools setuptools-scm wheel
-            python -m pip install --no-cache-dir --user -r bindings/py/packaging/requirements.txt  --verbose || exit
-
 
       # Build Release with python
       - run:

diff --git a/.github/workflows/htmcore.yml b/.github/workflows/htmcore.yml
@@ -35,7 +35,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip setuptools wheel
-        pip install -r bindings/py/packaging/requirements.txt
+        pip install -r requirements.txt
     - name: build htmcore with setup.py
       run: |
         python setup.py install --user 
@@ -49,5 +49,3 @@ jobs:
       #TODO 1 Debug build
       #TODO GH Releases
       #TODO PYPI deploy
-      #TODO move to top level requirements.txt
-      #TODO set ARCH_FLAGS (for OSX) in setup.py
diff --git a/README.md b/README.md
@@ -64,7 +64,7 @@ Fork or download the HTM-Community htm.core repository from https://github.com/h
 ```
 cd to-repository-root
 python -m pip install --user --upgrade pip setuptools setuptools-scm wheel
-python -m pip install --no-cache-dir --user -r bindings/py/packaging/requirements.txt
+python -m pip install --no-cache-dir --user -r requirements.txt
 ```
 
 Be sure you are running the right version of python. Check it with the following command:

diff --git a/appveyor.yml b/appveyor.yml
@@ -99,7 +99,6 @@ build_script:
   - echo Binding version = %BINDINGS_VERSION%
 
   - python -m pip install --user --upgrade pip setuptools setuptools-scm wheel || exit
-  - python -m pip install --no-cache-dir --user -r bindings/py/packaging/requirements.txt  || exit
 
   # we need to find the previous git tags so a shallow clone is not enough
   - git fetch --depth=200
@@ -155,4 +154,4 @@ on_success:
         }
 
         
-    
+    
diff --git a/bindings/py/packaging/setup.py b/bindings/py/packaging/setup.py
@@ -111,7 +111,7 @@ def findRequirements(platform):
   Read the requirements.txt file and parse into requirements for setup's
   install_requirements option.
   """
-  requirementsPath = fixPath(os.path.join(PY_BINDINGS, "requirements.txt"))
+  requirementsPath = fixPath(os.path.join(REPO_DIR, "requirements.txt"))
   return [
     line.strip()
     for line in open(requirementsPath).readlines()

diff --git a/bindings/py/packaging/requirements.txt → requirements.txt b/bindings/py/packaging/requirements.txt → requirements.txt