Auto point to new release

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,7 +7,8 @@ Contributors guide: ./CONTRIBUTING.md
 
 ## Checklist
 <!--
-Remove items that do not apply. For completed items, change [ ] to [x].
+Remove items that do not apply. For completed items, change [ ] to [x] or you can click the checkboxes once your 
+pull-request is published.
 -->
 
 - [ ] Keep pull requests small so they can be easily reviewed.
@@ -16,7 +17,8 @@ Remove items that do not apply. For completed items, change [ ] to [x].
 - [ ] Categorize the PR by setting a good title and adding one of the labels:
       `bug`, `feature`, `ui`, `change`, `documentation`, `breaking`, `ci`
       as they show up in the changelog
-- [ ] Link this PR to related issues.
+- [ ] Link this PR to related issues by using [closing keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
+- [ ] Request a review from another developer.
 
 <!--
 NOTE: these things are not required to open a PR and can be done afterwards,

ci/conda-envs/build.yml → .github/conda-envs/build.yml

@@ -1,8 +1,6 @@
 name: build
 channels:
   - conda-forge
-  - cmutel
-  - bsteubing
 dependencies:
   - conda-build
   - anaconda-client

ci/conda-envs/test.yml → .github/conda-envs/test.yml

@@ -1,8 +1,6 @@
 name: test
 channels:
   - conda-forge
-  - cmutel
-  - bsteubing
 dependencies:
   - pytest
   - pytest-qt

ci/recipe/dev/meta.yaml → .github/dev-recipe/meta.yaml

@@ -1,9 +1,11 @@
+# conda recipe for activity-browser-dev
+# https://anaconda.org/bsteubing/activity-browser-dev
 package:
   name: "{{ os.environ.get('PKG_NAME', 'activity-browser-dev') }}"
   version: "{{ os.environ.get('VERSION', 'dev') }}"
 
 source:
-  path: ../../..
+  path: ../..
 
 build:
   noarch: python
@@ -20,7 +22,7 @@ requirements:
   build:
     - python
     - setuptools
-  run:  # dependencies are added via github action from ci/recipe/stable/meta.yaml
+  run:  # dependencies are added via github action from stable at recipe/meta.yaml
 
 about:
   home: https://github.com/LCA-ActivityBrowser/activity-browser

.github/workflows/comment-milestoned-issues.yaml

@@ -0,0 +1,33 @@
+name: Comment when milestone is closed
+on:
+  issues:
+    types: [milestoned]
+
+  comment:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Comment on issue
+        uses: actions/github-script@v5
+        with:
+          script: |
+            const issue_number = context.issue.number;
+            const milestone_title = context.payload.issue.milestone.title;
+
+            // Get all milestones
+            const milestones = await github.rest.issues.listMilestones({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+            });
+
+            // Find the closed milestone that matches the title
+            const closedMilestone = milestones.data.find(milestone => milestone.title === milestone_title && milestone.state === 'closed');
+
+            if (closedMilestone) {
+              // Post a comment on the issue
+              await github.rest.issues.createComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: issue_number,
+                body: `This issue has been resolved in Activity Browser [version ${milestone_title](https://github.com/LCA-ActivityBrowser/activity-browser/releases/tag/${milestone_title), please [update Activity Browser](https://github.com/LCA-ActivityBrowser/activity-browser#updating-the-ab).`,
+              });
+            }

.github/workflows/install-canary.yaml

@@ -9,8 +9,8 @@ on:
 
 jobs:
   canary-installs:
-    runs-on: ${{ matrix.os }}
     timeout-minutes: 12
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
@@ -26,15 +26,76 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install activity-browser
         run: |
-          conda create -y -n ab -c conda-forge activity-browser python=${{ matrix.python-version }}
+          conda create -y -n ab -c conda-forge --solver libmamba activity-browser python=${{ matrix.python-version }}
       - name: Environment info
         run: |
           conda activate ab
           conda list
           conda env export
           conda env export -f env.yaml
       - name: Upload final environment as artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: env-${{ matrix.os }}-${{ matrix.python-version }}
           path: env.yaml
