diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list index 8a4d033..40834ef 100644 --- a/.sandstorm/sandstorm-files.list +++ b/.sandstorm/sandstorm-files.list @@ -38,7 +38,6 @@ usr/bin/uwsgi usr/bin/uwsgi-core usr/bin/which usr/lib/locale/C.UTF-8/LC_CTYPE -usr/lib/locale/locale-archive usr/lib/ssl/openssl.cnf usr/lib/uwsgi/plugins/python39_plugin.so usr/lib/uwsgi/plugins/python3_plugin.so diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index ee4d804..99cfa19 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -7,8 +7,8 @@ const pkgdef :Spk.PackageDefinition = ( manifest = ( appTitle = (defaultText = "Baby Buddy"), - appVersion = 2, # Increment this for every release. - appMarketingVersion = (defaultText = "1.4.0"), + appVersion = 3, # Increment this for every release. + appMarketingVersion = (defaultText = "1.5.0"), actions = [ ( nounPhrase = (defaultText = "instance"), command = .firstRunCommand @@ -27,7 +27,7 @@ const pkgdef :Spk.PackageDefinition = ( license = (openSource = bsd2Clause), categories = [productivity, other], author = ( - contactEmail = "wells@chrxs.net", + contactEmail = "babybuddy-sandstorm@chris-wells.net", pgpSignature = embed "pgp-signature", ), pgpKeyring = embed "pgp-keyring", @@ -52,7 +52,7 @@ const pkgdef :Spk.PackageDefinition = ( ), fileList = "sandstorm-files.list", alwaysInclude = [ "opt/app/babybuddy", "usr/lib/python3", - "usr/lib/python3.7", "usr/share/zoneinfo", + "usr/lib/python3.9", "usr/share/zoneinfo", "usr/share/locale" ], bridgeConfig = ( viewInfo = ( diff --git a/README.md b/README.md index eeec5ab..06eab67 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ app for [Sandstorm](https://sandstorm.io/). ## App Version History +- v3: [Baby Buddy 1.5.0](https://github.com/babybuddy/babybuddy/releases/tag/v1.5.0) - v2: [Baby Buddy 1.4.0](https://github.com/babybuddy/babybuddy/releases/tag/v1.4.0) - v1: [Baby Buddy 1.3.4](https://github.com/babybuddy/babybuddy/releases/tag/v1.3.4) - v0: [Baby Buddy 1.3.0](https://github.com/babybuddy/babybuddy/releases/tag/v1.3.0) diff --git a/clean-sandstorm-files.sh b/clean-sandstorm-files.sh index a070235..66c5d1e 100755 --- a/clean-sandstorm-files.sh +++ b/clean-sandstorm-files.sh @@ -7,7 +7,7 @@ # Paths with the following directories are removed from the file: # - opt/app/babybuddy # - usr/lib/python3 -# - usr/lib/python3.7 +# - usr/lib/python3* # # This script should be run from the repo root. diff --git a/sandstorm.patch b/sandstorm.patch index 5f5e030..ba301ea 100644 --- a/sandstorm.patch +++ b/sandstorm.patch @@ -1,8 +1,8 @@ diff --git a/Pipfile b/Pipfile -index 62a51bb..26cd24f 100644 +index 14851a9..b3454b7 100644 --- a/Pipfile +++ b/Pipfile -@@ -13,12 +13,12 @@ faker = "*" +@@ -12,7 +12,6 @@ faker = "*" dj-database-url = "*" gunicorn = "*" whitenoise = "*" @@ -10,8 +10,10 @@ index 62a51bb..26cd24f 100644 easy-thumbnails = "*" python-dotenv = "*" django-storages = "*" - boto3 = "*" +@@ -20,6 +19,7 @@ boto3 = "*" django-import-export = "*" + pyyaml = "*" + uritemplate = "*" +django-sandstorm = {editable = true,git = "https://github.com/cdubz/django-sandstorm.git"} [dev-packages]