merge develop branch to prepare for release

adambonneruk · Aug 17, 2023 · 2665d85 · 2665d85
2 parents 982a827 + 375f41a
commit 2665d85
Show file tree

Hide file tree

Showing 46 changed files with 1,415 additions and 252 deletions.
diff --git a/.gitignore b/.gitignore
@@ -163,4 +163,5 @@ cython_debug/
 .vscode/
 
 # Installer/.exe Releases
-installer/release/
+installer/release/
+*.exe
diff --git a/.images/installer-1-welcome.png b/.images/installer-1-welcome.png
diff --git a/.images/installer-2-licence.png b/.images/installer-2-licence.png
diff --git a/.images/installer-3-location.png b/.images/installer-3-location.png
diff --git a/.images/installer-4-components.png b/.images/installer-4-components.png
diff --git a/.images/installer-5-complete.png b/.images/installer-5-complete.png
diff --git a/.images/screenshot-linux-about.png b/.images/screenshot-linux-about.png
diff --git a/.images/screenshot-linux-debian-docker.png b/.images/screenshot-linux-debian-docker.png
diff --git a/.images/screenshot-linux-menu.png b/.images/screenshot-linux-menu.png
diff --git a/.images/screenshot-linux-options.png b/.images/screenshot-linux-options.png
diff --git a/.images/screenshot-linux-options_error.png b/.images/screenshot-linux-options_error.png
diff --git a/.images/screenshot-linux-options_warn.png b/.images/screenshot-linux-options_warn.png
diff --git a/.images/screenshot-linux-ubuntu-docker.png b/.images/screenshot-linux-ubuntu-docker.png
diff --git a/.images/screenshot-linux.png b/.images/screenshot-linux.png
diff --git a/.images/screenshot-macOS-about.png b/.images/screenshot-macOS-about.png
diff --git a/.images/screenshot-macOS-menu.png b/.images/screenshot-macOS-menu.png
diff --git a/.images/screenshot-macOS-options.png b/.images/screenshot-macOS-options.png
diff --git a/.images/screenshot-macOS.png b/.images/screenshot-macOS.png
diff --git a/.images/screenshot-win10-about.png b/.images/screenshot-win10-about.png
diff --git a/.images/screenshot-win10-menu.png b/.images/screenshot-win10-menu.png
diff --git a/.images/screenshot-win10-options.png b/.images/screenshot-win10-options.png
diff --git a/.images/screenshot-win10.png b/.images/screenshot-win10.png
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,8 @@
+FROM python:3
+
+WORKDIR /opt/python/unique
+COPY src/unique.py /opt/python/unique
+ADD src/colour/ /opt/python/unique/colour
+ADD src/ulid/ /opt/python/unique/ulid
+
+ENTRYPOINT [ "python", "unique.py" ]