Skip to content

Commit

Permalink
Set release version and date
Browse files Browse the repository at this point in the history
  • Loading branch information
lindstro committed Dec 16, 2023
1 parent 913e67f commit 6bdada5
Show file tree
Hide file tree
Showing 14 changed files with 55 additions and 28 deletions.
11 changes: 7 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ Change Log

---

## Unreleased
## 1.0.1 (2023-12-15)

This patch release primarily addresses minor bug fixes and is needed to update
the zfpy Python wheels.

### Added

Expand All @@ -15,11 +18,11 @@ Change Log

- #169: `libm` dependency is not always correctly detected.
- #171: `ptrdiff_t` is not always imported in Cython.
- #176: `CFP` API is not exposed via CMake configuration file.
- #176: cfp API is not exposed via CMake configuration file.
- #177: Full test suite is not included in release.
- #181: `rpath` is not set correctly in executables.
- #204: Array strides are not passed by value in `zFORp`.
- #220: Errors reported with scikit-build when running `CMake` with `BUILD_ZFPY` enabled.
- #204: Array strides are not passed by value in zFORp.
- #220: Errors reported with scikit-build when building zfpy.

---

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2014-2022, Lawrence Livermore National Security, LLC
Copyright (c) 2014-2023, Lawrence Livermore National Security, LLC
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ZFP
===
[![Github Actions Build Status](https://github.com/LLNL/zfp/workflows/Run%20Tests/badge.svg)](https://github.com/LLNL/zfp/actions/workflows/tests.yml)
[![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/qb3ld7j11segy52k/branch/develop?svg=true)](https://ci.appveyor.com/project/lindstro/zfp)
[![Documentation Status](https://readthedocs.org/projects/zfp/badge/?version=release1.0.0)](https://zfp.readthedocs.io/en/release1.0.0/)
[![Documentation Status](https://readthedocs.org/projects/zfp/badge/?version=release1.0.1)](https://zfp.readthedocs.io/en/release1.0.1/)
[![codecov](https://codecov.io/gh/LLNL/zfp/branch/develop/graph/badge.svg?token=jqvMVvgRQ9)](https://codecov.io/gh/LLNL/zfp)
[![R&D100 - Winner](https://img.shields.io/badge/R%26D100-Winner-gold)](https://www.rdworldonline.com/rd-100-winners-for-2023-are-announced-2/)

Expand Down Expand Up @@ -67,9 +67,9 @@ section.
Documentation
-------------

Full HTML [documentation](http://zfp.readthedocs.io/en/release1.0.0) is
Full HTML [documentation](http://zfp.readthedocs.io/en/release1.0.1) is
available online.
A [PDF](http://readthedocs.org/projects/zfp/downloads/pdf/release1.0.0/)
A [PDF](http://readthedocs.org/projects/zfp/downloads/pdf/release1.0.1/)
version is also available.

Further information on the zfp software is included in these files:
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 1.0.0-{build}
version: 1.0.1-{build}

environment:
# zfpy only build for Release builds (otherwise need debug python libs python27_d.lib)
Expand Down
13 changes: 8 additions & 5 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@

# General information about the project.
project = u'zfp'
copyright = u'2014-2022, LLNL-CODE-663824'
author = u'Peter Lindstrom, Garrett Morrison'
copyright = u'2014-2023, LLNL-CODE-663824'
author = u'Peter Lindstrom, Danielle Asher'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand All @@ -56,14 +56,17 @@
# The short X.Y version.
version = u'1.0'
# The full version, including alpha/beta/rc tags.
release = u'1.0.0'
release = u'1.0.1'

# The release date (as the RTD server is in another time zone).
today = u'Dec 15, 2023'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
language = 'en'

# Enable automatic numbering of figures referenced by :numref:.
numfig = True
Expand Down Expand Up @@ -149,7 +152,7 @@
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(master_doc, 'zfp.tex', u'zfp Documentation',
u'\shortstack[l]{Peter Lindstrom\\\\Garrett Morrison}', 'manual'),
u'\shortstack[l]{Peter Lindstrom\\\\Danielle Asher}', 'manual'),
]


Expand Down
2 changes: 1 addition & 1 deletion docs/source/contributors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Contributors
* |zfp| development team

- Peter Lindstrom
- Garrett Morrison
- Danielle Asher

* Major contributors

Expand Down
2 changes: 1 addition & 1 deletion docs/source/license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
License
=======

| Copyright (c) 2014-2022, Lawrence Livermore National Security, LLC
| Copyright (c) 2014-2023, Lawrence Livermore National Security, LLC
| All rights reserved.
Redistribution and use in source and binary forms, with or without
Expand Down
24 changes: 24 additions & 0 deletions docs/source/versions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
Release Notes
=============

1.0.1 (2023-12-15)
------------------

This patch release primarily addresses minor bug fixes and is needed to update
the zfpy Python wheels.

**Added**

- A new build macro, ``BUILD_TESTING_FULL``, specifies that all unit tests be
built; ``BUILD_TESTING`` produces a smaller subset of tests. Full tests and
documentation are now included in releases.

**Fixed**

- #169: `libm` dependency is not always correctly detected.
- #171: `ptrdiff_t` is not always imported in Cython.
- #176: cfp API is not exposed via CMake configuration file.
- #177: Full test suite is not included in release.
- #181: `rpath` is not set correctly in executables.
- #204: Array strides are not passed by value in zFORp.
- #220: Errors reported with scikit-build when building zfpy.

----

1.0.0 (2022-08-01)
------------------

Expand Down
6 changes: 3 additions & 3 deletions fortran/zfp.f90
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ module zfp

integer, parameter :: const_zFORp_version_major = 1
integer, parameter :: const_zFORp_version_minor = 0
integer, parameter :: const_zFORp_version_patch = 0
integer, parameter :: const_zFORp_version_patch = 1
integer, parameter :: const_zFORp_version_tweak = 0
integer, protected, bind(c, name="zFORp_version_major") :: zFORp_version_major
integer, protected, bind(c, name="zFORp_version_minor") :: zFORp_version_minor
Expand All @@ -68,11 +68,11 @@ module zfp
integer, protected, bind(c, name="zFORp_codec_version") :: zFORp_codec_version
data zFORp_codec_version/const_zFORp_codec_version/

integer, parameter :: const_zFORp_library_version = 4096 ! 0x1000
integer, parameter :: const_zFORp_library_version = 4112 ! 0x1010
integer, protected, bind(c, name="zFORp_library_version") :: zFORp_library_version
data zFORp_library_version/const_zFORp_library_version/

character(len = 36), parameter :: zFORp_version_string = 'zfp version 1.0.0 (August 1, 2022)'
character(len = 36), parameter :: zFORp_version_string = 'zfp version 1.0.1 (December 15, 2023)'

integer, parameter :: const_zFORp_min_bits = 1
integer, parameter :: const_zFORp_max_bits = 16658
Expand Down
2 changes: 1 addition & 1 deletion include/zfp.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
** Copyright (c) 2014-2022, Lawrence Livermore National Security, LLC and
** Copyright (c) 2014-2023, Lawrence Livermore National Security, LLC and
** other zfp project contributors. See the top-level LICENSE file for details.
** SPDX-License-Identifier: BSD-3-Clause
*/
Expand Down
2 changes: 1 addition & 1 deletion include/zfp.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef ZFP_HPP
#define ZFP_HPP

// Copyright (c) 2014-2022, Lawrence Livermore National Security, LLC and
// Copyright (c) 2014-2023, Lawrence Livermore National Security, LLC and
// other zfp project contributors. See the top-level LICENSE file for details.
// SPDX-License-Identifier: BSD-3-Clause

Expand Down
5 changes: 1 addition & 4 deletions include/zfp/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@
/* library version information */
#define ZFP_VERSION_MAJOR 1 /* library major version number */
#define ZFP_VERSION_MINOR 0 /* library minor version number */
#define ZFP_VERSION_PATCH 0 /* library patch version number */
#define ZFP_VERSION_PATCH 1 /* library patch version number */
#define ZFP_VERSION_TWEAK 0 /* library tweak version number */

/* defined for work in progress (indicates unofficial release) */
#define ZFP_VERSION_DEVELOP 1

/* codec version number (see also zfp_codec_version) */
#define ZFP_CODEC 5

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

setup(
name="zfpy",
version="1.0.0",
author="Peter Lindstrom",
version="1.0.1",
author="Peter Lindstrom, Danielle Asher",
author_email="[email protected]",
url="https://zfp.llnl.gov",
description="zfp compression in Python",
Expand Down
2 changes: 1 addition & 1 deletion src/zfp.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

const uint zfp_codec_version = ZFP_CODEC;
const uint zfp_library_version = ZFP_VERSION;
const char* const zfp_version_string = "zfp version " ZFP_VERSION_STRING " (August 1, 2022)";
const char* const zfp_version_string = "zfp version " ZFP_VERSION_STRING " (December 15, 2023)";

/* private functions ------------------------------------------------------- */

Expand Down

0 comments on commit 6bdada5

Please sign in to comment.