Skip to content

Commit

Permalink
Ah the joys of python packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
kfields committed Mar 27, 2020
1 parent 2883985 commit e054e83
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 5 deletions.
5 changes: 5 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
include LICENSE
include README.md

# Assets
recursive-include assets *
3 changes: 2 additions & 1 deletion badwing/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
# Keep this if you want this package in the wheel! ;p
from badwing.version import __version__ as version
__version__ = version
3 changes: 2 additions & 1 deletion badwing/assets.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import os
import zipfile

assets_dir = os.path.join(os.path.abspath(os.path.dirname(__file__)), '../assets')
#assets_dir = os.path.join(os.path.abspath(os.path.dirname(__file__)), '../assets')
assets_dir = None
# print(assets_dir)

def asset(filename):
Expand Down
7 changes: 6 additions & 1 deletion badwing/commands/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,10 @@ def cli(ctx):

@cli.command()
@click.pass_context
def run(ctx):
def dev(ctx):
main()

@cli.command()
@click.pass_context
def run(ctx):
main(True)
8 changes: 7 additions & 1 deletion badwing/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
import arcade
import pymunk

from badwing import __version__
import badwing.app
import badwing.assets
from badwing.constants import *
from badwing.player import Player
from badwing.levels.level1 import Level
Expand Down Expand Up @@ -41,7 +43,11 @@ def on_update(self, dt):
self.player.update(dt)
self.level.update(dt)

def main():
def main(production=False):
if not production:
badwing.assets.assets_dir = os.path.join(os.path.abspath(os.path.dirname(__file__)), '../assets')
else:
badwing.assets.assets_dir = os.path.join(os.path.abspath(os.path.dirname(__file__)), f'../../badwing-{__version__}.data/data/assets')
""" Main method """
window = MyGame()
window.setup()
Expand Down
1 change: 1 addition & 0 deletions badwing/version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = "0.1.dev26"
9 changes: 9 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# pyproject.toml

# For future use I guess ...

[build-system]
requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4"]

[tool.setuptools_scm]
write_to = "pkg/version.py"
12 changes: 11 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import os

from setuptools import setup, find_packages

with open("README.md", "r") as fh:
Expand All @@ -6,12 +8,20 @@
with open('requirements.txt') as f:
requirements = f.read().splitlines()

datadir = 'assets'
data_files = [(d, [os.path.join(d,f) for f in files])
for d, folders, files in os.walk(datadir)]

setup(
name='badwing',
packages=find_packages(),
include_package_data=True,
data_files=data_files,
use_scm_version = {
"local_scheme": "no-local-version"
"local_scheme": "no-local-version",
'write_to': 'badwing/version.py',
'write_to_template': '__version__ = "{version}"',
'tag_regex': r'^(?P<prefix>v)?(?P<version>[^\+]+)(?P<suffix>.*)?$'
},
setup_requires=['setuptools_scm'],

Expand Down

0 comments on commit e054e83

Please sign in to comment.