BLD: simplify setup.py and reorder build folders

.github/workflows/ci-test-xtgeo-merge.yml

@@ -5,7 +5,6 @@ on:
     branches: [master]
 
 jobs:
-
   build_pywheels:
     name: PY ${{ matrix.python-version }} on linux
 
@@ -31,5 +30,5 @@ jobs:
       - name: Test with pytest
         run: |
           git clone --depth 1 https://github.com/equinor/xtgeo-testdata ../xtgeo-testdata
-          pip install pytest
+          pip install -r requirements/requirements_test.txt
           pytest --disable-warnings

.github/workflows/ci-test-xtgeo.yml

@@ -10,8 +10,8 @@ env:
   CIBW_BEFORE_ALL_MACOS: "brew install swig"
   CIBW_BEFORE_TEST: |
     cd {project}
-    pip install -r requirements.txt
-    pip install -r requirements_test.txt
+    pip install -r requirements/requirements.txt
+    pip install -r requirements/requirements_test.txt
 
   CIBW_TEST_COMMAND: |
     cd {project}
@@ -74,5 +74,5 @@ jobs:
       - name: Test with pytest
         run: |
           git clone --depth 1 https://github.com/equinor/xtgeo-testdata ../xtgeo-testdata
-          pip install pytest
+          pip install -r requirements/requirements_test.txt
           pytest --disable-warnings

.github/workflows/deploy-xtgeo-pypi.yml

@@ -8,7 +8,7 @@ env:
   CIBW_BEFORE_ALL_LINUX: "sh scripts/swig_manylinux.sh"
   CIBW_BEFORE_ALL_WINDOWS: "choco install -y --no-progress --allow-empty-checksums -r swig --version=4.0.1"
   CIBW_BEFORE_ALL_MACOS: "brew install swig"
-  # CIBW_TEST_COMMAND: "python -c \"import xtgeo; print(xtgeo.__version__)\""
+  CIBW_TEST_COMMAND: 'python -c "import xtgeo; print(xtgeo.__version__)"'
   CIBW_BUILD: |
     cp36-manylinux_x86_64
     cp37-manylinux_x86_64

.gitignore

@@ -71,6 +71,7 @@ src/xtgeo/_theversion.py
 src/xtgeo/cxtgeo/cxtgeo*
 
 # other
+.venv*
 .idea/
 .projectile
 .dir-locals.el
@@ -79,3 +80,4 @@ tmp_buildswig
 _skbuild/
 pip-wheel-metadata/
 .vscode/
+.venv*/

.readthedocs.yml

@@ -6,8 +6,8 @@ build:
 python:
   version: 3.6
   install:
-    - requirements: requirements.txt
-    - requirements: docs/requirements.txt
+    - requirements: requirements/requirements.txt
+    - requirements: requirements/requirements_docs.txt
     - method: setuptools
       path: .
   system_packages: true

ci/jenkins/testkomodo.sh

