Merge pull request #3 from ganwell/master

Change to public documentation location

.gitlab-ci.yml

@@ -1,6 +1,6 @@
 before_script:
   - source /etc/profile
-  - git submodule update --init --recursive
+  - GIT_SSL_NO_VERIFY=true git submodule update --init --recursive
 
 stages:
   - doc
@@ -10,25 +10,19 @@ doc:
   stage: doc
   script:
     - pyenv local 3.5.1
-    - make all-deps
+    - make install
+    - make .deps/pytest .deps/hypothesis .deps/freeze .deps/testfixtures
     - make doc
-    - rsync -av --delete doc/_build/html/ [email protected]:/var/www/html/rochediag/pyaptly/
-
-test26:
-  stage: test
-  script:
-    - pyenv local 2.6.9
-    - make webserver
-    - make pytest-no-cov
+    - rsync -av --delete doc/_build/html/ [email protected]:/var/www/html/public/pyaptly/
 
 test27:
   stage: test
   script:
     - pyenv local 2.7.11
-    - make local-test
+    - make test-local
 
 test3:
   stage: test
   script:
     - pyenv local 3.5.1
-    - make local-test
+    - make test-local

CHANGELOG

@@ -5,6 +5,12 @@ CHANGELOG = [
         'date'    : "2016-05-06T19:40:42+0000",
         'author'  : "Jean-Louis Fuchs <[email protected]>",
         'changes' : [
+            "Merge pull request #2 from ganwell/master",
+            [
+                "https://github.com/adfinis-sygroup/pyaptly/pull/2",
+                "Semi-Automatic Release of deb and rpm Packages",
+            ],
+
             "Added CHANGELOG",
             [
                 "https://github.com/adfinis-sygroup/pyaptly/commit/9f8ea2e",

CHANGELOG.rst

@@ -11,6 +11,12 @@ Version 1.0.0
 released 2016-05-06T19:40:42+0000 by Jean-Louis Fuchs <[email protected]>:
 
 
+* Merge pull request #2 from ganwell/master
+
+ - https://github.com/adfinis-sygroup/pyaptly/pull/2
+ - Semi-Automatic Release of deb and rpm Packages
+
+
 * Added CHANGELOG
 
  - https://github.com/adfinis-sygroup/pyaptly/commit/9f8ea2e

README.rst

@@ -7,7 +7,7 @@ input files.
 
 Documentation_
 
-.. _Documentation: https://docs.adfinis-sygroup.ch/rochediag/pyaptly/
+.. _Documentation: https://docs.adfinis-sygroup.ch/public/pyaptly/
 
 Example commands
 ----------------

debian/changelog

@@ -1,5 +1,8 @@
 pyaptly (1.0.0-1) stable; urgency=low
 
+  * Merge pull request #2 from ganwell/master
+   - https://github.com/adfinis-sygroup/pyaptly/pull/2
+   - Semi-Automatic Release of deb and rpm Packages
   * Added CHANGELOG
    - https://github.com/adfinis-sygroup/pyaptly/commit/9f8ea2e
 

doc/conf.py

@@ -64,9 +64,14 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.0.1'
+__version__  = None
+version_file = "../pyaptly/version.py"
+with open(version_file) as f:
+    code = compile(f.read(), version_file, 'exec')
+    exec(code)
+version = __version__
 # The full version, including alpha/beta/rc tags.
-release = '0.0.1'
+release = __version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -116,7 +121,7 @@
 # -- Options for HTML output ----------------------------------------------
 html_context = {
     'source_url_prefix':
-    "https://git.adfinis-sygroup.ch/roche/pyaptly.src/blob/stable/doc/",
+    "https://github.com/adfinis-sygroup/pyaptly/tree/master/doc/",
     'source_suffix': ".rst",
 }
 # The theme to use for HTML and HTML Help pages.  See the documentation for

pyaptly/version.py

@@ -1,2 +1,2 @@
 """Version module to be read from various places"""
-__version__ = "1.0.0"  # pragma: no cover
+__version__ = "1.0.1"  # pragma: no cover