Clean up build process

gselzer · ctrueden · commit 07a6feaf68b0 · 2022-06-07T12:26:39.000-05:00
The github actions script now is much more similar to PyImageJ's.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,28 +28,32 @@ jobs:
           '3.9',
           '3.10'
         ]
+        # Breaks due to https://github.com/jpype-project/jpype/issues/1009
+        # Should be included once the fix is released
+        exclude:
+          - os: windows-latest
+            python-version: "3.10"
 
     steps:
     - uses: actions/checkout@v2
-    - uses: conda-incubator/setup-miniconda@v2
+
+    - uses: actions/setup-python@v3
       with:
-        auto-update-conda: true
-        python-version: ${{ matrix.python-version }}
-    - name: Add conda to system path
-      run: |
-        # $CONDA is an environment variable pointing to the root of the miniconda directory
-        echo $CONDA/bin >> $GITHUB_PATH
-    - name: Install mamba
-      run: |
-        conda install -c conda-forge mamba
-    - name: Install dependencies
+        python-version: ${{matrix.python-version}}
+
+    - uses: actions/setup-java@v3
+      with:
+        java-version: '8'
+        distribution: 'zulu'
+
+    - name: Install ScyJava
       run: |
-        mamba env update --file environment-test.yml --name base
-    - name: Install current project in dev mode
+        python -m pip install --upgrade pip
+        python -m pip install -e '.[dev]'
+
+    - name: Test ScyJava
       run: |
-        python -m pip install -e .
-    - name: Run test suite
-      run: python -m pytest -p no:faulthandler --color=yes
+        python -m pytest -p no:faulthandler --color=yes
 
   lint:
     runs-on: ubuntu-latest
@@ -74,7 +78,7 @@ jobs:
           conda install -c conda-forge mamba
       - name: Install dependencies
         run: |
-          mamba env update --file environment-test.yml --name base
+          mamba env update --file dev-environment.yml --name base
       - name: Install current project in dev mode
         run: |
           pip install -e .
diff --git a/dev-environment.yml b/dev-environment.yml
@@ -0,0 +1,31 @@
+# Use this file to construct an environment
+# for developing scyjava from source.
+#
+#   mamba env create -f dev-environment.yml
+#   conda activate scyjava-dev
+#
+# In addition to the dependencies needed for using scyjava, it includes tools
+# for developer-related actions like running automated tests (pytest),
+# linting the code (black), and generating the API documentation (sphinx).
+# If you want an environment without these tools, use environment.yml.
+name: scyjava-dev
+channels:
+  - conda-forge
+  - defaults
+dependencies:
+  # Project dependencies
+  - jpype1 >= 1.3.0
+  - jgo
+  # Test dependencies
+  - numpy
+  - pandas
+  # Developer tools
+  - black
+  - build
+  - pytest
+  - pytest-cov
+  # Project from source
+  - pip
+  - pip:
+    - -e .
+
diff --git a/environment-test.yml b/environment-test.yml
diff --git a/environment.yml b/environment.yml
@@ -1,8 +1,24 @@
+# Use this file to construct an environment for working
+# with scyjava in a runtime setting
+#
+#   mamba env create
+#   conda activate scyjava
+#
+# It includes the dependencies needed for using scyjava but not tools
+# for developer-related actions like running automated tests (pytest),
+# linting the code (black), and generating the API documentation (sphinx).
+# If you want an environment including these tools, use dev-environment.yml.
+
 name: scyjava
 channels:
   - conda-forge
   - defaults
 dependencies:
+  # Project dependencies
   - jpype1 >= 1.3.0
   - jgo
-  - scyjava
+  - openjdk=8
+  # Project from source
+  - pip
+  - pip:
+    - -e .
diff --git a/setup.cfg b/setup.cfg
@@ -48,7 +48,10 @@ where = src
 [options.extras_require]
 
 # Ensure any changes to this list are also added to environment-test.yml!
-test =
+dev =
+    black
+    build
     pytest
+    pytest-cov
     numpy
     pandas
