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.

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

Version 2.1.0 for develop #152

Merged
merged 41 commits into from
Jan 7, 2025
Merged

Version 2.1.0 for develop #152

merged 41 commits into from
Jan 7, 2025

Conversation

aburrell
Copy link
Owner

@aburrell aburrell commented Jan 7, 2025

Description

Changes made to the latest RC to resolve bug revealed during main merge.

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • This change requires a documentation update

How Has This Been Tested?

Unit tests, ran command line utility locally.

Test Configuration

  • Operating system: OS X Ventura
  • Python version number: 3.10
  • Compiler with version number: gfortran 14.2

Checklist

  • Make sure you are merging into the develop (not main) branch
  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • Add a note to Changelog.rst, summarising the changes
  • Add yourself to AUTHORS.rst and .zenodo.json

aburrell and others added 30 commits December 30, 2024 15:01
Updated the way that the version is set in the code to make releases easier.
Updated the changelog to have a target release date.
Updated the documentation configuration to:
- have a docstring,
- get the version from the pyproject.toml file, and
- update the project year.
Updated version and docs dependencies.
Updated the version number in the meson.build and setup.cfg files.
Remove the 're' package, which is no longer used.
Added the numpy version variable name to the Mac runs.
Change the doc test installation to use pyproject.toml.  Also updated the docs requirements file.
Fixed the pyproject.toml doc imports.
Fixed the README link, as tested on TestPyPi.
Ensure coefficient dat file is included.
Update the pyproject.toml to include coverage calls, update the script call, and include the package data.
Remove lines migrated to the pyproject.toml file.
Fixed the interface between the argparse structure and the numpy file output creation.
Changing the pyproject.toml allowed the ``apexpy`` command to be created, addressing issue #113.
Fixed the input for stdout.
Added a windows catch for the version definition using metadata.
Updated this section header to be more obvious as to the contents.
Array handling has changed in newer versions of numpy, added a function to update the array data type if the input is a numpy array and leave it alone otherwise.
Reduced deprecation warnings by:
- replacing `resource.path` calls with `resource.files` and
- using the new helper function to cast array types when necessary.
Added unit tests for the array casting function.
Partial bugfixes for corrections to deprecated behaviour.
Remove the blank space before the module docstring.
Update the IGRF reference in the Authors file.
Added a reference tag to the authors section in the docs.
Added a citation guide for apexpy.
Ensure float inputs yield float outputs in mlon/mlt functions.  Also updated a docstring to be more informative.
Expanded the changelog to include more of the changes implemented.
Added a missing space between words.
Added the citation guide to the docs index.
@aburrell aburrell added this to the 2.1.0 milestone Jan 7, 2025
CHANGELOG.rst Outdated Show resolved Hide resolved
Fixed the release date.
@coveralls
Copy link

Pull Request Test Coverage Report for Build 12654850579

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.006%) to 99.701%

Totals Coverage Status
Change from base Build 12551218133: 0.006%
Covered Lines: 999
Relevant Lines: 1002

💛 - Coveralls

@aburrell aburrell requested a review from ljlamarche January 7, 2025 16:12
@ljlamarche
Copy link
Collaborator

Is this just to bring the develop branch up-to-date with main now that the 2.1.0 rc is ready? Would it have been better to delete rcv2.1.0 after #147 and merge main into develop? I think it's a mute point, but these nuances of the git workflow always confuse me...

@aburrell
Copy link
Owner Author

aburrell commented Jan 7, 2025

@ljlamarche this is to bring develop up to date with main. It's safer than merging main into develop, because if you end up making any changes it won't affect main.

@aburrell aburrell merged commit 85164ea into develop Jan 7, 2025
48 checks passed
@aburrell aburrell deleted the rcv2.1.0 branch January 7, 2025 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants