New distribution [0.5.3]

 * bugfix in Python <3.6
 * revised 3rdparty dependencies

Author: JarryShaw

Dockerfile

@@ -1,7 +1,7 @@
 # basic info
 FROM library/ubuntu
-LABEL version 0.5.2
-LABEL description "Ubuntu Environment"
+LABEL version 0.5.3
+LABEL description "Ubuntu Environment for F2FORMAT"
 
 # prepare environment
 ENV LANG "C.UTF-8"
@@ -10,13 +10,16 @@ ENV PYTHONIOENCODING "UTF-8"
 
 # install packages
 RUN apt-get update \
- && apt-get install --yes python3 python3-distutils \
+ && apt-get install --yes --no-install-recommends \
+        python3 \
+        python3-distutils \
  && rm -rf /var/lib/apt/lists/*
 
 # copy source
-COPY . /f2format
-RUN cd /f2format \
- && python3 /f2format/setup.py install
+COPY . /tmp/f2format
+RUN cd /tmp/f2format \
+ && python3 /f2format/setup.py install \
+ && rm -rf /tmp/f2fomat
 
 # cleanup
 RUN apt-get remove python3-distutils --yes \

Makefile

@@ -36,9 +36,8 @@ setup-formula: pipenv
 
 # update Python stdlib files
 setup-stdlib:
-	rm -f src/lib/token.py src/lib/tokenize.py
-	mkdir -p src/lib
-	cp -f $(token) $(tokenize) src/lib/
+	rm -f src/token.py src/tokenize.py
+	cp -f $(token) $(tokenize) src
 
 # update manpages
 setup-manpages:
@@ -97,7 +96,14 @@ docker-build: docker-prep
 	docker build --tag f2format:$(version) --tag f2format:latest release
 
 # make PyPI distribution
-dist-pypi: clean-pypi dist-macos dist-linux
+#dist-pypi: clean-pypi dist-macos dist-linux
+dist-pypi: clean-pypi dist-pypi-setup
+
+.ONESHELL:
+dist-pypi-setup:
+	set -ex
+	cd $(DIR)
+	python3 setup.py sdist bdist_wheel
 
 .ONESHELL:
 dist-macos:
@@ -113,8 +119,7 @@ dist-macos:
 dist-linux:
 	set -ex
 	cd $(DIR)/docker
-	sed "s/LABEL version.*/LABEL version $(shell date +%Y.%m.%d)/" Dockerfile > Dockerfile.tmp
-	mv Dockerfile.tmp Dockerfile
+	sed -i "s/LABEL version.*/LABEL version $(shell date +%Y.%m.%d)/" Dockerfile
 	docker-compose up --build
 
 # upload PyPI distribution
@@ -166,7 +171,7 @@ release:
 # run distribution process
 dist:
 	$(MAKE) message="$(message)" \
-		setup clean pypi git-tag \
+		setup clean pypi \
 		git-upload release setup-formula
 	$(MAKE) message="f2format: $(version)" DIR=Tap \
 		git-upload

Pipfile

@@ -4,18 +4,14 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-"pathlib2" = ">=2.3.2"
 parso = "~=0.4.0"
 tbtrim = ">=0.2.1"
 
 [dev-packages]
 f2format = {editable = true,path = "."}
-"autopep8" = "*"
-isort = {extras = ["pipfile", "requirements"],version = "*"}
 ipython = "*"
 homebrew-pypi-poet = "*"
 requests = "*"
-docutils = "*"
 
 [requires]
 python_version = "3.7"

docs/f2format.rst

@@ -6,8 +6,8 @@ f2format
 back-port compiler for Python 3.6 f-string literals
 ---------------------------------------------------
 
-:Version: v0.5.2
-:Date: April 07, 2019
+:Version: v0.5.3
+:Date: April 17, 2019
 :Manual section: 1
 :Author:
     Jarry Shaw, a newbie programmer, is the author, owner and maintainer

man/f2format.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH F2FORMAT 1 "April 07, 2019" "v0.5.2" ""
+.TH F2FORMAT 1 "April 17, 2019" "v0.5.3" ""
 .SH NAME
 f2format \- back-port compiler for Python 3.6 f-string literals
 .

setup-formula.py

@@ -21,10 +21,8 @@
 # print(F2FORMAT_URL)
 # print(F2FORMAT_SHA)
 
-PATHLIB2 = subprocess.check_output(['poet', 'pathlib2']).decode().strip()
 PARSO = subprocess.check_output(['poet', 'parso']).decode().strip()
 TBTRIM = subprocess.check_output(['poet', 'tbtrim']).decode().strip()
