ci changes

.gitignore

@@ -14,3 +14,6 @@ __pycache__
 *.local.*
 windows
 _build
+build
+dist
+*.egg-info

.gitlab-ci.yml

@@ -28,20 +28,27 @@ before_script:
 test:
   stage: test
   script:
-    - cd ADpy
+    - cd src  # TODO remove cd
     # - make test
     # TODO enable tests when it works
 
-# package:
-#   stage: build
-#   script:
-#     - make package
-#     - make doc
-#   artifacts:
-#     paths:
-#       - dist
-#       - doc/_build/html
-#     expire_in: 1 week
+package:
+  stage: build
+  script:
+    - make package
+  artifacts:
+    paths:
+      - dist
+    expire_in: 1 week
+
+docs:
+  stage: build
+  script:
+    - make doc
+    artifacts:
+      paths:
+        - doc/_build/html
+      expire_in: 1 week
 
 # deploy staging:
 #   stage: deploy

Makefile

+all: requirements test doc package
+
+requirements:
+	@pip3 install --user -r requirements.txt
+
+doc:
+	@export PYTHONPATH=`pwd`; cd doc; make html
+
+upload-doc:
+	# @cd doc; make upload
+
+package:
+	@python3 setup.py sdist --format=zip bdist_wininst --plat-name=win-amd64 && echo == Packages are ready in dist/ ==
+
+test:
+	python3 -m unittest discover -s src/tests
+
+.PHONY: test doc package all

setup.py

@@ -19,6 +19,16 @@ entry_points = """
 # fibonacci = adwin_control.skeleton:run
 """
 
+# Work around mbcs bug in distutils.
+# http://bugs.python.org/issue10945
+import codecs
+try:
+    codecs.lookup('mbcs')
+except LookupError:
+    ascii = codecs.lookup('utf-8')
+    func = lambda name, enc=ascii: {True: enc}.get(name=='mbcs')
+    codecs.register(func)
+
 
 def setup_package():
     needs_sphinx = {'build_sphinx', 'upload_docs'}.intersection(sys.argv)

src/Makefile

-all: test
-
-
-doc:
-	# @export PYTHONPATH=`pwd`; cd doc; make html
-
-upload-doc:
-	# @cd doc; make upload
-
-package:
-	# @python3 setup.py sdist bdist_wininst && echo == Packages are ready in dist/ ==
-
-test:
-	python3 -m unittest discover -s ./tests
-
-.PHONY: test