-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from tinnawong/feature/add_minio
fix on tags feature
- Loading branch information
Showing
13 changed files
with
20 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,8 +6,6 @@ name: Upload Python Package | |
on: | ||
release: | ||
types: [published] | ||
push: | ||
tags: [feature-*] | ||
|
||
jobs: | ||
deploy: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,4 @@ test.py | |
|
||
__pycache__ | ||
build | ||
dist | ||
tin_utility.egg-info | ||
text.txt | ||
py_utility.egg-info | ||
dist |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,37 +2,37 @@ | |
import subprocess | ||
import os | ||
|
||
cf_remote_version = ( | ||
remote_version = ( | ||
subprocess.run(["git", "describe", "--tags"], stdout=subprocess.PIPE) | ||
.stdout.decode("utf-8") | ||
.strip() | ||
) | ||
|
||
if "-" in cf_remote_version: | ||
if "-" in remote_version: | ||
# when not on tag, git describe outputs: "1.3.3-22-gdf81228" | ||
# pip has gotten strict with version numbers | ||
# so change it to: "1.3.3+22.git.gdf81228" | ||
# See: https://peps.python.org/pep-0440/#local-version-segments | ||
v,i,s = cf_remote_version.split("-") | ||
cf_remote_version = v + "+" + i + ".git." + s | ||
v,i,s = remote_version.split("-") | ||
remote_version = v + "+" + i + ".git." + s | ||
|
||
assert "-" not in cf_remote_version | ||
assert "." in cf_remote_version | ||
assert "-" not in remote_version | ||
assert "." in remote_version | ||
|
||
with open("README.md", "r") as f: | ||
long_description = f.read() | ||
|
||
setuptools.setup( | ||
name="py_utility", | ||
version=cf_remote_version, | ||
name="pylabtools", | ||
version=remote_version, | ||
author="Tinnawong saelao", | ||
author_email="[email protected]", | ||
description="python utility for research", | ||
long_description=long_description, | ||
long_description_content_type="text/markdown", | ||
url="https://github.com/tinnawong/py_utility", | ||
url="https://github.com/tinnawong/pylabtools", | ||
packages=setuptools.find_packages(), | ||
package_data={"py_utility": ["VERSION"]}, | ||
package_data={"pylabtools": ["VERSION"]}, | ||
include_package_data=True, | ||
classifiers=[ | ||
"Programming Language :: Python :: 3", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters