rebase B

maxjcohen · Jan 5, 2021 · 0102cc9 · 0102cc9
2 parents 5351d21 + 27a9c3b
commit 0102cc9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -0,0 +1,8 @@
+[bumpversion]
+current_version = 1.0.0
+commit = True
+tag = True
+
+[bumpversion:file:setup.py]
+
+[bumpversion:file:scripts/deploy.ps1]
diff --git a/scripts/deploy.ps1 b/scripts/deploy.ps1
@@ -0,0 +1,5 @@
+python setup.py sdist bdist_wheel
+$version="1.0.0"
+$files_to_handle_str="dist/time_series_transformer-$version*" 
+twine check $files_to_handle_str
+twine upload $files_to_handle_str
diff --git a/setup.py b/setup.py
@@ -4,10 +4,17 @@
     long_description = fh.read()
 
 setuptools.setup(
+<<<<<<< HEAD
     name="tst",
     version="0.3.0",
     author="Max Cohen",
     author_email="[email protected]",
+=======
+    name="time_series_transformer",
+    version="1.0.0",
+    author="Daniel Kaminski de Souza",
+    author_email="[email protected]",
+>>>>>>> 27a9c3b58c74a1217403b8e008d275bd0e8ac3c5
     description="Time Series Transformer",
     long_description=long_description,
     long_description_content_type="text/markdown",