move package and tests to root

Scondo · Sep 30, 2016 · 810aad8 · 810aad8
1 parent 449aa00
commit 810aad8
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,4 +14,5 @@ code/png/pngfilters.c
 code/png/pngfilters.html
 # Compiled filters
 code/png/pngfilters.pyd
-code/png/*pngfilters*.so
+code/png/*pngfilters*.so
+/purepng.egg-info
diff --git a/.travis.yml b/.travis.yml
@@ -44,7 +44,7 @@ before_script:
 script:
   # Will be built if cython installed
   - python setup.py build_ext --inplace --force
-  - nosetests code --with-coverage --cover-package=png
+  - nosetests --with-coverage --cover-package=png
 
 after_success:
   coveralls

diff --git a/code/ExtraSuite.tgz → ExtraSuite.tgz b/code/ExtraSuite.tgz → ExtraSuite.tgz
diff --git a/code/PngSuite-2013jan13.tgz → PngSuite-2013jan13.tgz b/code/PngSuite-2013jan13.tgz → PngSuite-2013jan13.tgz
diff --git a/appveyor.yml b/appveyor.yml
@@ -66,7 +66,7 @@ build: false
 
 test_script:
   # run the project tests
-  - "%CMD_IN_ENV% nosetests code/test_png.py"
+  - "%CMD_IN_ENV% nosetests test_png.py"
   #- "if %py_minor% GEQ 6 %CMD_IN_ENV% nosetests code/test_png.py --with-coverage --cover-package=png"
   #- "if %py_minor% LSS 6 %CMD_IN_ENV% nosetests code/test_png.py"
 

diff --git a/code/png/PngImagePlugin.py → png/PngImagePlugin.py b/code/png/PngImagePlugin.py → png/PngImagePlugin.py
@@ -27,7 +27,7 @@
 from PIL import Image, ImageFile
 import array
 import png
-__version__ = "0.1.0"
+__version__ = "0.3.0"
 
 
 try:

diff --git a/code/png/__init__.py → png/__init__.py b/code/png/__init__.py → png/__init__.py
diff --git a/code/png/png.py → png/png.py b/code/png/png.py → png/png.py
@@ -170,7 +170,7 @@
     # On Python 3 there is no imap, but map works like imap instead
     pass
 
-__version__ = "0.2.0"
+__version__ = "0.3.0"
 __all__ = ['png_signature', 'Image', 'Reader', 'Writer',
            'Error', 'FormatError', 'ChunkError',
            'Filter', 'register_extra_filter',

diff --git a/code/png/pngfilters.pxd → png/pngfilters.pxd b/code/png/pngfilters.pxd → png/pngfilters.pxd
diff --git a/code/pngsuite.py → pngsuite.py b/code/pngsuite.py → pngsuite.py
diff --git a/setup.py b/setup.py
@@ -89,7 +89,7 @@ def do_unimport(folder=''):
 
 
 def get_version():
-    for line in open(join(dirname(__file__), 'code', 'png', 'png.py')):
+    for line in open(join(dirname(__file__), 'png', 'png.py')):
         if '__version__' in line:
             version = line.split('"')[1]
             break
@@ -116,7 +116,7 @@ def get_version():
     author='Pavel Zlatovratskii',
     author_email='scondo@mail.ru',
     url='https://github.com/scondo/purepng',
-    package_dir={'png': join('code', 'png')},
+    package_dir={'png': 'png'},
     packages=['png'],
     classifiers=[
       'Topic :: Multimedia :: Graphics',
@@ -131,6 +131,7 @@ def get_version():
       'Programming Language :: Python :: 3.2',
       'Programming Language :: Python :: 3.3',
       'Programming Language :: Python :: 3.4',
+      'Programming Language :: Python :: 3.5',
       'Programming Language :: Python :: Implementation :: CPython',
       'Programming Language :: Python :: Implementation :: Jython',
       'Programming Language :: Python :: Implementation :: PyPy',

diff --git a/code/test_Pil.py → test_Pil.py b/code/test_Pil.py → test_Pil.py
@@ -236,7 +236,8 @@ def runTest(self):
         # Save via PurePNG
         reload(purepng)
         pure_file = BytesIO()
-        pure_file.name = type(self).__name__
+        # PIL save new named file instead of write to BytesIO
+        # pure_file.name = type(self).__name__
         im_orig.save(pure_file, 'PNG')
         # Load again, plugin unimportant after read test
         pure_file.seek(0)

diff --git a/code/test_png.py → test_png.py b/code/test_png.py → test_png.py
diff --git a/unimport.py b/unimport.py
@@ -2,4 +2,4 @@
 from setup import do_unimport
 
 if __name__ == "__main__":
-    do_unimport('code/png')
+    do_unimport('png')