Update scripts (#34)

* Apply black formatting to setup.py and __init__.py * Update scripts * Add version in __init__.py * Update git_tag.sh
JeffLIrion · Oct 20, 2023 · 9ef4080 · 9ef4080
1 parent c0dd498
commit 9ef4080
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 31 deletions.
diff --git a/graphslam/__init__.py b/graphslam/__init__.py
@@ -4,5 +4,4 @@
 
 """
 
-
-__version__ = '0.0.8'
+__version__ = "0.0.8"
diff --git a/scripts/bumpversion.sh b/scripts/bumpversion.sh
@@ -25,10 +25,10 @@ VERSION=$($DIR/get_version.sh)
 echo "Bumping the version from $VERSION to $1"
 
 # __init__.py
-sed -i "s|__version__ = '$VERSION'|__version__ = '$1'|g" $DIR/../$PACKAGE/__init__.py
+sed -i "s|__version__ = \"$VERSION\"|__version__ = \"$1\"|g" $DIR/../$PACKAGE/__init__.py
 
 # setup.py
-sed -i "s|version='$VERSION',|version='$1',|g" $DIR/../setup.py
+sed -i "s|version=\"$VERSION\",|version=\"$1\",|g" $DIR/../setup.py
 
 # conf.py
 sed -i "s|version = '$VERSION'|version = '$1'|g" $DIR/../docs/source/conf.py

diff --git a/scripts/get_package_name.sh b/scripts/get_package_name.sh
@@ -5,11 +5,11 @@ set -e
 # get the directory of this script
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-RSTRIP="'*"
-LSTRIP="*'"
+RSTRIP='"*'
+LSTRIP='*"'
 
 # get the package name
-PACKAGE_LINE=$(grep 'name=' $DIR/../setup.py || echo '')
+PACKAGE_LINE=$(grep "name=" $DIR/../setup.py || echo '')
 PACKAGE_TEMP=${PACKAGE_LINE%$RSTRIP}
 PACKAGE=${PACKAGE_TEMP##$LSTRIP}
 

diff --git a/scripts/get_version.sh b/scripts/get_version.sh
@@ -5,15 +5,15 @@ set -e
 # get the directory of this script
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-RSTRIP="'*"
-LSTRIP="*'"
+RSTRIP='"*'
+LSTRIP='*"'
 
 # get the package name
 PACKAGE=$($DIR/get_package_name.sh)
 
 # get the current version
-VERSION_LINE=$(grep '__version__' "$DIR/../$PACKAGE/__init__.py" || echo '')
-VERSION_TEMP=${VERSION_LINE%"'"}
+VERSION_LINE=$(grep "__version__" "$DIR/../$PACKAGE/__init__.py" || echo '')
+VERSION_TEMP=${VERSION_LINE%'"'}
 
 VERSION=${VERSION_TEMP##$LSTRIP}
 

diff --git a/scripts/git_tag.sh b/scripts/git_tag.sh
@@ -3,9 +3,6 @@
 # get the directory of this script
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-# get the package name
-PACKAGE=$($DIR/get_package_name.sh)
-
 # get the current version
 VERSION=$($DIR/get_version.sh)
 

diff --git a/setup.py b/setup.py
@@ -7,24 +7,34 @@
 
 from setuptools import setup
 
-with open('README.rst') as f:
-    readme = f.read().replace(':math:', '').replace('\\mathbb{R}', 'R').replace('.. image::                                                                                  ', '.. image:: https://raw.githubusercontent.com/JeffLIrion/python-graphslam/master/docs/source/')
+with open("README.rst") as f:
+    readme = (
+        f.read()
+        .replace(":math:", "")
+        .replace("\\mathbb{R}", "R")
+        .replace(
+            ".. image::                                                                                  ",
+            ".. image:: https://raw.githubusercontent.com/JeffLIrion/python-graphslam/master/docs/source/",
+        )
+    )
 
 setup(
-    name='graphslam',
-    version='0.0.8',
-    description='Graph SLAM solver in Python',
+    name="graphslam",
+    version="0.0.8",
+    description="Graph SLAM solver in Python",
     long_description=readme,
-    keywords=['graphslam', 'slam', 'graph', 'optimization', 'mapping'],
-    url='https://github.com/JeffLIrion/python-graphslam',
-    license='MIT',
-    author='Jeff Irion',
-    author_email='jefflirion@users.noreply.github.com',
-    packages=['graphslam', 'graphslam.pose', 'graphslam.edge'],
-    install_requires=['numpy', 'scipy'],
-    tests_require=['matplotlib'],
-    classifiers=['License :: OSI Approved :: MIT License',
-                 'Operating System :: OS Independent',
-                 'Programming Language :: Python :: 3'],
-    test_suite='tests'
+    keywords=["graphslam", "slam", "graph", "optimization", "mapping"],
+    url="https://github.com/JeffLIrion/python-graphslam",
+    license="MIT",
+    author="Jeff Irion",
+    author_email="jefflirion@users.noreply.github.com",
+    packages=["graphslam", "graphslam.pose", "graphslam.edge"],
+    install_requires=["numpy", "scipy"],
+    tests_require=["matplotlib"],
+    classifiers=[
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python :: 3",
+    ],
+    test_suite="tests",
 )