Main (#24)

* Update build.yml - added conditions for PR * bump version to 0.0.2 * Deploying * Deploying * bump version to 1.0.0-rc0 * Deploying * bump version to 1.0.0-rc1 * bump version to 1.0.0 * Release/1.0.1 (#23) * reverted back to build on all branches * Version bump commons (#20) * Main (#22) * Update build.yml - added conditions for PR * bump version to 0.0.2 * Deploying * Deploying * bump version to 1.0.0-rc0 * Deploying * bump version to 1.0.0-rc1 * bump version to 1.0.0 --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: cqbanh <[email protected]> * Update to utilize new commons (#21) * Update terraform to make PCM release tags optional * Update submit_to_sds to utilize new auto version selection * Fix tests * bumping version to 1.0.1 * bump version to 1.0.1-alpha1 * Update CHANGE * Update push on branches * bump version to 1.0.1-rc0 * bump version to 1.0.1-rc1 --------- Co-authored-by: Josh Garde <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: cqbanh <[email protected]> Co-authored-by: Curtis Banh <curtis.q.banhjpl.nasa.gov> * bump version to 1.0.1 * Update bumpver.toml --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: cqbanh <[email protected]> Co-authored-by: Josh Garde <[email protected]>
podaac · Jun 14, 2024 · 6eeaafa · 6eeaafa
1 parent a8ef097
commit 6eeaafa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGE b/CHANGE
@@ -1,3 +1,7 @@
+<<<<<<< main
+Version 1.0.1
+=======
 podaac/swodlr-ingest-to-sds deployment 
 podaac/swodlr-ingest-to-sds deployment 
 podaac/swodlr-ingest-to-sds deployment 
+>>>>>>> develop
diff --git a/bumpver.toml b/bumpver.toml
@@ -1,5 +1,5 @@
 [bumpver]
-current_version = "1.0.2-alpha0"
+current_version = "1.0.1"
 version_pattern = "MAJOR.MINOR.PATCH[-TAGNUM]"
 commit = true
 tag = true

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "swodlr-ingest-to-sds"
-version = "1.0.2-alpha0"
+version = "1.0.1"
 description = "A system for ingesting input products for the SWOT SDS"
 authors = ["podaac-tva <[email protected]>"]
 license = "Apache-2.0"