prepare for 1.0rc14

gijzelaerr · gijzelaerr · commit b55ca907372b · 2018-06-29T17:11:45.000+02:00
diff --git a/.dockerignore b/.dockerignore
@@ -3,10 +3,11 @@
 .gitignore
 .idea
 .ipynb_checkpoints
-.virtualenv
-.virtualenv3
+.virtualenv/
+.virtualenv3/
 .tox
 tmp
 build
 dist
-*.egg-info
+*.egg-info/
+.eggs/
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+1.0rc14
+=======
+
+* Dev servers were accidentally enabled for 1.0rc13
+
 1.0rc13
 =======
 
diff --git a/Makefile b/Makefile
@@ -99,7 +99,7 @@ dockers:
 	for i in `ls docker/Dockerfile*`; do echo "*** $$i"; docker build . -f $$i; done
 
 srpm:
-	docker build -t srpm -f docker/Dockerfile.fedora_26_rpm .
+	docker build -t srpm -f docker/Dockerfile.fedora_28_rpm .
 	mkdir tmp || true
 	docker run -v `pwd`/tmp:/tmp:rw srpm sh -c "cp /root/rpmbuild/SRPMS/* /tmp"
 
diff --git a/eduvpn-client.spec b/eduvpn-client.spec
@@ -2,7 +2,7 @@
 %global sum client for eduVPN
 
 Name:           eduvpn_client
-Version:        1.0rc13
+Version:        1.0rc14
 Release:        1%{?dist}
 Summary:        %{sum}
 
diff --git a/eduvpn/config.py b/eduvpn/config.py
@@ -18,9 +18,9 @@
 verify_key_dev = ' zzls4TZTXHEyV3yxaxag1DZw3tSpIdBoaaOjUGH/Rwg=.'
 
 # use for debugging
-secure_internet_uri = secure_internet_uri_dev
-institute_access_uri = institute_access_uri_dev
-verify_key = verify_key_dev
+#secure_internet_uri = secure_internet_uri_dev
+#institute_access_uri = institute_access_uri_dev
+#verify_key = verify_key_dev
 
 
 locale = "en-US"
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 from setuptools import setup, find_packages
 
-__version__ = "1.0rc13"
+__version__ = "1.0rc14"
 
 
 install_requires = [

-Original file line number
+Diff line change
@@ @@ -1,3 +1,8 @@ @@
 +1.0rc14
 +=======
++
 +* Dev servers were accidentally enabled for 1.0rc13
++
 .0rc13
 =======