Resolve merge conflicts

askap-vast · Nov 7, 2024 · e145926 · e145926
2 parents abfd38d + 72869a8
commit e145926
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 #### Added
 
+#### Changed
+
+#### Fixed
+
+#### Removed
+
+#### List of PRs
+
+
+## [1.2.0](https://github.com/askap-vast/vast-pipeline/releases/v1.2.0) (2024-11-07)
+
+#### Added
+
 - Added configuration options to specify number of workers and maximum partition size for parallel operations. [#777](https://github.com/askap-vast/vast-pipeline/pull/777)
 - Added vast_pipeline.utils.delete_run.py to enable deletion of pipeline runs using raw SQL [#775](https://github.com/askap-vast/vast-pipeline/pull/775)
 

diff --git a/docs/theme/main.html b/docs/theme/main.html
@@ -35,7 +35,7 @@
   </style>
 
   <a href="{{ base_url }}/changelog/">
-     <strong> New in version 1.1.1:</strong> Refreshed docs, support for compressed fits files, python 3.10 and more 🧑‍💻. Check the <strong>release notes!</strong>
+     <strong> New in version 1.2.0:</strong> Specify number of cores and memory partitions via config, delete runs with SQL rather than django, memory optimisations and more 🧑‍💻. Check the <strong>release notes!</strong>
   </a>
 
 {% endblock %}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vast-pipeline",
-  "version": "1.1.1-dev",
+  "version": "1.2.0-dev",
   "description": "Vast Pipeline code base for processing and analysing telescope images from the Square Kilometre Pathfinder",
   "main": "gulpfile.js",
   "scripts": {

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "vast-pipeline"
-version = "v1.1.1-dev"
+version = "v1.2.0-dev"
 description = "Vast Pipeline code base for processing and analysing telescope images from the Square Kilometre Pathfinder"
 authors = ["The VAST Development Team"]
 license = "MIT"

diff --git a/vast_pipeline/_version.py b/vast_pipeline/_version.py
@@ -1 +1 @@
-__version__ = '1.1.1-dev'
+__version__ = '1.2.0-dev'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__version__ = '1.1.1-dev'
		__version__ = '1.2.0-dev'