From c3309e637c64dd88d360e6a7c0de5c190a3e4764 Mon Sep 17 00:00:00 2001
From: Samuel Burbulla <samuel.burbulla@mathematik.uni-stuttgart.de>
Date: Fri, 4 Dec 2020 12:22:12 +0100
Subject: [PATCH] Checkout in removeFiles.
---
bin/dunepackaging.py | 22 +++-------------------
1 file changed, 3 insertions(+), 19 deletions(-)
diff --git a/bin/dunepackaging.py b/bin/dunepackaging.py
index 774b1b5aa..625f86a90 100755
--- a/bin/dunepackaging.py
+++ b/bin/dunepackaging.py
@@ -57,11 +57,12 @@ def main(argv):
print("Remove generated files: " + ", ".join(files))
remove = ['rm', '-rf'] + files
subprocess.call(remove)
+ # checkout setup.py and pyproject.toml
+ checkout = ['git', 'checkout', 'setup.py', 'pyproject.toml']
+ subprocess.call(checkout)
if clean:
removeFiles()
- checkout = ['git', 'checkout', 'setup.py', 'pyproject.toml']
- subprocess.call(checkout)
sys.exit(2)
data, cmake_flags = metaData(version, dependencyCheck=False)
@@ -69,15 +70,6 @@ def main(argv):
if version is None:
version = data.version
- # Store current setup.py and pyproject.toml
- if upload:
- try:
- subprocess.call(['cp', 'setup.py', 'setup.py.old'])
- subprocess.call(['cp', 'pyproject.toml', 'pyproject.toml.old'])
- print("Stored setup.py and pyproject.toml")
- except:
- pass
-
# Generate setup.py
print("Generate setup.py")
f = open("setup.py", "w")
@@ -138,14 +130,6 @@ def main(argv):
removeFiles()
- # Restore old setup.py and pyproject.toml
- try:
- print("Restore setup.py and pyproject.toml")
- subprocess.call(['mv', 'setup.py.old', 'setup.py'])
- subprocess.call(['mv', 'pyproject.toml.old', 'pyproject.toml'])
- except:
- pass
-
if __name__ == "__main__":
main(sys.argv[1:])
--
GitLab