Skip to content

Commit

Permalink
Merge pull request #94 from pytroll/feature-release
Browse files Browse the repository at this point in the history
Prepare for next release
  • Loading branch information
sfinkens authored Dec 6, 2021
2 parents 6a5ed49 + 28997df commit 1d459aa
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 75 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,7 @@ dmypy.json

# Pyre type checker
.pyre/

# setuptools_scm files
# this should be generated automatically when installed
pygac_fdr/version.py
66 changes: 0 additions & 66 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion continuous_integration/environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ dependencies:
- pygac
- trollsift
- pytest-testconfig
- cfchecker @ git+https://github.com/cedadev/cf-checker#egg=cfchecker
- cfchecker
12 changes: 6 additions & 6 deletions pygac_fdr/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
# You should have received a copy of the GNU General Public License along with
# pygac-fdr. If not, see <http://www.gnu.org/licenses/>.

from pkg_resources import DistributionNotFound, get_distribution

try:
__version__ = get_distribution(__name__).version
except DistributionNotFound:
# package is not installed
pass
from pygac_fdr.version import version as __version__ # noqa
except ModuleNotFoundError:
raise ModuleNotFoundError(
"No module named pygac_fdr.version. This could mean "
"you didn't install 'pygac_fdr' properly. Try reinstalling ('pip "
"install').")
try:
# If the wheels of netCDF4 (used by this module) and h5py (imported by pygac) are incompatible,
# segfaults or runtime errors like "NetCDF: HDF error" might occur. Prevent this by importing
Expand Down
6 changes: 6 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[build-system]
requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.2", 'setuptools_scm_git_archive']
build-backend = "setuptools.build_meta"

[tool.setuptools_scm]
write_to = "pygac_fdr/version.py"
5 changes: 5 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
[options]
setup_requires =
setuptools_scm
setuptools_scm_git_archive

[flake8]
ignore =
E203 # whitespace before ':' - doesn't work well with black
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
long_description=README,
long_description_content_type="text/markdown",
classifiers=[
"Development Status :: 3 - Alpha",
"Development Status :: 4 - Beta",
"Intended Audience :: Science/Research",
"License :: OSI Approved :: GNU General Public License v3 "
+ "or later (GPLv3+)",
Expand All @@ -75,7 +75,6 @@
url="https://github.com/pytroll/pygac-fdr",
packages=find_packages(),
scripts=[os.path.join("bin", item) for item in os.listdir("bin")],
use_scm_version=True,
install_requires=requires,
extras_require=extras_require,
python_requires=">=3.6",
Expand Down

0 comments on commit 1d459aa

Please sign in to comment.