Skip to content

Commit

Permalink
Tidy Up
Browse files Browse the repository at this point in the history
  • Loading branch information
cole-wilson committed Apr 25, 2021
1 parent 565b981 commit 6bd69b5
Show file tree
Hide file tree
Showing 32 changed files with 1,473 additions and 1,223 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/sailboat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
include:
- os: ubuntu-latest
artifact_path: ./dist/*/*
builds: homebrew pyinstaller build_docs_readme setcodeversion workflow pypi
builds: homebrew pyinstaller build_docs_readme setcodeversion actions pypi
asset_name: default
glob: true

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ a
poetry.lock
pyproject.toml
.env
dev/
../../Desktop/sailboattest/test/

# Distribution / packaging
.Python
Expand Down
2 changes: 2 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/dictionaries/colewilson.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/sailboat.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ further defined and clarified by project maintainers.
### Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
reported by contacting the project team at [coc@colewilson.xyz](mailto:coc@colewilson.xyz).All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Expand Down
11 changes: 9 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
Copyright 2020 Cole Wilson and other contributors

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
OR OTHER DEALINGS IN THE SOFTWARE.
14 changes: 7 additions & 7 deletions dist/homebrew/Sailboat.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Created with sailboat, the Python releaser

# v0.25.1+bd7483b.1
# v0.25.5+565b981.1

class Sailboat < Formula
include Language::Python::Virtualenv
Expand Down Expand Up @@ -30,20 +30,20 @@ class Sailboat < Formula
sha256 "27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"
end
resource "setuptools" do
url "https://files.pythonhosted.org/packages/f6/1c/1a76007a43500cbd118b126107e88fbfd59bbcdef276ade5175f7698e618/setuptools-54.1.0.tar.gz"
sha256 "36bc07925c77dd6e30c64c91c2d080212a46910aa79073990c11d4c48a006240"
url "https://files.pythonhosted.org/packages/f6/e9/19af16328705915233299f6f1f02db95899fb00c75ac9da4757aa1e5d1de/setuptools-56.0.0.tar.gz"
sha256 "08a1c0f99455307c48690f00d5c2ac2c1ccfab04df00454fef854ec145b81302"
end
resource "twine" do
url "https://files.pythonhosted.org/packages/f9/43/51c3139667e90399a4d7886013631ad020ad102db5c2907cb240ce56f3c1/twine-3.3.0.tar.gz"
sha256 "fcffa8fc37e8083a5be0728371f299598870ee1eccc94e9a25cef7b1dcfa8297"
url "https://files.pythonhosted.org/packages/ac/5c/e12811190a3560c85dfb4caea752635abea59c53390592493549d88f086a/twine-3.4.1.tar.gz"
sha256 "a56c985264b991dc8a8f4234eb80c5af87fa8080d0c224ad8f2cd05a2c22e83b"
end
resource "colorama" do
url "https://files.pythonhosted.org/packages/1f/bb/5d3246097ab77fa083a61bd8d3d527b7ae063c7d8e8671b1cf8c4ec10cbe/colorama-0.4.4.tar.gz"
sha256 "5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"
end
resource "enlighten" do
url "https://files.pythonhosted.org/packages/ad/3c/af2df7f0fe7e8c56ca6a7de0b7eb4d3a97181714410c5cd291d0283bcf59/enlighten-1.8.0.tar.gz"
sha256 "1cb098a1f6acb7a80cb9c98ca35671b12a0abca276344112e9180aef29edb0bc"
url "https://files.pythonhosted.org/packages/cf/3f/f0e005fea4a5216423369250167263a7e2fba5b0c72d7e97ec9e54d80ac1/enlighten-1.9.0.tar.gz"
sha256 "539cc308ccc0c3bfb50feb1b2da94c1a1ac21e80fe95e984221de8966d48f428"
end
resource "blessed" do
url "https://files.pythonhosted.org/packages/68/c7/5f21c1b0e7f343bad166c3139e594639cd54e9b97db7760dff035b35065e/blessed-1.18.0.tar.gz"
Expand Down
42 changes: 42 additions & 0 deletions dist/pyinstaller/Sailboat.app/Contents/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en-US</string>

<!-- Executable Name:-->
<key>CFBundleExecutable</key>
<string>Sailboat</string>

<!-- Icon File-->
<key>CFBundleIconFile</key>
<string>icon.icns</string>

<!-- Bundle ID-->
<key>CFBundleIdentifier</key>
<string>xyz.colewilson.sailboat</string>

<!-- Versions-->
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleVersion</key>
<string>0.25.5</string>
<key>CFBundleShortVersionString</key>
<string>0.25.5</string>

<!-- Names-->
<key>CFBundleName</key>
<string>sailboat</string>
<key>CFBundleDisplayName</key>
<string>Sailboat</string>

<!-- Other-->
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
</dict>
</plist>
Binary file not shown.
Binary file added dist/pyinstaller/sailboat-0.25.5-macos.dmg
Binary file not shown.
Binary file removed dist/pypi/sailboat-0.25.1-py3-none-any.whl
Binary file not shown.
Binary file removed dist/pypi/sailboat-0.25.1.tar.gz
Binary file not shown.
Binary file added dist/pypi/sailboat-0.25.5-py3-none-any.whl
Binary file not shown.
Binary file added dist/pypi/sailboat-0.25.5.tar.gz
Binary file not shown.
28 changes: 14 additions & 14 deletions sailboat.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ name = "Sailboat"
short_name = "sailboat"
email = "cole@colewilson.xyz"
short_description = "A quick and easy way to distribute your Python projects!"
description = ""
description = "Sailboat is a Python developer's best friend. It's a Python build tool that can do anything you need it to!"
url = "https://github.com/cole-wilson/sailboat"
keywords = ""
keywords = "sail package python setup.py sailboat shipsnake distribute ship snake snek release build"
license = "MIT"
latest_build = "0.25.1+bd7483b.1"
latest_build = "0.25.5+565b981.1"
author = "Cole Wilson"
latest_release = "0.25.1"
release-notes = "Emergency patch for error in sys.argv :rotating_light:"
Expand All @@ -36,7 +36,7 @@ no_import = [ "shutil", "pathlib", "re", "os", "glob", "pkg_resources", "traceba
[build.homebrew]

[build.pyinstaller]
_run = false
_run = true
type = 1
mac = true
windows = true
Expand All @@ -47,7 +47,7 @@ bundle_id = "xyz.colewilson.sailboat"

[build.setcodeversion]

[build.workflow]
[build.actions]

[build.pypi.commands]
sail = "__main__.main"
Expand All @@ -61,19 +61,19 @@ ssssailboat = "__main__.main"

[build.pypi.entry_points.sailboat_plugins]
quickstart = "sailboat.core:QuickStart"
pypi = "sailboat.builders:PyPi"
homebrew = "sailboat.builders:Homebrew"
pyinstaller = "sailboat.builders:PyInstaller"
dev = "sailboat.core:Develop"
release = "sailboat.core:Release"
build = "sailboat.build:Build"
wizard = "sailboat.core:Wizard"
remove = "sailboat.core:Remove"
add = "sailboat.core:Add"
git = "sailboat.core:Git"
dev = "sailboat.core:Develop"
release = "sailboat.core:Release"
plugins = "sailboat.core:ManagePlugins"
wizard = "sailboat.core:Wizard"
build = "sailboat.build:Build"
pypi = "sailboat.builders:PyPi"
homebrew = "sailboat.builders:Homebrew"
pyinstaller = "sailboat.builders:PyInstaller"
actions = "sailboat.builders:Actions"
tasks = "sailboat.other:Tasks"
workflow = "sailboat.builders:Actions"
github = "sailboat.core:Git"
build_docs_readme = "sailboat.other:BuildDocs"
setcodeversion = "sailboat.other:SetVersion"

Expand Down
11 changes: 9 additions & 2 deletions sailboat/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
Copyright 2020 Cole Wilson and other contributors

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
OR OTHER DEALINGS IN THE SOFTWARE.
Loading

0 comments on commit 6bd69b5

Please sign in to comment.