Merge 8480fc6 into 375b6cc

.github/workflows/daily_checkup.yml

@@ -13,24 +13,25 @@ env:
 jobs:
   daily_check:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -l {0}
     steps:
-      - name: Setup conda env
+      - name: Create env
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          auto-update-conda: true
+          python-version: ${{ env.PYVER }}
+      - name: Update env
         run: |
-          source "$CONDA/etc/profile.d/conda.sh"
-          conda config --set always_yes yes --set changeps1 no
-          conda update -q conda
-          conda create -n mg python=${{ env.PYVER }} pytest coverage pytest-cov
-          conda activate mg
           # TODO: remove this hack once no longer needed; without this, tensorflow gets installed incorrectly
           #       which leads to a segfault
           conda install -c stellargraph -c defaults -c conda-forge stellargraph 'tensorflow-base>=2.3.0'
           # Install package using latest "dev" versions from metagraph channel
-          conda install -c ${{ env.CHANNELS }} metagraph-stellargraph
+          conda install -c ${{ env.CHANNELS }} metagraph-stellargraph metagraph-dev
           conda list
       - name: Pytest
         run: |
-          source "$CONDA/etc/profile.d/conda.sh"
-          conda activate mg
           python -c 'import stellargraph'
           pytest --pyargs metagraph_stellargraph
           python -m metagraph.tests

.github/workflows/test_and_deploy.yml

@@ -17,42 +17,40 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -l {0}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Setup conda env
+      - name: Create env
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          auto-update-conda: true
+          activate-environment: mg
+          environment-file: continuous_integration/environment.yml
+      - name: Update env
         run: |
-          source "$CONDA/etc/profile.d/conda.sh"
-          conda config --set always_yes yes --set changeps1 no
-          conda update -q conda
-          conda info -a
           conda install -q conda-build
-          conda env create -f continuous_integration/environment-${{ env.MAIN_PYVER }}.yml
-          conda activate mg
-          pip install -e .
+          python setup.py develop --no-deps
       - name: Lint with Black
         run: |
-          source "$CONDA/etc/profile.d/conda.sh"
-          conda activate mg
+          black --version
           black metagraph_stellargraph *.py --check --diff
       - name: Pytest
         run: |
-          source "$CONDA/etc/profile.d/conda.sh"
-          conda activate mg
+          python -c 'import grblas; grblas.Matrix'
           pytest --pyargs metagraph
       - name: Coveralls
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          source "$CONDA/etc/profile.d/conda.sh"
-          conda activate mg
           conda install -c conda-forge coveralls
           coveralls --service=github
       - name: Conda Build
         run: |
-          source "$CONDA/etc/profile.d/conda.sh"
           conda build -c ${{ env.CHANNELS }} --python ${{ env.MAIN_PYVER }} continuous_integration/conda
           # This doesn't rebuild, but simply computes the name of the file that was previously built
           OUTPUT=$(conda build --output -c ${{ env.CHANNELS }} --python ${{ env.MAIN_PYVER }} continuous_integration/conda)
@@ -72,21 +70,24 @@ jobs:
     strategy:
       matrix:
         pyver:
-          - 3.7
           - 3.8
+    defaults:
+      run:
+        shell: bash -l {0}
     steps:
       - name: Download build artifact
         uses: actions/download-artifact@v2
         with:
           name: built_package
           path: ./artifact_storage
-      - name: Setup conda env
+      - name: Create env
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          auto-update-conda: true
+          python-version: ${{ matrix.pyver }}
+      - name: Update env
         run: |
-          source "$CONDA/etc/profile.d/conda.sh"
-          conda config --set always_yes yes --set changeps1 no
-          conda update -q conda
-          conda create -n mg python=${{ matrix.pyver }} pytest coverage pytest-cov
-          conda activate mg
+          conda install -c ${{ env.CHANNELS }} metagraph-dev
           # TODO: remove this hack once no longer needed; without this, tensorflow gets installed incorrectly
           #       which leads to a segfault
           conda install -c stellargraph -c defaults -c conda-forge stellargraph 'tensorflow-base>=2.3.0'
@@ -100,8 +101,6 @@ jobs:
           conda list
       - name: Pytest
         run: |
-          source "$CONDA/etc/profile.d/conda.sh"
-          conda activate mg
           python -c 'import stellargraph'
           pytest --pyargs metagraph_stellargraph
           python -m metagraph.tests

continuous_integration/conda/meta.yaml

@@ -13,17 +13,15 @@ build:
 
 requirements:
   build:
-    - python >=3.7
+    - python
   run:
-    - python >=3.7
+    - python
     - stellargraph
-    - metagraph >=0.2.3
+    - metagraph >=0.2.5
 
 test:
   requires:
-    - pytest
-    - pytest-cov
-    - coverage
+    - metagraph-dev
   commands:
     - py.test --cov-report term-missing --cov=metagraph_stellargraph --pyargs metagraph.tests
 

continuous_integration/environment-3.8.yml → continuous_integration/environment.yml

@@ -8,13 +8,14 @@ channels:
 dependencies:
 # dev environment
   - python=3.8
-  - coverage
-  - pytest
-  - pytest-cov
-  - black >=20.8b1
-  - pre-commit
-  - setuptools
+  - metagraph-dev
+  - black
 
 # metagraph-stellargraph dependencies
+  - metagraph
   - stellargraph
-  - metagraph >=0.2.3
+
+# Unlisted stellargraph dependencies
+# If we don't install, pip will and then things break
+  - tensorflow-estimator
+  - opt-einsum

environment.yml

@@ -6,14 +6,11 @@ channels:
 
 dependencies:
 # dev environment
-  - python=3.7
-  - coverage
-  - pytest
-  - pytest-cov
+  - python=3.8
   - black
   - conda-forge::pre-commit
   - setuptools
-  - metagraph::metagraph
+  - metagraph::metagraph-dev
 
 # metagraph-stellargraph dependencies
   - stellargraph::stellargraph