瀏覽代碼

Merge pull request #569 from tracim/develop

Bastien Sevajol 6 年之前
父節點
當前提交
ac50519c48
沒有帳戶連結到提交者的電子郵件
共有 2 個文件被更改,包括 6 次插入0 次删除
  1. 3 0
      tracim/setup.py
  2. 3 0
      uppgrade_caldavzap.sh

+ 3 - 0
tracim/setup.py 查看文件

@@ -59,6 +59,9 @@ setup(
59 59
     include_package_data=True,
60 60
     test_suite='nose.collector',
61 61
     tests_require=testpkgs,
62
+    extras_require={
63
+        'test': testpkgs,
64
+    },
62 65
     package_data={
63 66
         'tracim': [
64 67
             'i18n/*/LC_MESSAGES/*.mo',

+ 3 - 0
uppgrade_caldavzap.sh 查看文件

@@ -1,9 +1,12 @@
1 1
 #!/usr/bin/env bash
2
+
2 3
 read -p "Delete actual tracim/tracim/public/caldavzap folder? " -n 1 -r
3 4
 echo    # (optional) move to a new line
5
+
4 6
 if [[ $REPLY =~ ^[Yy]$ ]]
5 7
 then
6 8
     rm -r tracim/tracim/public/caldavzap
7 9
 fi
10
+
8 11
 git clone https://github.com/algoo/caldavzap.git tracim/tracim/public/caldavzap
9 12
 rm -rf tracim/tracim/public/caldavzap/.git