+
+  # also run install with micromamba instead of conda to have a timining comparison
+  canary-installs-mamba:
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python-version: ['3.9']
+    defaults:
+      run:
+        shell: bash -l {0}
+    steps:
+      - name: Setup python ${{ matrix.python-version }} conda environment
+        uses: mamba-org/setup-micromamba@v1
+        with:
+          environment-name: ab
+          create-args: >-
+            python=${{ matrix.python-version }}
+            activity-browser
+      - name: Environment info
+        run: |
+          micromamba list
+          micromamba env export
+          micromamba env export > env.yaml
+      - name: Upload final environment as artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: env-${{ matrix.os }}-${{ matrix.python-version }}-mamba
+          path: env.yaml
+
+  conda-micromamba-comparison:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -l {0}
+    needs:
+      - canary-installs
+      - canary-installs-mamba
+    steps:
+      - name: Download all artifacts
+        uses: actions/download-artifact@v3
+      - name: show files
+        run: |
+          ls -la
+      - name: correct yaml formatting
+        # add correct indentation to make diffing possible
+        uses: mikefarah/yq@master
+        with:
+          cmd: |
+            ls | grep mamba | while read d; do yq -i $d/env.yaml; done
+      - name: diff ubuntu
+        run: |
+          diff -u env-ubuntu-latest-3.9* || :
+      - name: diff windows
+        run: |
+          diff -u env-windows-latest-3.9* || :
+      - name: diff macos
+        run: |
+          diff -u env-macos-latest-3.9* || :

.github/workflows/main.yaml

@@ -11,17 +11,17 @@ jobs:
   patch-test-environment:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Patch test environment dependencies
         # This step adds the run requirements from the stable recipe to the test environment
         uses: mikefarah/yq@master
         with:
           cmd: |
-            yq eval-all 'select(fi == 0).dependencies += select(fi == 1).requirements.run | select(fi == 0)' ci/conda-envs/test.yml ci/recipe/stable/meta.yaml > patched-environment.yml
+            yq eval-all 'select(fi == 0).dependencies += select(fi == 1).requirements.run | select(fi == 0)' .github/conda-envs/test.yml recipe/meta.yaml > patched-environment.yml
       - name: Show patched environment
         run: cat patched-environment.yml
       - name: Upload patched environment as artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: patched-environment
           path: patched-environment.yml
@@ -38,24 +38,25 @@ jobs:
       run:
         shell: bash -l {0}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Download patched test environment
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: patched-environment
       - name: Setup python ${{ matrix.python-version }} conda environment
-        uses: conda-incubator/setup-miniconda@v2
+        uses: mamba-org/setup-micromamba@v1
         with:
-          python-version: ${{ matrix.python-version }}
-          activate-environment: test
+          environment-name: test
           environment-file: patched-environment.yml
+          create-args: >-
+            python=${{ matrix.python-version }}
       - name: Environment info
         run: |
-          conda list
-          conda env export
-          conda env export -f env.yaml
+          micromamba list
+          micromamba env export
+          micromamba env export > env.yaml
       - name: Upload final environment as artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: env-${{ matrix.os }}-${{ matrix.python-version }}
           path: env.yaml
@@ -72,7 +73,7 @@ jobs:
       - name: Install coveralls and coverage
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |
-          conda install -q -y coveralls=3.3.1 coverage pytest-cov
+          micromamba install -q -y coveralls=3.3.1 coverage pytest-cov
       - name: Run linux tests
         if: ${{ matrix.os == 'ubuntu-latest' }}
         env:
@@ -107,77 +108,28 @@ jobs:
     env:
       PKG_NAME: "activity-browser-dev"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Build and deploy 3.8
         uses: conda-incubator/setup-miniconda@v2
         with:
           python-version: 3.8
           activate-environment: build
-          environment-file: ci/conda-envs/build.yml
+          environment-file: .github/conda-envs/build.yml
       - name: Export version
         run: |
           echo "VERSION=$(date +'%Y.%m.%d')" >> $GITHUB_ENV
       - name: Patch recipe with run requirements from stable
         uses: mikefarah/yq@master
         # Adds the run dependencies from the stable recipe to the dev recipe (inplace)
-        # Also adds the dependecies to the ab_dev environment file
         with:
           cmd: |
-            yq eval-all -i 'select(fi == 0).requirements.run += select(fi == 1).requirements.run | select(fi == 0)' ci/recipe/dev/meta.yaml ci/recipe/stable/meta.yaml
-            yq eval-all -i 'select(fi == 0).dependencies += select(fi == 1).requirements.run | select(fi == 0)' ci/conda-envs/ab_dev.yml ci/recipe/stable/meta.yaml
+            yq eval-all -i 'select(fi == 0).requirements.run += select(fi == 1).requirements.run | select(fi == 0)' .github/dev-recipe/meta.yaml recipe/meta.yaml
       - name: Show patched dev recipe
