Skip to content

Commit 8436a4d

Browse files
committed
Fix #318. Update release notes for 2.3rc4.
1 parent 4aea68b commit 8436a4d

File tree

2 files changed

+40
-17
lines changed

2 files changed

+40
-17
lines changed

README.md

Lines changed: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,57 +58,78 @@ While that looks simple, the `make pex` command will try to download and install
5858
We pre-package releases on Ubuntu, so the advice here is definitely accurate for that platform, but something similar should work for most other Debian variants.
5959

6060
* Make sure you have Python 2.7.5 or above; earlier versions will give you InsecurePlatformWarning messages due to older SSL components.
61+
* For Ubuntu 16.04, an easy way to get python 3.6 is from the Jonathan F archive, do:
62+
```bash
63+
sudo add-apt-repository ppa:jonathonf/python-3.6
64+
sudo apt-get update
65+
sudo pat-get install -y python3.6
66+
```
6167
* Take all security updates before you start.
6268
* You don't need a GUI on the platform, as the entire build can be done from the command line. Server variants are fine.
6369
* You will need a standard C development environment to build a variety of the modules that use native extensions. Use this command to get one:
6470
```bash
65-
sudo apt-get install build-essential
71+
sudo apt-get install -y build-essential
6672
```
6773
* Make sure you use the system package manager to install the following packages (and their dependencies):
68-
* python-dev (or python3-dev if you are doing python3 builds)
69-
* python-pip (not needed for python3)
70-
* python-virtualenv (not needed for python3)
74+
* python-dev (or python3.6-dev if you are doing python3 builds)
75+
* python-pip (or python3-pip if you are doing python3 builds)
76+
* python-virtualenv (or python3-virtualenv if you are doing python3 builds)
7177
* pkg-config
7278
* libssl-dev
7379
* libldap2-dev
7480
* libsasl2-dev
75-
* libdbus-glib-1-dev
81+
* python-dbus-devel
7682
* libffi-dev
77-
* For convenience, you can copy and paste this command:
83+
* For convenience, you can copy and paste these commands (choosing from the first two based on your python version):
7884
```bash
79-
sudo apt-get install python-dev python-pip python-virtualenv pkg-config libssl-dev libldap2-dev libsasl2-dev libdbus-glib-1-dev libffi-dev
85+
sudo apt-get install -y python-dev python-pip python-virtualenv
86+
sudo apt-get install -y python3.6-dev
87+
sudo apt-get install -y pkg-config libssl-dev libldap2-dev libsasl2-dev dbus-glib-devel python-dbus libffi-dev
8088
```
81-
* You don't need the python-dbus package to _build_ user-sync, but you will need it to run user-sync if you use the dbus secure store for your credentials.
89+
* You need the python-dbus package to _build_ user-sync, but you don't need it to *run* user-sync unless you use the dbus secure store for your credentials.
8290

8391
### CentOS and other RedHat variants
8492

8593
We pre-package releases on CentOS, so the advice here is definitely accurate for that platform, but something similar should work for most other RedHat variants.
8694

8795
* Make sure you have Python 2.7.5 or above; earlier versions will give you InsecurePlatformWarning messages due to older SSL components.
96+
* You cannot build on CentOS 6, because user-sync uses python-dbus for the keyring, and python-dbus requires dbus 1.6 or greater which is not available on CentOS 6. However, you can run a CentOS 7 build on CentOS 6 as long as you are running the same build of python 3.6 or later.
97+
* For centos6, to run builds, you will need to install python 3.6, which you can do as follows:
98+
```bash
99+
sudo yum install -y https://centos6.iuscommunity.org/ius-release.rpm # installs inline-upstream-stable pkg repo
100+
sudo yum install -y python36u-devel python36u-pip python36u-virtualenv
101+
```
102+
* For centos7, to install python 3.6, do the following:
103+
```bash
104+
sudo yum install -y https://centos7.iuscommunity.org/ius-release.rpm # installs inline-upstream-stable pkg repo
105+
sudo yum install -y python36u-devel python36u-pip python36u-virtualenv
106+
```
88107
* Take all security updates before you start.
89108
* You don't need a GUI on the platform, as the entire build can be done from the command line. Server variants are fine.
90109
* You will need a standard C development environment to build a variety of the modules that use native extensions. Use this command to get one:
91110
```bash
92-
sudo yum group install "Development Tools"
111+
sudo yum groupinstall -y "Development Tools"
93112
```
94113
* Your OS may not know about `pip` by default, although it will know about `virtualenv`. Rather than installing `pip` manually, we recommend telling your OS about the Red Hat "Extra Package for Enterprise Linux (EPEL)" package library, which on CentOS you can do with:
95114
```bash
96-
sudo yum install epel-release
115+
sudo yum install -y epel-release
97116
```
98117
* Make sure you use the system package manager to install the following packages (and their dependencies):
99-
* python-devel (or python3-devel, if you are doing python3 builds)
100-
* python-pip (not needed for python3)
101-
* python-virtualenv (not needed for python3)
118+
* python-devel (or python36u-devel, if you are doing python3 builds)
119+
* python-pip (or python36u-pip, if you are doing python3 builds)
120+
* python-virtualenv (or python36u-virtualenv, if you are doing python3 builds)
102121
* pkgconfig
103122
* openssl-devel
104123
* openldap-devel (includes sasl)
105124
* dbus-glib-devel
125+
* dbus-python (version 1.6 or greater, not available on CentOS 6)
106126
* libffi-devel
107-
* For convenience, you can copy and paste this command:
127+
* For convenience, you can copy and paste these commands (pick among the first two based on your python version):
108128
```bash
109-
sudo yum install python-devel python-pip python-virtualenv pkgconfig openssl-devel openldap-devel dbus-glib-devel libffi-devel
129+
sudo yum install -y python-devel python-pip python-virtualenv
130+
sudo yum install -y python36u-devel python36u-pip python36u-virtualenv
131+
sudo yum install -y pkgconfig openssl-devel openldap-devel dbus-glib-devel dbus-python libffi-devel
110132
```
111-
* You don't need the python-dbus package to _build_ user-sync, but you will need it to run user-sync if you use the dbus secure store for your credentials.
112133
113134
### Mac OS X
114135

RELEASE_NOTES.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Release Notes for User Sync Tool Version 2.3
22

3-
These notes apply to v2.3rc4 of 2018-01-14.
3+
These notes apply to v2.3rc4 of 2018-01-29.
44

55
## New Features
66

@@ -26,6 +26,8 @@ There is a new command-line argument `--connector` for specifying whether to get
2626

2727
[#315](https://github.com/adobe-apiplatform/user-sync.py/issues/315) Can't specify --user-filter or other string-valued args.
2828

29+
[#318](https://github.com/adobe-apiplatform/user-sync.py/issues/318) Fix the README build instructions regarding dbus.
30+
2931
[#324](https://github.com/adobe-apiplatform/user-sync.py/issues/324) Handle LDAP servers with no support for PagedResults.
3032

3133
[#325](https://github.com/adobe-apiplatform/user-sync.py/issues/325) Adding '--process-groups' doesn't override the default.

0 commit comments

Comments
 (0)