Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update installation documentation using Anaconda #501

Merged
merged 3 commits into from
Aug 20, 2021
Merged

Update installation documentation using Anaconda #501

merged 3 commits into from
Aug 20, 2021
+9 −4

Conversation

LauWien
Copy link
Contributor

@LauWien LauWien commented Aug 19, 2021 •
edited
Loading

This PR updates the installation documentation using Anaconda with an additional step to set the channel priority to strict with $ conda config --set channel_priority strict. This lead to errors in the past and was issued in #480. Merging this PR will close this issue.

How to review

  • Read the diff and note that the CI checks all pass.
  • Build the documentation and look at the installation page.

PR checklist

  • Continuous integration checks all ✅

Sorry, something went wrong.

@LauWien LauWien added the docs Documentation label Aug 19, 2021
@LauWien LauWien self-assigned this Aug 19, 2021
@LauWien LauWien linked an issue Aug 19, 2021 that may be closed by this pull request
conda/macOS install requires channel_priority strict #480
Closed
@codecov
Copy link

codecov bot commented Aug 19, 2021 •
edited
Loading

Codecov Report

Merging #501 (d07bc63) into main (a4ae7ff) will not change coverage.
The diff coverage is n/a.

❗ Current head d07bc63 differs from pull request most recent head 7a5b847. Consider uploading reports for the commit 7a5b847 to get more accurate results

@@          Coverage Diff          @@
##            main    #501   +/-   ##
=====================================
  Coverage   93.4%   93.4%           
=====================================
  Files         38      38           
  Lines       2853    2853           
=====================================
  Hits        2666    2666           
  Misses       187     187

@LauWien LauWien requested a review from khaeru August 19, 2021 10:41
khaeru
khaeru requested changes Aug 20, 2021
View reviewed changes
Copy link
Member

@khaeru khaeru left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! See a suggestion to simplify.

