diff --git a/.gitignore b/.gitignore index 9db1d08..a7687c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,7 @@ github2gitlab.egg-info *.pyc +hub2lab.egg-info +build/ +dist/ +.eggs/ +.idea/ diff --git a/AUTHORS b/AUTHORS index 70c9bd3..6e35c86 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1 @@ -Loic Dachary -Loic Dachary +Pan Luo diff --git a/ChangeLog b/ChangeLog index 9a4a474..91bf181 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,85 +1,12 @@ CHANGES ======= -1.5.5 ------ - -* version 1.5.5 -* relax GitPython requirements -* version 1.5.4 -* relax request requirements - -1.5.3 ------ - -* version 1.5.3 -* reduce the number of branches by only pushing merge - -1.5.2 ------ - -* version 1.5.2 -* mirror: only update gitlab when it makes sense -* add --skip-pull-request to not mirror the pull requests -* have sh display output continuously -* restrict level control to the module -* switch from testtools to pytest -* fix flake8 errors -* allow tox arguments override -* integration tests need HOME to assert default key location -* rename pep8 tox env to flake8 -* fix merge_request_fail -* upgrade gitlab setup script to newer gitlab -* version 1.5.2 -* update the developer instructions in the README - -1.5.1 ------ - -* version 1.5.1 -* example script to setup a local gitlab -* relax pbr requirements -* fix integration tests example -* intergration tests must use the GitHub2GitLab.factory - -1.5.0 ------ - -* release 1.5.0 -* increase test verbosity -* make it python3 compatible - -1.4.0 ------ - -* release 1.4.0 -* add factory method -* more precise build instructions - -1.3.0 ------ - -* release 1.3.0 - -1.2.0 ------ - -* release 1.2.0 -* expose the argument parser -* add missing space between fetch refs -* Update merge requests if necessary, add --ignore-closed -* Implement conversion from github close + merge into gitlab merge -* Fix debug output -* add integration tests -* switch from urllib2 to requests - -1.0.0 ------ - -* update version -* encode utf-8 strings before calling urlencode -* fix example inconsistency -* First implementation -* Revert "tmp" -* tmp -* first commit +* Bump version to 1.5.6 +* Add --clean option and fix issue using gitlab token from others +* Add note in readme +* Add docker support +* Add support for https, token push and ssh key optional +* Add missing six dependency +* Strip out extract space +* Fix gitlab remote invalid url +* Original github2gitlab 1.5.5 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..76670ff --- /dev/null +++ b/Makefile @@ -0,0 +1,22 @@ +.PHONY: docs + +env: + pip install virtualenv && \ + virtualenv venv && \ + . venv/bin/activate && \ + make deps + +deps: + pip install -r requirements.txt + pip install -r test-requirements.txt + npm install + +clean: + find . -name '*.pyc' -exec rm -f {} \; + find . -name '*.pyo' -exec rm -f {} \; + find . -name '*~' -exec rm -f {} \; + +release: + python setup.py bdist_egg + python setup.py sdist + twine upload dist/* diff --git a/setup.cfg b/setup.cfg index e39ce70..0c550e3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,12 +1,12 @@ [metadata] -name = github2gitlab +name = hub2lab version = 1.5.6 summary = command line tool to migrate projects from GitHub to GitLab description-file = README.rst -author = Loic Dachary -author-email = loic@dachary.org -home-page = http://workbench.dachary.org/dachary/github2gitlab +author = Pan Luo +author-email = pan.luo@ubc.ca +home-page = https://github.com/ubc/github2gitlab classifier = Environment :: No Input/Output (Daemon) Intended Audience :: Information Technology diff --git a/setup.py b/setup.py index 538e0bc..f7676af 100644 --- a/setup.py +++ b/setup.py @@ -20,4 +20,6 @@ setuptools.setup( setup_requires=['d2to1', 'pbr'], - d2to1=True) + d2to1=True, + packages=setuptools.find_packages(exclude=['contrib', 'docs', 'tests']), +)