Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: fix py versions in buildroot builds #12235

Merged
merged 2 commits into from
Mar 6, 2023
Merged

build: fix py versions in buildroot builds #12235

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f6046d
build: fix py versions in buildroot builds
sfoster1 Mar 6, 2023
55a4dbb
format
sfoster1 Mar 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
format
  • Loading branch information
@sfoster1
sfoster1 committed Mar 6, 2023
commit 55a4dbbc04512e036ef0deffa7d909e319c8f0f8
2 changes: 1 addition & 1 deletion api/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
def get_version():
buildno = os.getenv("BUILD_NUMBER")
project = os.getenv("OPENTRONS_PROJECT", "robot-stack")
git_dir = os.getenv('OPENTRONS_GIT_DIR', None)
git_dir = os.getenv("OPENTRONS_GIT_DIR", None)
if buildno:
normalize_opts = {"extra_tag": buildno}
else:
Expand Down
6 changes: 4 additions & 2 deletions notify-server/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
def get_version():
buildno = os.getenv("BUILD_NUMBER")
project = os.getenv("OPENTRONS_PROJECT", "robot-stack")
git_dir = os.getenv('OPENTRONS_GIT_DIR', None)
git_dir = os.getenv("OPENTRONS_GIT_DIR", None)
if buildno:
normalize_opts = {"extra_tag": buildno}
else:
normalize_opts = {}
return normalize_version("notify-server", project, git_dir=git_dir, **normalize_opts)
return normalize_version(
"notify-server", project, git_dir=git_dir, **normalize_opts
)


VERSION = get_version()
Expand Down
2 changes: 1 addition & 1 deletion robot-server/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
def get_version():
buildno = os.getenv("BUILD_NUMBER")
project = os.getenv("OPENTRONS_PROJECT", "robot-stack")
git_dir = os.getenv('OPENTRONS_GIT_DIR', None)
git_dir = os.getenv("OPENTRONS_GIT_DIR", None)
if buildno:
normalize_opts = {"extra_tag": buildno}
else:
Expand Down
2 changes: 1 addition & 1 deletion shared-data/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def _get_data_files(self):
def get_version():
buildno = os.getenv("BUILD_NUMBER")
project = os.getenv("OPENTRONS_PROJECT", "robot-stack")
git_dir = os.getenv('OPENTRONS_GIT_DIR', None)
git_dir = os.getenv("OPENTRONS_GIT_DIR", None)
if buildno:
normalize_opts = {"extra_tag": buildno}
else:
Expand Down