@@ -14,7 +14,7 @@ install_package () {
 }
 
 install_test_dependencies () {
-    pip install -r requirements_test.txt
+    pip install -r requirements/requirements_test.txt
 }
 
 start_tests () {

docs/contributing.rst

@@ -82,9 +82,11 @@ up your fork for local development (first time):
     $ python -m venv .
     $ source bin/activate
     $ cd /your_path_to_git_clone/xtgeo/
-    $ pip install -r requirements_dev.txt
+    $ pip install pip -U
+    $ pip install -r requirements/requirements_dev.txt
     $ python setup.py clean
     $ python setup.py develop
+    $ pytest  # to check that stuff works
 
 4. Create a branch for local development:
 
@@ -103,7 +105,8 @@ Now you can make your changes locally.
     $ Use `pytest` for running tests
     $ Run `black` on your python code, then there is no discussions on formatting
 
-To get `flake8`, `pylint` and `black` and just pip install them into your virtualenv.
+To get ``flake8``, ``pylint`` and ``black`` and just pip install them into
+your virtualenv.
 
 6. If you want to edit C code, take contact with the author for detailed instructions.
 
@@ -116,7 +119,7 @@ To get `flake8`, `pylint` and `black` and just pip install them into your virtua
     $ git commit -m "AAA: Your detailed description of your changes."
     $ git push origin name-of-your-bugfix-or-feature
 
-8. Submit a pull request through the Git website.
+8. Submit a pull request through the Github website.
 
 Writing commit messages
 -----------------------

pyproject.toml

@@ -28,21 +28,21 @@ exclude = '''
 # manylinyx1 vs manylinux2010 issues (for Equinor Komodo installs)
 [build-system]
 requires = [
-         "pip>=19.1.1",
-         "setuptools>=30.3.0",
-         "wheel",
-         "scikit-build",
-         'cmake==3.13.3; python_version < "3.7" and platform_system == "Linux"',
-         'cmake==3.15.3; python_version >= "3.7" and platform_system == "Linux"',
-         'cmake==3.18.0; platform_system != "Linux"',
-         "ninja",
-         "setuptools_scm>=3.2.0",
-         'numpy==1.10.4; python_version == "3.4"',
-         'numpy==1.13.3; python_version >= "3.5" and python_version < "3.7" and platform_system == "Linux"',
-         'numpy==1.16.0; python_version >= "3.7" or platform_system != "Linux"',
-         'Sphinx',
-         'sphinx-rtd-theme',
-         'sphinxcontrib-apidoc',
-         'sphinx-autodoc-typehints',
-         'recommonmark',
-         ]
+  "pip>=19.1.1",
+  "setuptools>=30.3.0",
+  "wheel",
+  "scikit-build",
+  'cmake==3.13.3; python_version < "3.7" and platform_system == "Linux"',
+  'cmake==3.15.3; python_version >= "3.7" and platform_system == "Linux"',
+  'cmake==3.18.0; platform_system != "Linux"',
+  "ninja",
+  "setuptools_scm>=3.2.0",
+  'numpy==1.10.4; python_version == "3.4"',
+  'numpy==1.13.3; python_version >= "3.5" and python_version < "3.7" and platform_system == "Linux"',
+  'numpy==1.16.0; python_version >= "3.7" or platform_system != "Linux"',
+  'Sphinx',
+  'sphinx-rtd-theme',
+  'sphinxcontrib-apidoc',
+  'sphinx-autodoc-typehints',
+  'recommonmark',
+]

requirements/requirements_dev.txt

@@ -0,0 +1,34 @@
+setuptools>=43
+setuptools_scm>=3.2.0
+scikit-build
+ninja>=1.9.0.post1
+cmake>3.13.3
+pip>=20
+wheel>=0.29.0
+flake8
+pydocstyle
+coverage>=4.1
+pytest-runner>=2.11.1
+pre-commit
+coverage>=4.1
+Sphinx
+sphinx-rtd-theme
+sphinxcontrib-apidoc
+sphinx-autodoc-typehints
+recommonmark
+bandit
+numpy>1.13.1
+pandas>=0.21.0
+segyio>=1.8.6
+matplotlib>=1.5
+scipy>=0.17
+shapely>=1.6.2; python_version < "3.8"
+shapely==1.7a2; python_version == "3.8"
+black
+autopep8
+pylint
+pytest>=6
+pytest-cov
+h5py>=3
+hdf5plugin>=2.3
+tables>=3.5

docs/requirements.txt → requirements/requirements_docs.txt

@@ -1,10 +1,12 @@
 pip>=19.1.1
 setuptools>=30.3.0
-cmake==3.13.3
+cmake>=3.13.3
 scikit-build
 ninja
 setuptools_scm
-sphinxcontrib-apidoc
+pydocstyle
+Sphinx
 sphinx-rtd-theme
+sphinxcontrib-apidoc
 sphinx-autodoc-typehints
 recommonmark

requirements/requirements_setup.txt

@@ -0,0 +1,11 @@
+# requirements for setup on localhost
+# see also ...setup_ci.txt and pyproject.toml
+pip>=20
+setuptools>=43
+wheel
+numpy
+cmake
+setuptools_scm
+scikit-build
+ninja
+pytest-runner

requirements/requirements_setup_extras.txt

@@ -0,0 +1,9 @@
+flake8
+pydocstyle
+coverage>=4.1
+pre-commit
+coverage>=4.1
+bandit
+autopep8
+pylint
+pytest-cov