Complete migration to skeleton

Use consistentently the venv subdirectory in scripts and documentation

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Author: pombredanne

.github/workflows/ci-about-files.yml

@@ -24,16 +24,16 @@ jobs:
         run: ./configure --dev
 
       - name: Activate VirtualEnv
-        run: source bin/activate
+        run: source venv/bin/activate
 
       #- name: Check About Files in thirdparty
-      #  run: ./bin/about check thirdparty/
+      #  run: ./venv/bin/about check thirdparty/
 
       - name: Check About Files in thirdparty
-        run: ./bin/about check src/
+        run: ./venv/bin/about check src/
 
       - name: Check About Files in thirdparty
-        run: ./bin/about check etc/
+        run: ./venv/bin/about check etc/
 
       - name: Check About Files in thirdparty
-        run: ./bin/about check scancode-toolkit.ABOUT
+        run: ./venv/bin/about check scancode-toolkit.ABOUT

INSTALL.rst

@@ -47,7 +47,7 @@ Advanced installation: pip install a Python PyPI package
 
 - Create a virtual environment for Python 3.x and activate it::
 
-    virtualenv -p python3 venv-scancode && source venv-scancode/bin/activate
+    virtualenv -p python3 venv && source venv/bin/activate
 
 - Run ``pip install scancode-toolkit[full]``
 

appveyor.yml

@@ -16,4 +16,4 @@ build: off
 
 test_script:
     - python -c "import sys;print(sys.getdefaultencoding())"
-    - cmd: "set PYTHON_EXECUTABLE=%PYTHON%\\python.exe && configure --dev && Scripts\\pytest -vvs tests\\scancode"
+    - cmd: "set PYTHON_EXECUTABLE=%PYTHON%\\python.exe && configure --dev && venv\\Scripts\\pytest -vvs tests\\scancode"

azure-pipelines.yml

@@ -129,7 +129,7 @@ jobs:
           python_versions: ['3.7', '3.8', '3.9']
           python_architecture: x64
           test_suites:
-              all: Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py
+              all: venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py
 
 
     - template: etc/ci/azure-win.yml
@@ -139,7 +139,7 @@ jobs:
           python_versions: ['3.6', '3.7', '3.8', '3.9']
           python_architecture: x64
           test_suites:
-              all: Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py
+              all: venv\Scripts\pytest -n 2 -vvs tests\scancode\test_cli.py
 
 
     - template: etc/ci/azure-posix.yml
@@ -176,9 +176,9 @@ jobs:
               click_versions: |
                 for clk_ver in 8.0.1 7.1.2 7.1.1 7.1 6.7; 
                  do
-                  bin/pip install click==$clk_ver;
-                  bin/scancode -i samples/ -n3 --json foo.json; 
-                  bin/scancode -i --verbose samples/ -n3 --json foo.json; 
+                  venv/bin/pip install click==$clk_ver;
+                  venv/bin/scancode -i samples/ -n3 --json foo.json; 
+                  venv/bin/scancode -i --verbose samples/ -n3 --json foo.json; 
                  done
 
 
@@ -338,20 +338,20 @@ jobs:
           image_name: ubuntu-20.04
           python_versions: ['3.6', '3.7', '3.8', '3.9']
           test_suites:
-              all: bin/pip install --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
+              all: venv/bin/pip install --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
 
     - template: etc/ci/azure-win.yml
       parameters:
           job_name: win2019_cpython_latest_from_pip
           image_name: windows-2019
           python_versions: ['3.6', '3.7', '3.8', '3.9']
           test_suites:
-              all: Scripts\pip install --force-reinstall --upgrade -e .[dev] &&  Scripts\pytest -n 2 -vvs  tests\scancode\test_cli.py
+              all: venv\Scripts\pip install --force-reinstall --upgrade -e .[dev] &&  venv\Scripts\pytest -n 2 -vvs  tests\scancode\test_cli.py
 
     - template: etc/ci/azure-posix.yml
       parameters:
           job_name: macos1015_cpython_latest_from_pip
           image_name: macos-10.15
           python_versions: ['3.6', '3.7', '3.8', '3.9']
           test_suites:
-              all: bin/pip install --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs  tests/scancode/test_cli.py
+              all: venv/bin/pip install --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs  tests/scancode/test_cli.py

docs/source/contribute/contrib_dev.rst

@@ -69,11 +69,11 @@ test suite. This is installed with the ``pytest`` package which is installed
 when you run ``./configure --dev``).
 
 If you are running from a fresh git clone and you run ``./configure`` and then
-``source bin/activate`` the ``pytest`` command will be available in your path.
+``source venv/bin/activate`` the ``pytest`` command will be available in your path.
 
 Alternatively, if you have already configured but are not in an activated
 "virtualenv" the ``pytest`` command is available under
-``<root of your checkout>/bin/pytest``
+``<root of your checkout>/venv/bin/pytest``
 
 (Note: paths here are for POSIX, but mostly the same applies to Windows)
 

docs/source/getting-started/ide-config.rst

@@ -6,7 +6,6 @@
 
    home
    install
-   ide-config
    newcomer
 
 ..

docs/source/getting-started/index.rst

@@ -306,14 +306,14 @@ On Linux/Mac:
 - Open a terminal
 - cd to the clone directory
 - run ``./configure``
-- run ``source bin/activate``
+- run ``source venv/bin/activate``
 
 On Windows:
 
 - open a command prompt
 - cd to the clone directory
 - run ``configure``
-- run ``Scripts\activate``
+- run ``venv\Scripts\activate``
 
 Now you are ready to use the freshly configured scancode-toolkit.
 
@@ -336,14 +336,14 @@ The steps are:
 
 #. Create a Python virtual environment::
 
-    /usr/bin/python3 -m venv .
+    /usr/bin/python3 -m venv venv
 
 For more information on Python virtualenv, visit this
 `page <https://docs.python-guide.org/dev/virtualenvs/#lower-level-virtualenv>`_.
 
 #. Activate the virtual environment you just created::
 
-    source bin/activate
+    source venv/bin/activate
 
 #. Run ``pip install --upgrade pip setuptools wheel`` to install the latest
    versions of base utilities.

docs/source/getting-started/install.rst

@@ -29,7 +29,7 @@ ScanCode is a tool to scan code and detect licenses, copyrights and more.
 ls -al
 pwd
 ./configure
-cd `pwd` && venv/bin/py.test -n 2 -vvs src tests/commoncode
+cd `pwd` && venv/bin/pytest -n 2 -vvs src tests/commoncode
 
 #py.test -n 2 -vvs src tests/commoncode tests/extractcode tests/textcode tests/typecode tests/cluecode tests/scancode tests/licensedcode/test_detect.py tests/licensedcode/test_index.py tests/licensedcode/test_legal.py tests/licensedcode/test_models.py