-# print(PATHLIB2)
 # print(PARSO)
 # print(TBTRIM)
 
@@ -43,26 +41,10 @@ class F2format < Formula
 
   {PARSO}
 
-  {PATHLIB2}
-
   {TBTRIM}
 
   def install
-    # virtualenv_install_with_resources
-    venv = virtualenv_create(libexec, "python3")
-
-    %w[parso tbtrim].each do |r|
-      venv.pip_install resource(r)
-    end
-
-    version = Language::Python.major_minor_version "python3"
-    if version =~ /3.[34]/
-      %w[pathlib2 six].each do |r|
-        venv.pip_install resource(r)
-      end
-    end
-    venv.pip_install_and_link buildpath
-
+    virtualenv_install_with_resources
     man1.install "man/f2format.1"
     bash_completion.install "comp/f2format.bash-completion"
   end

setup.py

@@ -13,7 +13,7 @@
     long_desc = file.read()
 
 # version string
-__version__ = '0.5.2'
+__version__ = '0.5.3'
 
 # set-up script for pip distribution
 setup(
@@ -34,9 +34,6 @@
         'parso~=0.4.0',     # universal AST support
         'tbtrim>=0.2.1',    # traceback trim support
     ],
-    extras_require={
-        ':python_version < "3.5"': ['pathlib2>=2.3.2'],
-    },
     py_modules=['f2format'],
     packages=['f2format'],
     entry_points={

src/__main__.py

@@ -24,14 +24,8 @@
     mp = multiprocessing
     del multiprocessing
 
-# backport compatibility
-if sys.version_info[:2] < (3, 5):
-    import pathlib2 as pathlib
-else:
-    import pathlib
-
 # version string
-__version__ = '0.5.2'
+__version__ = '0.5.3'
 
 # macros
 __cwd__ = os.getcwd()
@@ -61,7 +55,7 @@ def get_parser():
                                default=__f2format_version__, choices=PARSO_VERSION,
                                help='convert against Python version (%s)' % __f2format_version__)
 
-    parser.add_argument('file', nargs='*', metavar='SOURCE', default=__cwd__,
+    parser.add_argument('file', nargs='+', metavar='SOURCE', default=__cwd__,
                         help='python source files and folders to be converted (%s)' % __cwd__)
 
     return parser
@@ -99,15 +93,15 @@ def rename(path):
 
     # make archive directory
     if archive:
-        pathlib.Path(ARCHIVE).mkdir(parents=True, exist_ok=True)
+        os.makedirs(ARCHIVE, exist_ok=True)
 
     # fetch file list
     filelist = list()
     for path in sys.argv[1:]:
         if os.path.isfile(path):
             if archive:
                 dest = rename(path)
-                pathlib.Path(dest).parent.mkdir(parents=True, exist_ok=True)
+                os.makedirs(os.path.dirname(dest), exist_ok=True)
                 shutil.copy(path, dest)
             filelist.append(path)
         if os.path.isdir(path):
@@ -117,14 +111,14 @@ def rename(path):
 
     # check if file is Python source code
     def ispy(file): return (os.path.isfile(file) and (os.path.splitext(file)[1] in ('.py', '.pyw')))
-    filelist = set(filter(ispy, filelist))
+    filelist = sorted(filter(ispy, filelist))
 
     # if no file supplied
     if len(filelist) == 0:
         parser.error('argument PATH: no valid source file found')
 
     # process files
-    if mp is None:
+    if mp is None  or CPU_CNT <= 1:
         [f2format(filename) for filename in filelist]
     else:
         mp.Pool(processes=CPU_CNT).map(f2format, filelist)

src/core.py

@@ -3,7 +3,7 @@
 ###############################################################################
 import os   # noqa
 import sys  # noqa
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'lib'))  # noqa
+sys.path.insert(0, os.path.dirname(__file__))  # noqa
 ###############################################################################
 
 import collections.abc
@@ -16,6 +16,7 @@
 
 ###############################################################################
 sys.path.pop(0)
+del sys
 ###############################################################################
 
 __all__ = ['f2format', 'convert', 'ConvertError']
@@ -197,7 +198,7 @@ def f2format(filename):
     print('Now converting %r...' % filename)
 
     # fetch encoding
-    encoding = os.getenv('F2FORMAT_ENCODING', locale.getpreferredencoding())
+    encoding = os.getenv('F2FORMAT_ENCODING', LOCALE_ENCODING)
 
     lineno = dict()     # line number -> file offset
     content = list()    # file content