Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into deps/pip-compile
Browse files Browse the repository at this point in the history
  • Loading branch information
web-flow committed Oct 6, 2024
2 parents 032c4bb + 961b9b1 commit 470a5c9
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- n/a

## [1.4.2] - 2024-09-30

- Added workaround for rhel8 RPM build.

## [1.4.1] - 2024-07-19

- Fixed source code structure.
Expand Down Expand Up @@ -46,7 +50,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Initial release from release-engineering organization

[Unreleased]: https://github.com/release-engineering/pubtools/compare/v1.4.1...HEAD
[Unreleased]: https://github.com/release-engineering/pubtools/compare/v1.4.2...HEAD
[1.4.2]: https://github.com/release-engineering/pubtools/compare/v1.4.1...v1.4.2
[1.4.1]: https://github.com/release-engineering/pubtools/compare/v1.4.0...v1.4.1
[1.4.0]: https://github.com/release-engineering/pubtools/compare/v1.3.0...v1.4.0
[1.3.0]: https://github.com/release-engineering/pubtools/compare/v1.2.1...v1.3.0
Expand Down
19 changes: 17 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
from setuptools import find_namespace_packages, setup
from setuptools import setup

try:
from setuptools import find_namespace_packages
except ImportError:
# Workaround for RHEL-8 RPM packaging that uses setuptools 39.2
# find_namespace_packages is supported since setuptools 40.1
# Loosely backported from https://github.com/pypa/setuptools/blob/main/setuptools/discovery.py
from setuptools import PackageFinder

class PEP420PackageFinder(PackageFinder):
@staticmethod
def _looks_like_package(_path):
return True

find_namespace_packages = PEP420PackageFinder.find


def get_description():
Expand All @@ -23,7 +38,7 @@ def get_requirements():

setup(
name="pubtools",
version="1.4.1",
version="1.4.2",
packages=find_namespace_packages(where="src"),
package_dir={"": "src"},
url="https://github.com/release-engineering/pubtools",
Expand Down

0 comments on commit 470a5c9

Please sign in to comment.