@LauWien LauWien requested a review from khaeru August 20, 2021 11:27
@LauWien LauWien merged commit 38461e6 into iiasa:main Aug 20, 2021
awais307 added a commit to awais307/message_ix that referenced this pull request Aug 24, 2021
@awais307
Squashed commit of the following:
3572168 
commit 900a9f8
Author: Laura Wienpahl <57132039+LauWien@users.noreply.github.com>
Date:   Mon Aug 23 14:56:33 2021 +0200

    Update documentation "Common issues" (iiasa#500)

commit 38461e6
Author: Laura Wienpahl <57132039+LauWien@users.noreply.github.com>
Date:   Fri Aug 20 16:04:17 2021 +0200

    Update installation documentation using Anaconda (iiasa#501)

    * Update installation documentation using Anaconda
    * Update conda CI checks accordingly

commit a4ae7ff
Author: OFR-IIASA <fricko@iiasa.ac.at>
Date:   Wed Aug 18 14:09:31 2021 +0200

    Tutorial explaining historical parameters (iiasa#478)

    * Add tutorial for historical parameters
    * Update README
    * Update release notes

commit 65b0767
Author: Laura Wienpahl <laura@wienpahl.de>
Date:   Tue Aug 17 14:04:04 2021 +0200

    Update release notes

commit 44c43d8
Author: Laura Wienpahl <laura@wienpahl.de>
Date:   Tue Aug 17 13:20:55 2021 +0200

    Adjust test suite for pyam v1.1.0 compatibility

commit f94304c
Author: Laura Wienpahl <57132039+LauWien@users.noreply.github.com>
Date:   Tue Jul 20 10:23:28 2021 +0200

    Adjust objective values for nightly test scenarios (iiasa#495)

commit 6d19561
Merge: 6bf19c3 4eaef6f
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Mon Jul 19 16:05:54 2021 +0200

    Merge pull request iiasa#493 from iiasa/misc-2021-W28

    Use np.isscalar; improve contributing.rst

commit 4eaef6f
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Sun Jul 18 15:40:09 2021 +0200

    Update doc/contributing.rst

commit 85d9cb7
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Sun Jul 18 15:20:57 2021 +0200

    Use np.isscalar(), not deprecated ixmp.utils.isscalar

commit 6bf19c3
Merge: 164cb4e ba4254b
Author: Laura Wienpahl <57132039+LauWien@users.noreply.github.com>
Date:   Tue Jul 13 15:54:05 2021 +0200

    Merge pull request iiasa#474 from volker-krey/soft_constraints_clean

    Adjust reference new capacity and activity for soft constraints

commit ba4254b
Author: OFR-IIASA <fricko@iiasa.ac.at>
Date:   Tue Jul 13 09:03:29 2021 +0200

    Update RELEASE_NOTES.rst

commit 7a87538
Author: OFR-IIASA <fricko@iiasa.ac.at>
Date:   Tue Jul 13 09:00:49 2021 +0200

    Update RELEASE_NOTES.rst

commit 440d78c
Merge: 5fc853c 164cb4e
Author: OFR-IIASA <fricko@iiasa.ac.at>
Date:   Tue Jul 13 08:45:53 2021 +0200

    Merge branch 'main' into soft_constraints_clean

commit 164cb4e
Merge: 19eff0f 8849073
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Fri Jul 9 12:35:54 2021 +0200

    Merge pull request iiasa#491 from OFR-IIASA/year_active_fix

    Ensure `years_active()` uses sorted results

commit 8849073
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Fri Jul 9 08:20:26 2021 +0200

    Update release notes based on review comment

commit 73e3c9c
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Mon Jul 5 12:07:21 2021 +0200

    Apply black formatting

commit 9fd6303
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Mon Jul 5 12:05:50 2021 +0200

    Add iiasa#491 to release notes

commit f16b397
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Mon Jul 5 11:55:08 2021 +0200

    Modify years_active function to use sorted results

commit 1889ba2
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Mon Jul 5 11:53:43 2021 +0200

    Add test to ensure years_active uses sorted results

commit 19eff0f
Merge: 56611ad 2df44f8
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Wed Jul 7 15:13:00 2021 +0200

    Merge pull request iiasa#492 from iiasa/hotfix/genno-1.5.1

    Adjust for genno 1.6, pyam 1.0

commit 2df44f8
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Wed Jul 7 14:08:11 2021 +0200

    Add iiasa#492 to release notes

commit a65f1e3
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Wed Jul 7 13:03:31 2021 +0200

    Adjust use of pyam.IamDataFrame.line_plot() → plot()

    Former name was removed in pyam 1.0

commit 8d9ac4d
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Wed Jul 7 12:43:33 2021 +0200

    Git ignore prof/ directory (pytest-profiling)

commit 136add2
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Tue Jul 6 16:32:01 2021 +0200

    Correct a format string in .reporting.computations.plot_cumulative()

commit e96819c
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Tue Jul 6 10:53:39 2021 +0200

    Adjust test_reporter_from_scenario() for genno 1.5

    Use "in rep" not "in rep.graph" for more flexible __contains__.

commit 5fc853c
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Fri Jun 18 08:43:57 2021 +0200

    Descriptions corrected

commit 6d7f44c
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Fri Jun 18 08:41:15 2021 +0200

    Adjusted documentation of revised formulations

commit 11e8bd4
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Tue Jun 15 15:27:23 2021 +0200

    Updated tutorial syntax

commit c15e1ae
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Tue Jun 15 14:56:42 2021 +0200

    Update tutorial descriptions

commit 3e8d9b6
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Tue Jun 15 14:56:10 2021 +0200

    Added tests for soft constraints

commit 339f727
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Tue Jun 15 11:19:55 2021 +0200

    Added tutorial for soft constraints

commit 66fdef7
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Mon Jun 14 12:46:46 2021 +0200

    Updated release notes

commit ff37498
Author: Oliver FRICKO <fricko@iiasa.ac.at>
Date:   Fri Aug 28 16:19:54 2020 +0200

    adjusted the year to check for active technology for soft constraints

commit ecd00d5
Author: Oliver FRICKO <fricko@iiasa.ac.at>
Date:   Fri Aug 28 11:16:01 2020 +0200

    corrections made to GAMS code

commit d86ed88
Author: Volker Krey <krey@iiasa.ac.at>
Date:   Thu Aug 27 14:37:52 2020 +0200

    adjustment of reference new capacity and activity for soft constraints

    additional growth in soft constraints of new capacity and activity is now based on previous periods new capacity and activity, respectively, as for the regular growth constraints

commit 56611ad
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Tue Jun 15 10:46:05 2021 +0200

    Also install 3rd party type stubs in 'lint' CI workflow
@LauWien LauWien mentioned this pull request Oct 11, 2021
Closed
@khaeru khaeru mentioned this pull request Nov 2, 2021
Closed
awais307 added a commit to awais307/message_ix that referenced this pull request Aug 1, 2022
@awais307
Squashed commit of the following:
95055a4 
commit 900a9f8
Author: Laura Wienpahl <57132039+LauWien@users.noreply.github.com>
Date:   Mon Aug 23 14:56:33 2021 +0200

    Update documentation "Common issues" (iiasa#500)

commit 38461e6
Author: Laura Wienpahl <57132039+LauWien@users.noreply.github.com>
Date:   Fri Aug 20 16:04:17 2021 +0200

    Update installation documentation using Anaconda (iiasa#501)

    * Update installation documentation using Anaconda
    * Update conda CI checks accordingly

commit a4ae7ff
Author: OFR-IIASA <fricko@iiasa.ac.at>
Date:   Wed Aug 18 14:09:31 2021 +0200

    Tutorial explaining historical parameters (iiasa#478)

    * Add tutorial for historical parameters
    * Update README
    * Update release notes

commit 65b0767
Author: Laura Wienpahl <laura@wienpahl.de>
Date:   Tue Aug 17 14:04:04 2021 +0200

    Update release notes

commit 44c43d8
Author: Laura Wienpahl <laura@wienpahl.de>
Date:   Tue Aug 17 13:20:55 2021 +0200

    Adjust test suite for pyam v1.1.0 compatibility

commit f94304c
Author: Laura Wienpahl <57132039+LauWien@users.noreply.github.com>
Date:   Tue Jul 20 10:23:28 2021 +0200

    Adjust objective values for nightly test scenarios (iiasa#495)

commit 6d19561
Merge: 6bf19c3 4eaef6f
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Mon Jul 19 16:05:54 2021 +0200

    Merge pull request iiasa#493 from iiasa/misc-2021-W28

    Use np.isscalar; improve contributing.rst

commit 4eaef6f
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Sun Jul 18 15:40:09 2021 +0200

    Update doc/contributing.rst

commit 85d9cb7
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Sun Jul 18 15:20:57 2021 +0200

    Use np.isscalar(), not deprecated ixmp.utils.isscalar

commit 6bf19c3
Merge: 164cb4e ba4254b
Author: Laura Wienpahl <57132039+LauWien@users.noreply.github.com>
Date:   Tue Jul 13 15:54:05 2021 +0200

    Merge pull request iiasa#474 from volker-krey/soft_constraints_clean

    Adjust reference new capacity and activity for soft constraints

commit ba4254b
Author: OFR-IIASA <fricko@iiasa.ac.at>
Date:   Tue Jul 13 09:03:29 2021 +0200

    Update RELEASE_NOTES.rst

commit 7a87538
Author: OFR-IIASA <fricko@iiasa.ac.at>
Date:   Tue Jul 13 09:00:49 2021 +0200

    Update RELEASE_NOTES.rst

commit 440d78c
Merge: 5fc853c 164cb4e
Author: OFR-IIASA <fricko@iiasa.ac.at>
Date:   Tue Jul 13 08:45:53 2021 +0200

    Merge branch 'main' into soft_constraints_clean

commit 164cb4e
Merge: 19eff0f 8849073
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Fri Jul 9 12:35:54 2021 +0200

    Merge pull request iiasa#491 from OFR-IIASA/year_active_fix

    Ensure `years_active()` uses sorted results

commit 8849073
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Fri Jul 9 08:20:26 2021 +0200

    Update release notes based on review comment

commit 73e3c9c
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Mon Jul 5 12:07:21 2021 +0200

    Apply black formatting

commit 9fd6303
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Mon Jul 5 12:05:50 2021 +0200

    Add iiasa#491 to release notes

commit f16b397
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Mon Jul 5 11:55:08 2021 +0200

    Modify years_active function to use sorted results

commit 1889ba2
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Mon Jul 5 11:53:43 2021 +0200

    Add test to ensure years_active uses sorted results

commit 19eff0f
Merge: 56611ad 2df44f8
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Wed Jul 7 15:13:00 2021 +0200

    Merge pull request iiasa#492 from iiasa/hotfix/genno-1.5.1

    Adjust for genno 1.6, pyam 1.0

commit 2df44f8
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Wed Jul 7 14:08:11 2021 +0200

    Add iiasa#492 to release notes

commit a65f1e3
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Wed Jul 7 13:03:31 2021 +0200

    Adjust use of pyam.IamDataFrame.line_plot() → plot()

    Former name was removed in pyam 1.0

commit 8d9ac4d
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Wed Jul 7 12:43:33 2021 +0200

    Git ignore prof/ directory (pytest-profiling)

commit 136add2
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Tue Jul 6 16:32:01 2021 +0200

    Correct a format string in .reporting.computations.plot_cumulative()

commit e96819c
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Tue Jul 6 10:53:39 2021 +0200

    Adjust test_reporter_from_scenario() for genno 1.5

    Use "in rep" not "in rep.graph" for more flexible __contains__.

commit 5fc853c
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Fri Jun 18 08:43:57 2021 +0200

    Descriptions corrected

commit 6d7f44c
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Fri Jun 18 08:41:15 2021 +0200

    Adjusted documentation of revised formulations

commit 11e8bd4
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Tue Jun 15 15:27:23 2021 +0200

    Updated tutorial syntax

commit c15e1ae
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Tue Jun 15 14:56:42 2021 +0200

    Update tutorial descriptions

commit 3e8d9b6
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Tue Jun 15 14:56:10 2021 +0200

    Added tests for soft constraints

commit 339f727
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Tue Jun 15 11:19:55 2021 +0200

    Added tutorial for soft constraints

commit 66fdef7
Author: FRICKO Oliver <fricko@iiasa.ac.at>
Date:   Mon Jun 14 12:46:46 2021 +0200

    Updated release notes

commit ff37498
Author: Oliver FRICKO <fricko@iiasa.ac.at>
Date:   Fri Aug 28 16:19:54 2020 +0200

    adjusted the year to check for active technology for soft constraints

commit ecd00d5
Author: Oliver FRICKO <fricko@iiasa.ac.at>
Date:   Fri Aug 28 11:16:01 2020 +0200

    corrections made to GAMS code

commit d86ed88
Author: Volker Krey <krey@iiasa.ac.at>
Date:   Thu Aug 27 14:37:52 2020 +0200

    adjustment of reference new capacity and activity for soft constraints

    additional growth in soft constraints of new capacity and activity is now based on previous periods new capacity and activity, respectively, as for the regular growth constraints

commit 56611ad
Author: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date:   Tue Jun 15 10:46:05 2021 +0200

    Also install 3rd party type stubs in 'lint' CI workflow
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@khaeru khaeru

Assignees

@LauWien LauWien

Labels
docs Documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

conda/macOS install requires channel_priority strict
2 participants
@LauWien @khaeru