+
Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: geoschem/gcpy
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.4.1
Choose a base ref
...
head repository: geoschem/gcpy
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.4.2
Choose a head ref
  • 14 commits
  • 17 files changed
  • 1 contributor

Commits on Jan 25, 2024

  1. Add create_test_plot script; can check if GCPy is installed properly

    gcpy/examples/plotting/create_test_plot.py
    - Script to create a dummy plot that renders to the screen.
      Useful for checking if "import gcpy" works properly.
    
    gcpy/examples/plotting/__init__.py
    - Added create_test_plot.py
    
    CHANGELOG.md
    - Updated accordingly
    
    Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
    yantosca committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    1c986de View commit details
    Browse the repository at this point in the history
  2. Add GitHub action "build-gcpy-environment"

    .github/workflows/build-gcpy-environment.yml
    - Added this configuration file for the "build-gcpy-environment"
      GitHub action.  This runs on pushes or PRs made to the main or
      dev branches.  The PR will use setup-micromamba to build the gcpy
      environment, import gcpy, and call a simple plotting script.
    
    CHANGELOG.md
    - Updated accordingly
    
    Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
    yantosca committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    730cb82 View commit details
    Browse the repository at this point in the history
  3. Add GitHub action to build the GCPy python environment

    .github/workflows/build-gcpy-environment.yml
    - Add configuration file to trigger a GitHub action on pushes to
      main,dev or PRs to main,dev.
    
    CHANGELOG.md
    - Updated accordingly
    
    Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
    yantosca committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    5afddd3 View commit details
    Browse the repository at this point in the history
  4. Merge PR #286 (Add GitHub action to build GCPy env)

    This merge brings PR #286 (Add GitHub action to build GCPy environment
    and test installation, by @yantosca) into the GCPy 1.4.2 development
    stream.
    
    This adds a GitHub action to check if the GCPy environment (as specified
    in the "environment.yml" file) will build properly, and if the "import gcpy"
    command works.
    
    Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
    yantosca committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    1fb87e4 View commit details
    Browse the repository at this point in the history
  5. Prevent overwriting the "results" variable when parallelization is off.

    This commit fixes the issue reported by @lizziel in #285.  The "results"
    variable was being overwritten instead of appended to when plots are
    generated sequentially (i.e. with "n_cores: 1" in the YAML input).
    
    gcpy/benchmark/modules/run_1yr_*_fullchem.py
    gcpy/benchmark_funcs.py
    gcpy/plot/compare_*.py
    - For the case when parallelization is off:
        1. Declare "results" as an empty list
        2. Append the output of the routine being called into "results"
      This will prevent a dictionary key error as described in #285.
    
    Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
    yantosca committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    0252fc5 View commit details
    Browse the repository at this point in the history
  6. Remove leftover debug output

    gcpy/benchmark_funcs.py
    - Removed a leftover print statement and quit() statement
      from debugging
    
    Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
    yantosca committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    7a2c321 View commit details
    Browse the repository at this point in the history
  7. Update environment.yml file to use pegged versions

    docs/environment_files/environment.yml
    - Now use pegged package versions, as described in issue #284
    
    Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
    yantosca committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    1e4a090 View commit details
    Browse the repository at this point in the history
  8. Add test environment file; Add new GitHub action

    docs/environment_files/testing.yml
    - Add this new environment file, based on the environment.yml file,
      but without pegged version numbers for most packages.
    
    .github/workflows/build-test-environment.yml
    - YAML config file to start a new GitHub action to build the mamba
      environment from "testing.yml"
    
    .github/workflows/build-gcpy-environment.yml
    - Updated names and comments
    - Now read docs/environment_files/environment.yml
    
    CHANGEKOG.md
    - Updated accordingly
    
    Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
    yantosca committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    1a67236 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. build-gcpy-environment now tests env build w/ several Python versions

    .github/workflows/build-gcpy-environment
    - Now attempt to build the environment with Python versions
      3.8 thru 3.13.
    
    CHANGELOG.md
    - Updated currently
    
    Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
    yantosca committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    8595565 View commit details
    Browse the repository at this point in the history
  2. Merge PR #287 (Fix dictionary key error for non-parallel plotting)

    This merge brings PR # (Fix dictionary key error when benchmark plots are
    generated sequentially, by @yantosca) into the GCPy 1.4.2 development stream.
    
    This fixes an error where a dictionary was not being properly appended
    into a list in the benchmark plotting code, when parallel plotting
    was disabled.
    
    Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
    yantosca committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    a8c8b7d View commit details
    Browse the repository at this point in the history
  3. Fix typo in testing.yml; peg versions for RTD packages

    docs/environment_files/testing.yml
    - Fixed typo: "environmet" -> "environment" in comments
    - Now peg the RTD package versions, as we know these work.
    - Also peg matplotlib>=3.8
    
    Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
    yantosca committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    43c783a View commit details
    Browse the repository at this point in the history
  4. Merge PR #289 (Use pegged versions in environment etc.)

    This merge brings PR # (Use pegged version numbers for the GCPy
    environment; Also add testing environment without pegged versions;
    Updated GitHub actions, by @yantosca) into the 1.4.2 development
    stream.
    
    This changes the default environment.yml to use pegged version
    numbers in order to avoid build issues.  This now builds the
    GCPy environment much faster.  The GitHub action that tests the
    environment build now uses a matrix of different Python versions.
    
    Also added a testing.yml file to specify an experimental GCPy
    environment for use in GitHub actions.
    
    Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
    yantosca committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    1dffa6c View commit details
    Browse the repository at this point in the history
  5. Update version numbers and prepare for GCPy 1.4.2 release

    CHANGELOG.md
    docs/source/conf.py
    gcpy/_version.py
    gcpy/benchmark/run_benchmark.py
    gcpy/benchmark/modules/run_1yr_fullchem_benchmark.py
    gcpy/benchmark/modules/run_1yr_tt_benchmark.py
    CHANGELOG.md
    - Updated version numbers
    
    setup.py
    - Restored, now use same version numbers as in environment.yml
    
    Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
    yantosca committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    70d649a View commit details
    Browse the repository at this point in the history
  6. GCPy 1.4.2 release

    This is the release of GCPy 1.4.2, which includes:
    
    - PR #286 (Github Action for GCPy environment)
    - PR #287 (Fix dictionary key error for benchmark plotting)
    - PR #289 (Use pegged versions in environment.yml; update GitHub actions
    
    Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
    yantosca committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    4bd730f View commit details
    Browse the repository at this point in the history
Loading
点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载