-        run: cat ci/recipe/dev/meta.yaml
-      - name: Build development package
-        run: |
-          conda build ci/recipe/dev
-      - name: Upload the activity-browser-dev package and env
-        run: |
-          anaconda -t ${{ secrets.CONDA_UPLOAD_TOKEN }} upload --force \
-          /usr/share/miniconda/envs/build/conda-bld/noarch/*.tar.bz2
-          anaconda -t ${{ secrets.CONDA_UPLOAD_TOKEN }} upload ci/conda-envs/ab_dev.yml
-
-
-  deploy-arm:
-    # Make sure to only run a deploy if all tests pass.
-    needs:
-      - tests
-    # And only on a push event, not a pull_request.
-    if: ${{ github.event_name == 'push' }}
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        shell: bash -l {0}
-    env:
-      PKG_NAME: "activity-browser-arm"
-    steps:
-      - uses: actions/checkout@v2
-      - name: Build and deploy 3.8
-        uses: conda-incubator/setup-miniconda@v2
-        with:
-          python-version: 3.8
-          activate-environment: build
-          environment-file: ci/conda-envs/build.yml
-      - name: Export version
-        run: |
-          echo "VERSION=$(date +'%Y.%m.%d')" >> $GITHUB_ENV
-      - name: Patch recipe with run requirements from stable
-        uses: mikefarah/yq@master
-        # Adds the run dependencies from the stable recipe to the arm recipe
-        # drop brightway2, but add brightway2_nosolver and scikit-umfpack
-        # Also adds the dependecies to the ab_arm environment file
-        with:
-          cmd: |
-            yq e '.requirements.run.[] | select(. != "brightway2*") | [.]' ci/recipe/stable/meta.yaml > arm_requirements.yaml
-            yq e -i '. += ["brightway2_nosolver", "scikit-umfpack"]' arm_requirements.yaml
-            yq eval-all -i 'select(fi == 0).requirements.run += select(fi == 1) | select(fi == 0)' ci/recipe/arm/meta.yaml arm_requirements.yaml
-            yq eval-all -i 'select(fi == 0).dependencies += select(fi == 1) | select(fi == 0)' ci/conda-envs/ab_arm.yml arm_requirements.yaml
-      - name: Show patched arm recipe
-        run: cat ci/recipe/arm/meta.yaml
+        run: cat .github/dev-recipe/meta.yaml
       - name: Build development package
         run: |
-          conda build ci/recipe/arm
-      - name: Upload the activity-browser-arm package and env
+          conda build .github/dev-recipe/
+      - name: Upload the activity-browser-dev package
         run: |
           anaconda -t ${{ secrets.CONDA_UPLOAD_TOKEN }} upload --force \
           /usr/share/miniconda/envs/build/conda-bld/noarch/*.tar.bz2
-          anaconda -t ${{ secrets.CONDA_UPLOAD_TOKEN }} upload ci/conda-envs/ab_arm.yml

.github/workflows/release.yaml

@@ -11,37 +11,30 @@ jobs:
       run:
         shell: bash -l {0}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Build changelog from PRs with labels
         id: build_changelog
-        uses: mikepenz/release-changelog-builder-action@v2
+        uses: mikepenz/release-changelog-builder-action@v4
         with:
-          configuration: "ci/changelog-configuration.json"
+          configuration: ".github/changelog-configuration.json"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Patch ab env with run requirements from stable recipe
-        uses: mikefarah/yq@master
-        with:
-          cmd: |
-            yq eval-all -i 'select(fi == 0).dependencies += select(fi == 1).requirements.run | select(fi == 0)' ci/conda-envs/ab.yml ci/recipe/stable/meta.yaml
       - name: Create github release
         uses: ncipollo/release-action@v1
         with:
           body: ${{steps.build_changelog.outputs.changelog}}
-          artifacts: 'ci/conda-envs/ab.yml'
           commit: master
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up conda-build environment
         uses: conda-incubator/setup-miniconda@v2
         with:
           python-version: 3.8
           activate-environment: build
-          environment-file: ci/conda-envs/build.yml
+          environment-file: .github/conda-envs/build.yml
       - name: Build activity-browser stable
         run: |
-          conda build ci/recipe/stable
+          conda build recipe/
       - name: Upload to anaconda.org
         run: |
           anaconda -t ${{ secrets.CONDA_UPLOAD_TOKEN }} upload \
           /usr/share/miniconda/envs/build/conda-bld/noarch/*.tar.bz2
-          anaconda -t ${{ secrets.CONDA_UPLOAD_TOKEN }} upload ci/conda-envs/ab.yml