Skip to content

Commit

Permalink
r remove pyscaffold and deprecated pkg_resources
Browse files Browse the repository at this point in the history
  • Loading branch information
Bernhard Raml committed Oct 24, 2024
1 parent c25ee5b commit f4db546
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 39 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog
=========

Version 0.2.4
=============

- fixed python 3.12 deprecations (pkg\_resources and typing in tests)

Version 0.2.3
=============

Expand Down
8 changes: 1 addition & 7 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

[metadata]
name = geospade
version = attr: geospade.__version__
description = A place for classes and properties of raster and vector geometries and their geospatial operations alike.
author = TU Wien MRS group
author-email = [email protected]
Expand Down Expand Up @@ -35,8 +36,6 @@ packages = find:
include_package_data = True
package_dir =
=src
# DON'T CHANGE THE FOLLOWING LINE! IT WILL BE UPDATED BY PYSCAFFOLD!
setup_requires = pyscaffold>=3.2a0,<3.3a0
# Add here dependencies of your project (semicolon/line-separated), e.g.
install_requires =
numpy
Expand Down Expand Up @@ -120,8 +119,3 @@ exclude =
.eggs
docs/conf.py

[pyscaffold]
# PyScaffold's parameters when the project was created.
# This will be used when updating. Do not change!
version = 3.2.2
package = geospade
22 changes: 1 addition & 21 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,3 @@
# -*- coding: utf-8 -*-
"""
Setup file for geospade.
Use setup.cfg to configure your project.
This file was generated with PyScaffold 3.2.2.
PyScaffold helps you to put up the scaffold of your new Python project.
Learn more under: https://pyscaffold.org/
"""
import sys

from pkg_resources import VersionConflict, require
from setuptools import setup

try:
require('setuptools>=38.3')
except VersionConflict:
print("Error: version of setuptools is too old (<38.3)!")
sys.exit(1)


if __name__ == "__main__":
setup(use_pyscaffold=True)
setup()
12 changes: 1 addition & 11 deletions src/geospade/__init__.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
# -*- coding: utf-8 -*-
from pkg_resources import get_distribution, DistributionNotFound

try:
# Change here if project is renamed and does not equal the package name
dist_name = __name__
__version__ = get_distribution(dist_name).version
except DistributionNotFound:
__version__ = 'unknown'
finally:
del get_distribution, DistributionNotFound
__version__ = "v0.2.4"

# declare global variables
DECIMALS = 9 # TODO: how should this be declared?

0 comments on commit f4db546

Please sign in to comment.